Merge branch 'main' into jeremypw/queue/sort-folder-list

Author: zeebok

src/Application.vala

@@ -11,6 +11,7 @@ public class Music.Application : Gtk.Application {
     public const string ACTION_SHUFFLE = "action-shuffle";
     public const string ACTION_FIND = "action-find";
     public const string ACTION_CLEAR_QUEUE = "action-clear-queue";
+    public const string ACTION_SAVE_TO_PLAYLIST = "action-save-to-playlist";
     public const string ACTION_QUIT = "action-quit";
 
     private const ActionEntry[] ACTION_ENTRIES = {
@@ -45,6 +46,7 @@ public class Music.Application : Gtk.Application {
 
         set_accels_for_action (ACTION_PREFIX + ACTION_FIND, {"<Ctrl>F"});
         set_accels_for_action (ACTION_PREFIX + ACTION_QUIT, {"<Ctrl>Q"});
+        set_accels_for_action (ACTION_PREFIX + ACTION_SAVE_TO_PLAYLIST, {"<Ctrl>S"});
 
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
@@ -148,6 +150,17 @@ public class Music.Application : Gtk.Application {
 
                 continue;
             }
+            else if (PlaylistObject.is_playlist (file)) {
+                PlaylistObject playlist = new PlaylistObject (file);
+                playlist.load_playlist ();
+
+                foreach (File playlist_file in playlist.get_uri_list ()) {
+                    elements += playlist_file;
+                }
+
+                // Don't add the playlist file itself
+                continue;
+            }
 
             elements += file;
         }

src/MainWindow.vala

@@ -80,9 +80,15 @@ public class Music.MainWindow : Gtk.ApplicationWindow {
         };
         music_files_filter.add_mime_type ("audio/*");
 
+        var playlist_files_filter = new Gtk.FileFilter () {
+            name = _("Playlist files"),
+        };
+        playlist_files_filter.add_mime_type ("audio/x-mpegurl");
+
         var filter_model = new ListStore (typeof (Gtk.FileFilter));
         filter_model.append (all_files_filter);
         filter_model.append (music_files_filter);
+        filter_model.append (playlist_files_filter);
 
         var file_dialog = new Gtk.FileDialog () {
             accept_label = _("Open"),

src/PlaybackManager.vala

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-3.0-or-later
- * SPDX-FileCopyrightText: 2021-2022 elementary, Inc. (https://elementary.io)
+ * SPDX-FileCopyrightText: 2021-2026 elementary, Inc. (https://elementary.io)
  */
 
 public class Music.PlaybackManager : Object {
@@ -14,6 +14,7 @@ public class Music.PlaybackManager : Object {
     }
     public int64 playback_position { get; private set; }
     public signal void invalids_found (int count);
+    public signal void duplicates_found (int count);
 
     private static GLib.Once<PlaybackManager> instance;
     public static unowned PlaybackManager get_default () {
@@ -39,6 +40,7 @@ public class Music.PlaybackManager : Object {
     private SimpleAction play_pause_action;
     private SimpleAction previous_action;
     private SimpleAction shuffle_action;
+    private SimpleAction save_playlist_action;
 
     private PlaybackManager () {}
 
@@ -75,19 +77,25 @@ public class Music.PlaybackManager : Object {
         shuffle_action = new SimpleAction (Application.ACTION_SHUFFLE, null);
         shuffle_action.activate.connect (shuffle);
 
+        save_playlist_action = new SimpleAction (Application.ACTION_SAVE_TO_PLAYLIST, null);
+        save_playlist_action.activate.connect (save_queue_to_playlist);
+
         next_action.set_enabled (false);
         play_pause_action.set_enabled (false);
         previous_action.set_enabled (false);
         shuffle_action.set_enabled (false);
+        save_playlist_action.set_enabled (false);
 
         unowned var app = GLib.Application.get_default ();
         app.add_action (clear_action);
         app.add_action (next_action);
         app.add_action (play_pause_action);
         app.add_action (previous_action);
         app.add_action (shuffle_action);
+        app.add_action (save_playlist_action);
 
         bind_property ("has-items", clear_action, "enabled", SYNC_CREATE);
+        bind_property ("has-items", save_playlist_action, "enabled", SYNC_CREATE);
     }
 
     public void seek_to_progress (double percent) {
@@ -99,10 +107,26 @@ public class Music.PlaybackManager : Object {
     // AudioObjects start discovering metadata asynchronously on creation
     public void queue_files (File[] files) {
         int invalids = 0;
+        int duplicates = 0;
+        int added_tracks = 0;
         foreach (unowned var file in files) {
             if (file.query_exists () && "audio" in ContentType.guess (file.get_uri (), null, null)) {
-                var audio_object = new AudioObject (file.get_uri ());
-                queue_liststore.append (audio_object);
+                uint pos = 0;
+                bool found = false;
+                Object? item = queue_liststore.get_item (pos++);
+                while (item != null && !found) {
+                    if (((AudioObject)item).uri == file.get_uri ()) {
+                        found = true;
+                    }
+
+                    item = queue_liststore.get_item (pos++);
+                }
+                if (!found) {
+                    queue_liststore.append (new AudioObject (file.get_uri ()));
+                    added_tracks++;
+                } else {
+                    duplicates++;
+                }
             } else {
                 invalids++;
                 continue;
@@ -112,6 +136,9 @@ public class Music.PlaybackManager : Object {
         if (invalids > 0) {
             invalids_found (invalids);
         }
+        if (duplicates > 0) {
+            duplicates_found (duplicates);
+        }
 
         if (current_audio == null) {
             var audio_object = (AudioObject) queue_liststore.get_object (0);
@@ -121,7 +148,6 @@ public class Music.PlaybackManager : Object {
         } else {
             // Don't notify on app startup or if the app is focused
             var application = (Gtk.Application) GLib.Application.get_default ();
-            var added_tracks = files.length - invalids;
             if (
                 !application.get_active_window ().is_active &&
                 added_tracks > 0
@@ -417,4 +443,56 @@ public class Music.PlaybackManager : Object {
             current_audio = (AudioObject) queue_liststore.get_item (position);
         }
     }
+
+    public void save_queue_to_playlist () {
+        var all_files_filter = new Gtk.FileFilter () {
+            name = _("All files"),
+        };
+        all_files_filter.add_pattern ("*");
+
+        var playlist_filter = new Gtk.FileFilter () {
+            name = _("Playlist files"),
+        };
+        playlist_filter.add_mime_type ("audio/x-mpegurl");
+
+        var filter_model = new ListStore (typeof (Gtk.FileFilter));
+        filter_model.append (all_files_filter);
+        filter_model.append (playlist_filter);
+
+        var save_dialog = new Gtk.FileDialog () {
+            accept_label = _("Save"),
+            default_filter = playlist_filter,
+            filters = filter_model,
+            modal = true,
+            title = _("Save queue to playlist"),
+            initial_name = "%s.m3u".printf (_("New Playlist")),
+        };
+
+        save_dialog.save.begin (null, null, (obj, res) => {
+            try {
+                File? file;
+                file = save_dialog.save.end (res);
+
+                PlaylistObject playlist = new PlaylistObject (file);
+                playlist.save_playlist (queue_liststore);
+            } catch (Error err) {
+                if (err.matches (Gtk.DialogError.quark (), Gtk.DialogError.DISMISSED)) {
+                    return;
+                }
+
+                warning ("Failed to save playlist: %s", err.message);
+
+                var dialog = new Granite.MessageDialog (
+                    _("Could not save playlist"),
+                    err.message,
+                    new ThemedIcon ("audio-x-playlist")
+                ) {
+                    badge_icon = new ThemedIcon ("dialog-error"),
+                    modal = true
+                };
+                dialog.present ();
+                dialog.response.connect (dialog.destroy);
+            }
+        });
+    }
 }

src/PlaylistObject.vala

@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2026 elementary, Inc. (https://elementary.io)
+ */
+
+public class Music.PlaylistObject : Object {
+    public File playlist_file { get; construct; }
+    private File[] uri_list = {};
+
+    public PlaylistObject (File playlist) {
+        Object (playlist_file: playlist);
+    }
+
+    public static bool is_playlist (File playlist) {
+        FileInfo info;
+
+        try {
+            info = playlist.query_info (GLib.FileAttribute.STANDARD_CONTENT_TYPE, GLib.FileQueryInfoFlags.NONE);
+        } catch (Error e) {
+            warning (e.message);
+
+            return false;
+        }
+
+        var mimetype = info.get_content_type ();
+        if (mimetype == null) {
+            warning ("Failed to get content type");
+
+            return false;
+        }
+
+        return mimetype == "audio/x-mpegurl";
+    }
+
+    public File[]? get_uri_list () {
+        return uri_list;
+    }
+
+    public void load_playlist () requires (playlist_file != null) {
+        FileInputStream fis = playlist_file.read ();
+        DataInputStream dis = new DataInputStream (fis);
+        string current_line;
+
+        while ((current_line = dis.read_line ()) != null) {
+            if (current_line.ascii_down ().has_prefix ("file:///")) {
+                uri_list += File.new_for_uri (current_line);
+            }
+            else if (FileUtils.test (current_line, FileTest.IS_DIR)) {
+                uri_list += File.new_for_path (current_line);
+            }
+            else {
+                debug ("Unknown line: " + current_line);
+            }
+        }
+    }
+
+    public void save_playlist (ListStore queue) requires (playlist_file != null) {
+        FileOutputStream fos = playlist_file.replace (null, false, GLib.FileCreateFlags.REPLACE_DESTINATION);
+        DataOutputStream dos = new DataOutputStream (fos);
+
+        for (uint i = 0; i < queue.n_items; i++) {
+            AudioObject track = (AudioObject)queue.get_item (i);
+            dos.put_string (track.uri);
+            dos.put_string ("\n");
+        }
+    }
+}

src/Views/QueueView.vala

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-3.0-or-later
- * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ * SPDX-FileCopyrightText: 2025-2026 elementary, Inc. (https://elementary.io)
  */
 
 public class Music.QueueView : Granite.Bin {
@@ -169,6 +169,14 @@ public class Music.QueueView : Granite.Bin {
             error_toast.send_notification ();
         });
 
+        playback_manager.duplicates_found.connect ((count) => {
+            error_toast.title = ngettext (
+                "%d file was already in the queue and was not re-added",
+                "%d files were already in the queue and were not re-added",
+                count).printf (count);
+            error_toast.send_notification ();
+        });
+
         repeat_button.clicked.connect (() => {
             var enum_step = settings.get_enum ("repeat-mode");
             if (enum_step < 2) {

src/Widgets/SearchBar.vala

@@ -33,7 +33,7 @@ public class Music.SearchBar : Granite.Bin {
         filter_model = new Gtk.FilterListModel (list_model, filter);
 
         search_entry = new Gtk.SearchEntry () {
-            placeholder_text = _("Search titles in playlist")
+            placeholder_text = _("Search titles in queue")
         };
 
         child = search_entry;

src/meson.build

@@ -2,8 +2,9 @@ sources = [
     'Application.vala',
     'AudioObject.vala',
     'MainWindow.vala',
-    'PlaybackManager.vala',
     'MetadataDiscoverer.vala',
+    'PlaybackManager.vala',
+    'PlaylistObject.vala',
     'DBus/MprisPlayer.vala',
     'DBus/MprisRoot.vala',
     'Views/NowPlayingView.vala',