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 7 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
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
44 changes: 43 additions & 1 deletion src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,54 @@ public class Music.Application : Gtk.Application {
settings.bind ("window-maximized", main_window, "maximized", SettingsBindFlags.SET);
}

File[] listDirectory(string directory) {
var dir = Dir.open(directory, 0);

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

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

elements += file;
}

return elements;
}

private bool isDirectory(string file) {
return FileUtils.test(file, FileTest.IS_DIR);
}

private void loopThroughFiles(File[] files) {
// All of these are added later in bulk
File[] elements = {};

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

if (!isDirectory) {
elements += file;

continue;
}

// Is a directory
var directoryElements = listDirectory(filePath);
loopThroughFiles(directoryElements);
}

playback_manager.queue_files (elements);
}

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

playback_manager.queue_files (files);
loopThroughFiles(files);
}

private void action_play_pause () {
Expand Down