Merge lp:~zinga/noise/improve-import-large-libraries into lp:~elementary-apps/noise/trunk

[zinga]

This fixes updating smart playlists with changed media only (like it was intended by recent changes) in order to decrease import time of large libraries. It doesn't completely fix bug #1082517 yet though.

[Corentin Noël (tintou)]

review: Approve

[Corentin Noël (tintou)]

review: Approve

[Corentin Noël (tintou)]

review: Approve

=== modified file 'src/GStreamer/GStreamerTagger.vala'
--- src/GStreamer/GStreamerTagger.vala	2012-11-26 18:46:20 +0000
+++ src/GStreamer/GStreamerTagger.vala	2013-02-10 19:04:22 +0000
@@ -36,8 +36,6 @@
 
     public GStreamerTagger () {
         uri_queue = new Gee.LinkedList<string> ();
-
-        d = create_discoverer ();
     }
 
     private Gst.Discoverer? create_discoverer () {
@@ -50,22 +48,33 @@
         }
 
         discoverer.discovered.connect (import_media);
-        discoverer.finished.connect (finished);
+        discoverer.finished.connect (file_set_finished);
 
         return discoverer;
     }
 
-    private void finished () {
-        if (!cancelled && uri_queue.size > 0) {
-            d = create_discoverer ();
-            d.start ();
-
-            for (int i = 0; i < DISCOVER_SET_SIZE && i < uri_queue.size; i++)
-                d.discover_uri_async (uri_queue.get (i));
-        } else {
+    private void file_set_finished () {
+        if (cancelled) {
+            debug ("import cancelled");
+            d.stop ();
+            queue_finished ();
+        }
+        else if (uri_queue.size == 0) {
             debug ("queue finished");
+            d.stop ();
             queue_finished ();
         }
+        else {
+            import_next_file_set ();
+        }
+    }
+
+    private void import_next_file_set () {
+        d = create_discoverer ();
+        d.start ();
+
+        for (int i = 0; i < DISCOVER_SET_SIZE && i < uri_queue.size; i++)
+            d.discover_uri_async (uri_queue.get (i));
     }
 
     public void cancel_operations () {
@@ -73,19 +82,14 @@
     }
 
     public void discoverer_import_media (Gee.LinkedList<string> uris) {
-        int size = 0;
         cancelled = false;
         uri_queue.clear ();
 
         foreach (string uri in uris) {
             uri_queue.add (uri);
-
-            d.start ();
-            if (size < DISCOVER_SET_SIZE) {
-                ++size;
-                d.discover_uri_async (uri);
-            }
         }
+        
+        import_next_file_set ();
     }
 
     private async void import_media (Gst.DiscovererInfo info, Error err) {

=== modified file 'src/LibraryManager.vala'
--- src/LibraryManager.vala	2013-02-10 00:42:23 +0000
+++ src/LibraryManager.vala	2013-02-10 19:04:22 +0000
@@ -582,14 +582,18 @@
         debug ("--- MEDIA CLEARED ---");
     }
 
-    private async void update_smart_playlists_async (Collection<Media> medias) {
+    private async void update_smart_playlists_async (Collection<Media> media) {
         Idle.add (update_smart_playlists_async.callback);
         yield;
 
         lock (_smart_playlists) {
             foreach (var p in smart_playlists ()) {
                 lock (_media) {
+<<<<<<< TREE
                     p.update_medias (medias);
+=======
+                    p.add_medias (media);
+>>>>>>> MERGE-SOURCE
                 }
             }
         }
@@ -735,9 +739,14 @@
         if (new_media.size < 1) // happens more often than you would think
             return;
 
+        // make a copy of the media list so that it doesn't get modified before
+        // the async code (e.g. updating the smart playlists) is done with it
+        var media = new Gee.LinkedList<Media> ();
         var added = new Gee.LinkedList<int> ();
 
         foreach (var s in new_media) {
+            media.add(s);
+            
             if (s.rowid == 0) {
                 s.rowid = _media_rowid;
                 _media_rowid++;
@@ -749,8 +758,8 @@
         }
         media_added (added);
 
-        dbm.add_media (new_media);
-        update_smart_playlists_async.begin (new_media);
+        dbm.add_media (media);
+        update_smart_playlists_async.begin (media);
     }
 
     public void remove_media (Gee.LinkedList<Media> toRemove, bool trash) {