Merge lp:~jeremywootten/pantheon-files/fix-1512376-no-thumbnails-for-new-files into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Ensure new files are thumbnailed

This branch addresses a regression whereby thumbnails for files that have not previously been generated are not automatically generated until "Reload" is pressed when first viewed.

[Felipe Escoto (philip.scott)]

Works as intended! Good job :)

review: Approve

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2016-02-29 11:33:21 +0000
+++ libcore/gof-directory-async.vala	2016-04-03 16:22:43 +0000
@@ -999,8 +999,9 @@
             if (cancellable.is_cancelled () || thumbs_stop)
                 break;
 
-            if (gof.info != null && gof.flags != GOF.File.ThumbState.UNKNOWN) {
-                gof.flags = GOF.File.ThumbState.READY;
+            /* Only try to load pixbuf from thumbnail if one may exist.
+             * Note: query_thumbnail_update () does not call the thumbnailer, only loads pixbuf from existing thumbnail file.*/
+            if (gof.flags != GOF.File.ThumbState.NONE) {
                 gof.pix_size = icon_size;
                 gof.query_thumbnail_update ();
             }

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-02-26 15:21:37 +0000
+++ libcore/gof-file.c	2016-04-03 16:22:43 +0000
@@ -538,8 +538,9 @@
     file->utf8_collation_key = g_utf8_collate_key_for_filename  (gof_file_get_display_name (file), -1);
     /* mark the thumb flags as state none, we'll load the thumbs once the directory
      * would be loaded on a thread */
-    if (gof_file_get_thumbnail_path (file) != NULL)
-        file->flags = GOF_FILE_THUMB_STATE_NONE;
+    if (gof_file_get_thumbnail_path (file) != NULL) {
+        file->flags = GOF_FILE_THUMB_STATE_UNKNOWN;  /* UNKNOWN means thumbnail not known to be unobtainable */
+    }
 
     /* formated type */
     gof_file_update_formated_type (file);
@@ -875,12 +876,13 @@
         /* get the thumbnail path from md5 filename */
         md5_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, file->uri, -1);
         base_name = g_strdup_printf ("%s.png", md5_hash);
-        /* TODO Use $XDG_CACHE_HOME specified thumbnail directory instead of hard coding - when Tumbler does*/
+
+        /* Use $XDG_CACHE_HOME specified thumbnail directory instead of hard coding */
         if (file->pix_size <= 128) {
-            file->thumbnail_path = g_build_filename (g_get_home_dir (), ".thumbnails",
+            file->thumbnail_path = g_build_filename (g_get_user_cache_dir (), "thumbnails",
                                                      "normal", base_name, NULL);
         } else {
-            file->thumbnail_path = g_build_filename (g_get_home_dir (), ".thumbnails",
+            file->thumbnail_path = g_build_filename (g_get_user_cache_dir (), "thumbnails",
                                                      "large", base_name, NULL);
         }
         g_free (base_name);
@@ -945,7 +947,7 @@
     file->exists = TRUE;
     file->is_connected = TRUE;
 
-    file->flags = 0;
+    file->flags = GOF_FILE_THUMB_STATE_UNKNOWN;
     file->pix_size = -1;
 
     file->target_gof = NULL;
@@ -2589,14 +2591,17 @@
 
     if (thumbnail_path != NULL)
     {
-        thumbnail_path_split = g_strsplit(thumbnail_path, ".thumbnails/normal", -1);
-        if(g_strv_length(thumbnail_path_split) == 2)
+        /* Construct new path to large thumbnail based on $XDG_CACHE_HOME */
+        thumbnail_path_split = g_strsplit(thumbnail_path, G_DIR_SEPARATOR_S, -1);
+        uint l;
+        l = g_strv_length(thumbnail_path_split);
+        if(l > 2)
         {
-            new_thumbnail_path = g_strjoin(".thumbnails/large", thumbnail_path_split[0], thumbnail_path_split[1], NULL);
+            new_thumbnail_path = g_strjoin(G_DIR_SEPARATOR_S, g_get_user_cache_dir (), "thumbnails/large", thumbnail_path_split[l-1], NULL);
+
             if(!g_file_test(new_thumbnail_path, G_FILE_TEST_EXISTS))
             {
-                g_free(new_thumbnail_path);
-                new_thumbnail_path = NULL;
+                new_thumbnail_path = g_strdup(thumbnail_path);
             }
         }
         else

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-03-23 15:45:06 +0000
+++ src/View/AbstractDirectoryView.vala	2016-04-03 16:22:43 +0000
@@ -284,7 +284,6 @@
 
             freeze_tree (); /* speed up loading of icon view. Thawed when directory loaded */
             set_up_zoom_level ();
-            change_zoom_level ();
 
             connect_directory_handlers (slot.directory);
         }
@@ -2363,10 +2362,10 @@
                     while (valid_iter) {
                         file = model.file_for_iter (iter);
 
-                        /* Ask thumbnail if ThumbState UNKNOWN or NONE */
-                        if (file != null && file.flags < 2)
+                        /* Ask thumbnailer only if ThumbState UNKNOWN */
+                        if (file != null && file.flags == GOF.File.ThumbState.UNKNOWN) {
                             visible_files.prepend (file);
-
+                        }
                         /* check if we've reached the end of the visible range */
                         path = model.get_path (iter);
 
@@ -2377,9 +2376,10 @@
                     }
                 }
 
-                if (visible_files != null)
+                /* This is the only place that new thumbnail files are created */ 
+                if (visible_files != null) {
                     thumbnailer.queue_files (visible_files, out thumbnail_request, large_thumbnails);
-
+                }
                 thumbnail_source_id = 0;
                 return false;
             });

=== modified file 'src/marlin-thumbnailer.c'
--- src/marlin-thumbnailer.c	2015-06-21 10:02:48 +0000
+++ src/marlin-thumbnailer.c	2016-04-03 16:22:43 +0000
@@ -707,6 +707,8 @@
         {
             /* set thumbnail state to ready - we now have a thumbnail */
             gof_file_set_thumb_state (file, GOF_FILE_THUMB_STATE_READY);
+            /* ensure new thumbnail is displayed */
+            gof_file_query_thumbnail_update (file);
         }
         g_object_unref (file);
     }
@@ -847,9 +849,14 @@
      * processed (and awaiting to be refreshed) */
     for (lp = g_list_last (files); lp != NULL; lp = lp->prev)
     {
-        /* 1067061 - Do not thumbnail network files */
-        if (!gof_file_is_remote_uri_scheme(lp->data) && marlin_thumbnailer_file_is_supported (thumbnailer, lp->data))
-                supported_files = g_list_prepend (supported_files, lp->data);
+        /* 1067061 - Do not thumbnail network files or unsupported files */
+        if (!gof_file_is_remote_uri_scheme(lp->data) &&
+            marlin_thumbnailer_file_is_supported (thumbnailer, lp->data)) {
+
+                 supported_files = g_list_prepend (supported_files, lp->data);
+        } else {
+            gof_file_set_thumb_state (lp->data, GOF_FILE_THUMB_STATE_NONE);
+        }
     }
 
     /* determine how many URIs are in the wait queue */