Merge lp:~benwaffle/noise/changes into lp:~elementary-apps/noise/trunk

[Ben]

Detect library changes on startup and while running.

[Corentin Noël (tintou)]

The code seems good, I need to find some track to test it

review: Approve (code)

[Cody Garver (codygarver)]

Adds a long startup time for my 1500 track, 13 GB library, author is investigating

review: Needs Fixing

[Zisu Andrei (matzipan)]

I might be wrong here, but if I were to guess, the blocking is because the rescan_music_folder_async method does not have any yield statements?

Unmerged revisions

1924. By Ben on 2016-05-14

Update media list when file ops are done

1923. By Ben on 2016-05-13

resync library on startup

1922. By Ben on 2016-05-13

Update database when media is changed

=== modified file 'src/FileOperator.vala'
--- src/FileOperator.vala	2016-02-07 16:33:45 +0000
+++ src/FileOperator.vala	2016-05-14 04:57:26 +0000
@@ -93,7 +93,7 @@
                 var file = music_folder.get_child (file_info.get_name ());
 
                 if(file_info.get_file_type() == FileType.DIRECTORY) {
-                    dirs.add (file.get_uri ());
+                    dirs.add (file.get_path ());
                     list_recursive_directory (file, ref dirs);
                 }
             }

=== modified file 'src/LocalBackend/LocalLibrary.vala'
--- src/LocalBackend/LocalLibrary.vala	2016-04-29 15:37:31 +0000
+++ src/LocalBackend/LocalLibrary.vala	2016-05-14 04:57:26 +0000
@@ -78,10 +78,16 @@
         init_database ();
         fo.connect_to_manager ();
 
+        var to_remove = new Gee.TreeSet<Media> ();
+ 
         // Load all media from database
         var media_ids = get_rowids_from_table (Database.Media.TABLE_NAME);
         foreach (var media_id in media_ids) {
             var m = new LocalMedia (media_id, connection);
+            if (!m.file.query_exists ()) { // ignore files that don't exist
+                to_remove.add (m);
+                continue;
+            }
             _medias.set (m.rowid, m);
             // Append the media into an album.
             if (m.get_album_hashkey () in album_info.keys) {
@@ -96,6 +102,10 @@
             }
         }
 
+        if (!to_remove.is_empty) {
+            remove_medias (to_remove, false);
+        }
+
         // Load all smart playlists from database
         var sp_ids = get_rowids_from_table (Database.SmartPlaylists.TABLE_NAME);
         if (sp_ids.is_empty) {
@@ -114,6 +124,8 @@
             var p = new LocalStaticPlaylist (p_id, connection);
             _playlists.add (p);
         }
+
+        rescan_music_folder ();
     }
 
     /*
@@ -252,7 +264,6 @@
 
     public void rescan_music_folder () {
         if (start_file_operations (_("Rescanning music for changes. This may take a while…"))) {
-            App.main_window.update_sensitivities.begin ();
             rescan_music_folder_async.begin ();
         }
     }
@@ -268,13 +279,16 @@
         
         foreach (var m in get_medias ()) {
             if (!m.isTemporary && !m.isPreview && m.uri.contains (music_folder_dir))
-
-            if (!File.new_for_uri (m.uri).query_exists ())
-                to_remove.add (m);
+                if (!m.file.query_exists ())
+                    to_remove.add (m);
             if (files.contains (m.uri))
                 files.remove (m.uri);
         }
 
+        foreach (var f in files) {
+            to_import.add (f);
+        }
+
         if (!to_import.is_empty) {
             debug ("Importing %d new songs", to_import.size);
             fo.resetProgress (to_import.size - 1);
@@ -848,7 +862,8 @@
 
         NotificationManager.get_default ().update_progress (message, 0.0);
         _doing_file_operations = true;
-        App.main_window.update_sensitivities.begin ();
+        if (App.main_window != null)
+            App.main_window.update_sensitivities.begin ();
         file_operations_started ();
         return true;
     }

=== modified file 'src/LocalBackend/LocalMedia.vala'
--- src/LocalBackend/LocalMedia.vala	2016-04-29 15:37:31 +0000
+++ src/LocalBackend/LocalMedia.vala	2016-05-14 04:57:26 +0000
@@ -29,6 +29,23 @@
  */
 
 public class Noise.LocalMedia : Noise.Media {
+    private File? _file = null;
+    public override File file {
+        get {
+            if (_file == null) {
+                var query = Database.query_field (rowid, connection, Database.Media.TABLE_NAME, "uri");
+                if (query != null) {
+                    _file = File.new_for_uri (query.dup_string ());
+                }
+            }
+            return _file;
+        }
+        set {
+            Database.set_field (rowid, connection, Database.Media.TABLE_NAME, "uri", value.get_uri ());
+            _file = value;
+        }
+    }
+
     private uint64? _file_size = null;
     public override uint64 file_size {
         get {
@@ -435,7 +452,7 @@
         var query = Database.query_field (rowid, connection, Database.Media.TABLE_NAME, field);
         if (query != null) {
             temp = query.dup_string ();
-            return _composer;
+            return temp;
         } else
             return UNKNOWN;
     }

=== modified file 'src/Views/Wrappers/ViewWrapper.vala'
--- src/Views/Wrappers/ViewWrapper.vala	2016-02-08 00:20:41 +0000
+++ src/Views/Wrappers/ViewWrapper.vala	2016-05-14 04:57:26 +0000
@@ -136,6 +136,7 @@
 
         App.main_window.viewSelector.mode_changed.connect (view_selector_changed);
         library.search_finished.connect (search_field_changed);
+        library.file_operations_done.connect (update_visible_media);
     }
 
     /**

=== modified file 'src/Widgets/InfoPanel.vala'
--- src/Widgets/InfoPanel.vala	2016-02-08 00:20:41 +0000
+++ src/Widgets/InfoPanel.vala	2016-05-14 04:57:26 +0000
@@ -135,7 +135,7 @@
     }
     
     private void update_cover_art () {
-        var cover_icon = current_media.album_info.cover_icon;
+        var cover_icon = (current_media != null) ? current_media.album_info.cover_icon : null;
         if (cover_icon != null) {
             coverArt.gicon = cover_icon;
         } else {