Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to open directories directly #747

Merged
merged 23 commits into from Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*~
.flatpak-builder
.flatpak
build
2 changes: 1 addition & 1 deletion data/music.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Exec=io.elementary.music %U
Icon=io.elementary.music
Terminal=false
Categories=Audio;Music;Player;AudioVideo;GTK;
MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-opus+ogg;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;audio/x-s3m;
MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-opus+ogg;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;audio/x-s3m;inode/directory;
StartupNotify=true
Keywords=Noise;Audio;Player;MP3;Play;Playlist;Media;Songs;
X-GNOME-UsesNotifications=true
Expand Down
1 change: 1 addition & 0 deletions io.elementary.music.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ finish-args:
- '--socket=wayland'
- '--socket=pulseaudio'
- '--device=dri'
- '--filesystem=xdg-music:ro'

modules:
- name: music
Expand Down
50 changes: 49 additions & 1 deletion src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,60 @@ public class Music.Application : Gtk.Application {
settings.bind ("window-maximized", main_window, "maximized", SettingsBindFlags.SET);
}

private File[] list_directory (string directory) {
Dir dir;
try {
dir = Dir.open (directory, 0);
} catch (FileError e) {
warning (e.message);
return {};
}

string? name = null;
File[] elements = {};

while ((name = dir.read_name ()) != null) {
var file_path = Path.build_filename (directory, name);
var file = File.new_for_path (file_path);

elements += file;
}

return elements;
}

private File[] loop_through_files (File[] files) {
// All of these will be returned later in bulk
File[] elements = {};

foreach (var file in files) {
var file_path = file.get_path ();

if (FileUtils.test (file_path, FileTest.IS_DIR)) {
var directory_elements = list_directory (file_path);
var directory_files = loop_through_files (directory_elements);

foreach (var directory_file in directory_files) {
elements += directory_file;
}

continue;
}

elements += file;
}

return elements;
}

protected override void open (File[] files, string hint) {
if (active_window == null) {
activate ();
}

playback_manager.queue_files (files);
var files_to_play = loop_through_files (files);
debug ("Application: Number of files to play %u", files_to_play.length);
playback_manager.queue_files (files_to_play);
}

private void action_play_pause () {
Expand Down
1 change: 1 addition & 0 deletions src/PlaybackManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public class Music.PlaybackManager : Object {
playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH, (int64)(percent * current_audio.duration));
}

// Files[] must not contain any null entries
public void queue_files (File[] files) {
discoverer.start ();
int invalids = 0;
Expand Down