Merge lp:~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Cameron Norman]

Based on Richard Stromer's branch, just rebased on current trunk.

One notable change is that it gets rid of the WALLPAPER_DIR variable completely. The directory to load is just given to the load_wallpapers function directly.

Otherwise, it is the same as Stromer's work.

[lp:~elementary-dev-community/switchboard-plug-pantheon-shell/fix-1182413]

218. By Launchpad Translations on behalf of elementary-apps on 2014-07-30

Launchpad automatic translations update.

219. By Cameron Norman on 2014-07-31

Remerged and corrected conflicts.

220. By Corentin Noël on 2014-07-31

Added cancellable as searching recursively can take time.

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2013-11-24 00:08:31 +0000
+++ src/Wallpaper.vala	2014-07-31 11:21:57 +0000
@@ -62,7 +62,6 @@
 }
 
 class Wallpaper : EventBox {
-    string WALLPAPER_DIR = "/usr/share/backgrounds";
 
     GLib.Settings settings;
 
@@ -74,6 +73,7 @@
     ComboBoxText folder_combo;
     ColorButton color;
     string current_wallpaper_path;
+    Cancellable last_cancellable;
 
     Switchboard.Plug plug;
 
@@ -214,19 +214,23 @@
     }
 
     void update_wallpaper_folder () {
+        if (last_cancellable != null)
+            last_cancellable.cancel ();
+
+        var cancellable = new Cancellable ();
+        last_cancellable = cancellable;
         if (folder_combo.get_active () == 0) {
             clean_wallpapers ();
-            var picture_file = GLib.File.new_for_path (GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES));
-            WALLPAPER_DIR = picture_file.get_uri ();
-            load_wallpapers.begin ();
+            var picture_dir = GLib.File.new_for_path (GLib.Environment.get_user_special_dir (GLib.UserDirectory.PICTURES));
+            load_wallpapers (picture_dir.get_uri (), cancellable);
         } else if (folder_combo.get_active () == 1) {
             clean_wallpapers ();
-            WALLPAPER_DIR = "file:///usr/share/backgrounds";
-            load_wallpapers.begin (() => {
-                var backgrounds_file = GLib.File.new_for_path (GLib.Environment.get_user_data_dir () + "/backgrounds");
-                WALLPAPER_DIR = backgrounds_file.get_uri ();
-                load_wallpapers.begin ();
-            });
+
+            var system_uri = "file:///usr/share/backgrounds";
+            var user_uri = GLib.File.new_for_path (GLib.Environment.get_user_data_dir () + "/backgrounds").get_uri ();
+
+            load_wallpapers (system_uri, cancellable);
+            load_wallpapers (user_uri, cancellable);
         } else if (folder_combo.get_active () == 2) {
             var dialog = new Gtk.FileChooserDialog (_("Select a folder"), null, FileChooserAction.SELECT_FOLDER);
             dialog.add_button (_("Cancel"), ResponseType.CANCEL);
@@ -235,8 +239,7 @@
 
             if (dialog.run () == ResponseType.ACCEPT) {
                 clean_wallpapers ();
-                WALLPAPER_DIR = dialog.get_file ().get_uri ();
-                load_wallpapers.begin ();
+                load_wallpapers (dialog.get_file ().get_uri (), cancellable);
                 dialog.destroy ();
             } else {
                 dialog.destroy ();
@@ -244,10 +247,15 @@
         }
     }
 
-    async void load_wallpapers () {
+    async void load_wallpapers (string basefolder, Cancellable cancellable) {
+        if (cancellable.is_cancelled () == true) {
+            return;
+        }
+
         folder_combo.set_sensitive (false);
 
-        var directory = File.new_for_uri (WALLPAPER_DIR);
+        var directory = File.new_for_uri (basefolder);
+
         // The number of wallpapers we've added so far
         double done = 0.0;
 
@@ -262,6 +270,9 @@
             var e = yield directory.enumerate_children_async (FileAttribute.STANDARD_NAME + "," + FileAttribute.STANDARD_TYPE + "," + FileAttribute.STANDARD_CONTENT_TYPE, 0, Priority.DEFAULT);
 
             while (true) {
+                if (cancellable.is_cancelled () == true) {
+                    return;
+                }
                 // Grab a batch of 10 wallpapers
                 var files = yield e.next_files_async (10, Priority.DEFAULT);
                 // Stop the loop if we've run out of wallpapers
@@ -270,14 +281,23 @@
                 }
                 // Loop through and add each wallpaper in the batch
                 foreach (var info in files) {
+                    if (cancellable.is_cancelled () == true) {
+                        return;
+                    }
                     // We're going to add another wallpaper
                     done++;
-                    // Skip the file if it's not a picture
-                    if (!IOHelper.is_valid_file_type(info)) {
+
+                    if (info.get_file_type () == FileType.DIRECTORY) {
+                        // Spawn off another loader for the subdirectory
+                        load_wallpapers (basefolder + "/" + info.get_name (), cancellable);
+                    } else if (!IOHelper.is_valid_file_type (info)) {
+                        // Skip non-picture files
                         continue;
                     }
-                    var file = File.new_for_uri (WALLPAPER_DIR + "/" + info.get_name ());
+
+                    var file = File.new_for_uri (basefolder + "/" + info.get_name ());
                     string filename = file.get_path ();
+
                     // Skip the default_wallpaper as seen in the description of the
                     // default_link variable
                     if (filename == default_link) {
@@ -373,4 +393,4 @@
         Gtk.drag_finish (ctx, false, false, timestamp);
         return;
     }
-}
+}
 \ No newline at end of file