Skip to content

Adds an "Open Folder…" button to open folders only #838

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.

Sign up for GitHub

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

Open
flodavid wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adds an "Open Folder…" button to open folders only #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public class Music.Application : Gtk.Application {
return elements;
}

/**
* Flattens files and those contained in (sub)directories
*/
public static File[] loop_through_files (File[] files) {
// All of these will be returned later in bulk
File[] elements = {};
Expand Down
77 changes: 56 additions & 21 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
public class Music.MainWindow : Gtk.ApplicationWindow {
public const string ACTION_PREFIX = "win.";
public const string ACTION_OPEN = "action-open";
public const string ACTION_OPEN_FOLDER = "action-open-folder";

private QueueView queue_view;

Expand Down Expand Up @@ -61,8 +62,13 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
open_action.activate.connect (open_files);
add_action (open_action);

var open_folder_action = new SimpleAction (ACTION_OPEN_FOLDER, null);
open_folder_action.activate.connect (open_folder);
add_action (open_folder_action);

unowned var app = ((Gtk.Application) GLib.Application.get_default ());
app.set_accels_for_action (ACTION_PREFIX + ACTION_OPEN, {"<Ctrl>O"});
app.set_accels_for_action (ACTION_PREFIX + ACTION_OPEN_FOLDER, {"<Ctrl><Shift>O"});
}

public void start_search () {
Expand Down Expand Up @@ -96,30 +102,59 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
try {
var files = file_dialog.open_multiple.end (res);

File[] file_array = {};
for (int i = 0; i < files.get_n_items (); i++) {
file_array += (File)(files.get_item (i));
}
handle_selected_files (files);
} catch (Error e) {
handle_file_dialog_error (e);
}
});
}

/**
* Same as open_files, except there is not filter and it uses the Folder dialog :
* No folder/file is pre-selected when entering a directory and individual files cannot be selected
*/
private void open_folder () {
var file_dialog = new Gtk.FileDialog () {
accept_label = _("Open"),
modal = true,
title = _("Open folder(s) containing audio files")
};

file_dialog.select_multiple_folders.begin (this, null, (obj, res) => {
try {
var folders = file_dialog.select_multiple_folders.end (res);

var files_to_play = Application.loop_through_files (file_array);
PlaybackManager.get_default ().queue_files (files_to_play);
handle_selected_files (folders);
} catch (Error e) {
if (e.matches (Gtk.DialogError.quark (), Gtk.DialogError.DISMISSED)) {
return;
}

var dialog = new Granite.MessageDialog (
_("Couldn't add audio files"),
e.message,
new ThemedIcon ("document-open")
) {
badge_icon = new ThemedIcon ("dialog-error"),
modal = true,
transient_for = this
};
dialog.present ();
dialog.response.connect (dialog.destroy);
handle_file_dialog_error (e);
}
});
}

private void handle_selected_files (GLib.ListModel files) {
File[] file_array = {};
for (int i = 0; i < files.get_n_items (); i++) {
file_array += (File)(files.get_item (i));
}
var files_to_play = Application.loop_through_files (file_array);
PlaybackManager.get_default ().queue_files (files_to_play);
}

private void handle_file_dialog_error (Error e) {
if (e.matches (Gtk.DialogError.quark (), Gtk.DialogError.DISMISSED)) {
return;
}

var dialog = new Granite.MessageDialog (
_("Couldn't add audio files"),
e.message,
new ThemedIcon ("document-open")
) {
badge_icon = new ThemedIcon ("dialog-error"),
modal = true,
transient_for = this
};
dialog.present ();
dialog.response.connect (dialog.destroy);
}
}
15 changes: 13 additions & 2 deletions src/Views/QueueView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public class Music.QueueView : Granite.Bin {
var drop_target = new Gtk.DropTarget (typeof (Gdk.FileList), Gdk.DragAction.COPY);

var add_button_label = new Gtk.Label (_("Open Files…"));

var add_button_box = new Gtk.Box (HORIZONTAL, 0);
add_button_box.append (new Gtk.Image.from_icon_name ("document-open-symbolic"));
add_button_box.append (add_button_label);
Expand All @@ -88,9 +87,20 @@ public class Music.QueueView : Granite.Bin {
action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_OPEN
};
add_button.add_css_class (Granite.STYLE_CLASS_FLAT);

add_button_label.mnemonic_widget = add_button;

var add_folder_button_label = new Gtk.Label (_("Open Folder…"));
var add_folder_button_box = new Gtk.Box (HORIZONTAL, 0);
add_folder_button_box.append (new Gtk.Image.from_icon_name ("document-open-symbolic"));
add_folder_button_box.append (add_folder_button_label);

var add_folder_button = new Gtk.Button () {
child = add_folder_button_box,
action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_OPEN_FOLDER
};
add_folder_button.add_css_class (Granite.STYLE_CLASS_FLAT);
add_folder_button_label.mnemonic_widget = add_folder_button;

var clear_button_label = new Gtk.Label (_("Clear Queue"));

var clear_button_box = new Gtk.Box (HORIZONTAL, 0);
Expand All @@ -107,6 +117,7 @@ public class Music.QueueView : Granite.Bin {

var queue_action_bar = new Gtk.ActionBar ();
queue_action_bar.pack_start (add_button);
queue_action_bar.pack_start (add_folder_button);
queue_action_bar.pack_end (clear_button);

var queue = new Adw.ToolbarView () {
Expand Down