Merge lp:~erasmo-marin/foto/fix-import into lp:foto/foto-1.0

[Erasmo Marín]

-Adds Threads.vala taken from lp:noise, it creates a ThreadPool for thread management.
-Adds a workaround (not sure if this is a definitive solution) to fix the import crash when the thread ends by adding X.init_threads() in main.
-Adds a method to refresh the import page.

With the new Threads class, it will be easier to implement IO operations without blocking GUI.

[lp:~erasmo-marin/foto/fix-import]

113. By Erasmo Marín on 2014-10-15

fix comment documentation

[Fabio Zaramella (fabiozaramella)]

Looks and works great, no more crashes.

review: Approve

[Fabio Zaramella (fabiozaramella)]

For the future, in debug messages use english where possible :p

[Erasmo Marín (erasmo-marin)]

Yep, sorry about that ^^

[Fabio Zaramella (fabiozaramella)]

Merge it ^^

[lp:~erasmo-marin/foto/fix-import]

114. By Erasmo Marín on 2014-10-15

fix debug messages

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-14 01:35:45 +0000
+++ CMakeLists.txt	2014-10-15 21:31:58 +0000
@@ -159,6 +159,8 @@
             src/core/PhotoFormat/PhotoDriver.vala
             src/core/PhotoFormat/PhotoFormat.vala
 
+            src/core/Threads/Threads.vala
+
             src/dialogs/AlbumDialog.vala
             src/dialogs/PropertiesDialog.vala
             src/dialogs/AddToAlbumDialog.vala

=== modified file 'src/FotoApp.vala'
--- src/FotoApp.vala	2014-09-07 20:33:48 +0000
+++ src/FotoApp.vala	2014-10-15 21:31:58 +0000
@@ -18,10 +18,6 @@
 
 namespace Foto {
     
-    // Settings
-    //public SavedState saved_state;
-    //public Settings settings;
-    
     public class FotoApp : Granite.Application {
 
         public AppWindow window = null;
@@ -73,7 +69,6 @@
             if(new_instance)
                 flags |= ApplicationFlags.NON_UNIQUE;
             set_flags (flags);
-
             Utils.Cache.init();
         }
 
@@ -173,6 +168,12 @@
 
         public static int main(string[] args) {
 
+            if (!Thread.supported ()) {
+                error ("Cannot run without thread support.");
+            }
+
+            X.init_threads();
+
             _app_cmd_name = "foto";
             var context = new OptionContext ("File");
             context.add_main_entries (entries, Build.GETTEXT_PACKAGE);
@@ -193,7 +194,9 @@
 
                 return Posix.EXIT_SUCCESS;
             }
+
             var app = new FotoApp();
+
             GtkClutter.init(ref args);
             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
 

=== modified file 'src/ViewManager.vala'
--- src/ViewManager.vala	2014-09-17 04:41:18 +0000
+++ src/ViewManager.vala	2014-10-15 21:31:58 +0000
@@ -87,8 +87,9 @@
     public Page? get_page(PageType page_type) {
 
         Page page = check_page(page_type);
-        if(page != null)
+        if(page != null) {
             return page;
+        }
 
         return instantiate(page_type);
     }

=== modified file 'src/core/ImportJob.vala'
--- src/core/ImportJob.vala	2014-08-27 08:35:50 +0000
+++ src/core/ImportJob.vala	2014-10-15 21:31:58 +0000
@@ -16,10 +16,11 @@
 using GExiv2;
 using GLib;
 
-public class ImportJob : GLib.Object, Thredeable {
+public class ImportJob : GLib.Object {
 
     private static ImportJob self;
     private static File[] files;
+    public signal void thread_end();
 
     private ImportJob(File[] files) {
         this.files = files;
@@ -34,66 +35,44 @@
     }
 
     public void start_import() {
-        start_job();
-    }
-
-    //TODO implement filter
-    public void job_func () {
-
-        var date = new DateTime.now_local ();
-        int import_date = (int)date.to_unix();
-        int duplicated = 0;
-        PictureDAO picdao = PictureDAO.get_instance();
-        var metadata = new Metadata();
-
-        foreach(File file in files) {
-
-            debug("Importing %s\n", file.get_parse_name ());
-            var photo = new Photo.from_file(file);
-
-            if(!photo.is_supported()) {
-                debug("File not supported found");
-                continue;
-            }
-
-            Picture pic = photo.get_picture();
-            pic.import_date = import_date;
-            
-            if(!picdao.insert(pic)) {
-                debug("No se pudo insertar %s, archivo duplicado?", pic.file_path);
-                duplicated++;
-            }
-
-        }
-
-    }
-
-}
-
-
-
-//An interface that makes easier to use simple threads. Just implement job_func() to go.
-public interface Thredeable : GLib.Object {
-
-    public signal void thread_end();
-
-    public bool start_job() {
-        try {
-            Thread<void*> thread_a = new Thread<void*>.try ("thread_a", this.thread_func);
-        } catch (Error e) {
-            stderr.printf ("%s\n", e.message);
-            return false;
-        }
-        return true;
-    }
-
-
-    public void* thread_func () {
-        job_func();
-        thread_end();
-        return null;
-    }
-
-    public abstract void job_func();
+        job_func.begin();
+    }
+
+    private async void job_func () {
+
+        SourceFunc callback = job_func.callback;
+
+        Threads.add (() => {
+            var date = new DateTime.now_local ();
+            int import_date = (int)date.to_unix();
+            int duplicated = 0;
+            PictureDAO picdao = PictureDAO.get_instance();
+            var metadata = new Metadata();
+
+            foreach(File file in files) {
+
+                var photo = new Photo.from_file(file);
+
+                if(!photo.is_supported()) {
+                    debug("File %s is not supported, not importing it", file.get_parse_name ());
+                    continue;
+                }
+
+                debug("Importing %s\n", file.get_parse_name ());
+
+                Picture pic = photo.get_picture();
+                pic.import_date = import_date;
+                
+                if(!picdao.insert(pic)) {
+                    debug("Could not insert file %s, file already exists?", pic.file_path);
+                    duplicated++;
+                }
+            }
+            thread_end();
+            Idle.add ((owned) callback);
+        });
+
+        yield;
+    }
 
 }
\ No newline at end of file

=== added directory 'src/core/Threads'
=== added file 'src/core/Threads/Threads.vala'
--- src/core/Threads/Threads.vala	1970-01-01 00:00:00 +0000
+++ src/core/Threads/Threads.vala	2014-10-15 21:31:58 +0000
@@ -0,0 +1,145 @@
+//REWRITE
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2012 Noise Developers (http://launchpad.net/noise)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * The Noise authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Noise. This permission is above and beyond the permissions granted
+ * by the GPL license by which Noise is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ */
+
+/**
+ * A central place for spawning threads.
+ *
+ * The main purpose of this class is to have a central place to track and control all the
+ * threads created by the application, in a thread-safe environment. Second, but not less
+ * important, is the ability to re-use existing threads in order to minimize the overhead
+ * generated by the creation/destruction of new threads under certain conditions.
+ */
+public class Threads {
+
+    public delegate void TaskFunc ();
+
+    /**
+     * An object that wraps a TaskFunc delegate.
+     *
+     * We need this class because delegates with targets cannot be pushed directly into
+     * a thread pool, nor used as generic type arguments. This doesn't mean the class is
+     * merely a workaround though. Its existence has the bonus of allowing easy tracking
+     * of task creation/destruction, and the internal counter exposes the number of tasks
+     * that have been processed during the entire execution time of the application.
+     */
+    private class TaskFuncWrapper : Object {
+        public unowned TaskFunc func { get; private set; }
+        public uint id { get; private set; }
+        private static uint count = 0;
+
+        public TaskFuncWrapper (TaskFunc func) {
+            lock (count)
+                id = count++;
+
+            debug ("Creating task [%u]", id);
+            this.func = func;
+        }
+
+        ~TaskFuncWrapper () {
+            debug ("~Destroying task [%u]", id);
+        }
+    }
+
+    /**
+     * Maximum number of threads allowed; -1 equals "unlimited".
+     */
+    private const int MAX_THREADS = -1;
+
+    /**
+     * Maximum number of threads that will be kept alive while not used.
+     */
+    private const int MAX_UNUSED_THREADS = 5;
+
+    private ThreadPool<TaskFuncWrapper>? thread_pool;
+    private static Threads? instance;
+
+
+    private Threads () {
+        assert (instance == null); // We only want a single instance
+
+        lock (thread_pool) {
+            try {
+                thread_pool = new ThreadPool<TaskFuncWrapper>.with_owned_data (
+                                                               task_func,
+                                                               MAX_THREADS,
+                                                               MAX_THREADS > 0);
+            } catch (Error err) {
+                error ("Couldn't create default thread pool: %s", err.message);
+            }
+
+            ThreadPool.set_max_unused_threads (MAX_UNUSED_THREADS);
+        }
+    }
+
+    /**
+     * Adds //task// to be processed on a separate thread. The task function is not
+     * owned by the method and should be kept alive by the owner until it is actually
+     * called from a different thread.
+     */
+    public static bool add (TaskFunc task) {
+        lock (instance) {
+            if (instance == null)
+                instance = new Threads ();
+        }
+
+        try {
+            instance.push_task (task);
+        } catch (Error err) {
+            critical ("Could not add task: %s", err.message);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Pushes //task// into the thread pool.
+     * @see Threads.add
+     */
+    private void push_task (TaskFunc task) throws Error {
+        lock (thread_pool) {
+            var wrapper = new TaskFuncWrapper (task);
+            thread_pool.add ((owned) wrapper);
+        }
+    }
+
+    /**
+     * Called by the thread pool right after preparing a thread. The method is
+     * responsible for executing the actual task function.
+     */
+    private void task_func (owned TaskFuncWrapper wrapper) {
+        var id = wrapper.id;
+        debug ("-- Dispatching task [%u]", id);
+        if (wrapper.func != null) {
+            debug ("-- starting [%u]", id);
+            wrapper.func ();
+            debug ("-- finished [%u]", id);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/pages/AlbumPage.vala'
--- src/pages/AlbumPage.vala	2014-10-13 19:02:59 +0000
+++ src/pages/AlbumPage.vala	2014-10-15 21:31:58 +0000
@@ -71,7 +71,7 @@
         collection = picdao.get_for_album(album);
 
         foreach(Picture pic in collection) {
-            var thumb = new PicThumb.from_picture (this, pic, IconSize.NORMAL);
+            var thumb = new PicThumb.from_picture (this, pic, IconSize.HUGE);
             thumb.icon_double_clicked_event.connect(() => {
                 ViewerPage page = (container.get_page(PageType.VIEWER_PAGE) as ViewerPage);
                 page.set_collection(collection, collection.index_of(pic));

=== modified file 'src/pages/CollectionPage.vala'
--- src/pages/CollectionPage.vala	2014-10-13 19:02:59 +0000
+++ src/pages/CollectionPage.vala	2014-10-15 21:31:58 +0000
@@ -381,7 +381,6 @@
                                                 </item>
                                             </menu>
                                         </interface>""";
-
 }
 
 

=== modified file 'src/pages/LastImportedPage.vala'
--- src/pages/LastImportedPage.vala	2014-09-29 15:16:48 +0000
+++ src/pages/LastImportedPage.vala	2014-10-15 21:31:58 +0000
@@ -27,15 +27,28 @@
         sorter.set_sort_priorities(PictureSorter.SortMode.ALPHABETICALLY,
                                    PictureSorter.SortMode.BY_RATING,
                                    PictureSorter.SortMode.BY_IMPORT_DATE);
-        update_last_import();
         build_sort_bar ();
+        load_thumbs ();
     }
 
-    private void update_last_import() {
-
+    public void update_last_import () {
+        print("removing pics");
         remove_all_items();
-
-        var picdao = PictureDAO.get_instance();
+        print("loading thumbs");
+        load_thumbs();
+
+        if(collection.size > 0) {
+            search_button.set_sensitive(true);
+            select_btn.set_sensitive(true);
+        } else {
+            search_button.set_sensitive(false);
+            select_btn.set_sensitive(false);
+        }
+
+    }
+
+    private void load_thumbs () {
+        PictureDAO picdao = PictureDAO.get_instance();
         collection = picdao.get_last_import();
 
         foreach(Picture pic in collection) {
@@ -51,7 +64,7 @@
                 debug("Resize item at %f:", val);
             });
         }
-
+        return;
     }
 
     public void build_sort_bar () {

=== modified file 'src/pages/WelcomePage.vala'
--- src/pages/WelcomePage.vala	2014-09-06 17:19:54 +0000
+++ src/pages/WelcomePage.vala	2014-10-15 21:31:58 +0000
@@ -42,9 +42,9 @@
             import.start_import();
             import.thread_end.connect(()=>{
                 print("Import finished\n");
+                var import_page = (LastImportedPage)container.get_page(PageType.LAST_IMPORTED_PAGE);
+                import_page.update_last_import();
                 container.switch_to_page(PageType.LAST_IMPORTED_PAGE);
-                while(Gtk.events_pending())
-                    Gtk.main_iteration();
                 stack.set_visible_child(drop_area);
             });
         });