use thumbnails as backup.

Author: mtwebster

libnemo-private/nemo-file.c

@@ -4555,6 +4555,18 @@ nemo_file_has_loaded_thumbnail (NemoFile *file)
     return file->details->thumbnail_is_up_to_date;
 }
 
+char *
+nemo_file_get_thumbnail_path (NemoFile *file)
+{
+    g_return_val_if_fail (NEMO_IS_FILE (file), NULL);
+
+    if (file->details->thumbnail_path != NULL) {
+        return g_strdup (file->details->thumbnail_path);
+    }
+
+    return NULL;
+}
+
 static void
 prepend_icon_name (const char *name,
 		   GThemedIcon *icon)

libnemo-private/nemo-file.h

@@ -252,6 +252,7 @@ NemoRequestStatus   nemo_file_get_deep_counts                   (NemoFile
 gboolean                nemo_file_should_show_thumbnail             (NemoFile                   *file);
 void                    nemo_file_delete_thumbnail                  (NemoFile                   *file);
 gboolean                nemo_file_has_loaded_thumbnail              (NemoFile                   *file);
+char *                  nemo_file_get_thumbnail_path                (NemoFile                   *file);
 gboolean                nemo_file_should_show_directory_item_count  (NemoFile                   *file);
 gboolean                nemo_file_should_show_type                  (NemoFile                   *file);
 GList *                 nemo_file_get_keywords                      (NemoFile                   *file);

libnemo-private/nemo-preview-image.c

@@ -24,6 +24,7 @@
 #include "nemo-preview-image.h"
 #include "nemo-file-attributes.h"
 #include "nemo-icon-info.h"
+#include "nemo-thumbnails.h"
 #include <glib/gi18n.h>
 
 #define RESIZE_DEBOUNCE_MS 150
@@ -218,23 +219,6 @@ on_drawing_area_draw (GtkWidget *widget,
 	return TRUE;
 }
 
-static gboolean
-is_image_file (NemoFile *file)
-{
-	gchar *mime_type;
-	gboolean is_image;
-
-	if (file == NULL || nemo_file_is_directory (file)) {
-		return FALSE;
-	}
-
-	mime_type = nemo_file_get_mime_type (file);
-	is_image = mime_type != NULL && g_str_has_prefix (mime_type, "image/");
-	g_free (mime_type);
-
-	return is_image;
-}
-
 static void
 load_icon_at_size (NemoPreviewImage *widget,
                    gint              width,
@@ -335,40 +319,59 @@ load_image_at_size (NemoPreviewImage *widget,
                     gint              height)
 {
 	NemoPreviewImagePrivate *priv;
-	GFile *location;
-	gchar *path;
 	GdkPixbuf *pixbuf = NULL;
 	cairo_surface_t *surface = NULL;
 	gint ui_scale;
 	GError *error = NULL;
 
 	priv = nemo_preview_image_get_instance_private (widget);
+    ui_scale = gtk_widget_get_scale_factor (GTK_WIDGET (widget));
 
-	if (priv->file == NULL || !is_image_file (priv->file)) {
+	if (priv->file == NULL) {
 		return;
 	}
 
 	if (width <= 1 || height <= 1) {
 		return;
 	}
 
-	location = nemo_file_get_location (priv->file);
-	path = g_file_get_path (location);
-	g_object_unref (location);
-
-	if (path == NULL) {
-		return;
+    if (nemo_can_thumbnail_internally (priv->file)) {
+        gchar *path = nemo_file_get_path (priv->file);
+
+        if (path != NULL) {
+            pixbuf = gdk_pixbuf_new_from_file_at_scale (path,
+                                                        width * ui_scale,
+                                                        height * ui_scale,
+                                                        TRUE,
+                                                        &error);
+            if (error != NULL) {
+                g_warning ("Failed to load direct image preview: %s", error->message);
+                g_clear_error (&error);
+            }
+
+            g_free (path);
+        }
+    }
+
+	if (pixbuf == NULL && nemo_file_has_loaded_thumbnail (priv->file)) {
+		gchar *thumbnail_path = nemo_file_get_thumbnail_path (priv->file);
+
+		if (thumbnail_path != NULL) {
+			pixbuf = gdk_pixbuf_new_from_file_at_scale (thumbnail_path,
+			                                            width * ui_scale,
+			                                            height * ui_scale,
+			                                            TRUE,
+			                                            &error);
+
+            if (error != NULL) {
+                g_warning ("Failed to load file thumbnail for preview: %s", error->message);
+                g_clear_error (&error);
+            }
+
+            g_free (thumbnail_path);
+		}
 	}
 
-	ui_scale = gtk_widget_get_scale_factor (GTK_WIDGET (widget));
-
-	/* Load image directly at the exact size we need */
-	pixbuf = gdk_pixbuf_new_from_file_at_scale (path,
-	                                             width * ui_scale,
-	                                             height * ui_scale,
-	                                             TRUE,
-	                                             &error);
-
 	if (pixbuf != NULL) {
 		/* Save pixbuf for quick scaling during resize */
 		if (priv->current_pixbuf != NULL) {
@@ -402,8 +405,6 @@ load_image_at_size (NemoPreviewImage *widget,
 		gtk_widget_hide (priv->drawing_area);
 	}
 
-	g_free (path);
-
 	priv->current_width = width;
 	priv->current_height = height;
 }
@@ -510,7 +511,7 @@ on_size_allocate (GtkWidget     *widget,
 	                   allocation->height < priv->current_height);
 
 	/* If getting smaller, immediately scale down the current pixbuf for responsive UI */
-	if (getting_smaller && priv->current_pixbuf != NULL) {
+	if (priv->current_pixbuf != NULL) {
 		scale_current_pixbuf_to_size (preview, allocation->width, allocation->height);
 	}
 
@@ -569,9 +570,7 @@ nemo_preview_image_set_file (NemoPreviewImage *widget,
 
 	if (file != NULL) {
 		nemo_file_ref (file);
-
-		if (is_image_file (file)) {
-			/* Load the image at current widget size */
+		if (nemo_can_thumbnail_internally (file) || nemo_file_has_loaded_thumbnail (file)) {
 			priv->showing_icon = FALSE;
 			gtk_widget_get_allocation (GTK_WIDGET (widget), &allocation);
 			load_image_at_size (widget, allocation.width, allocation.height);

src/nemo-window-menus.c

@@ -1982,7 +1982,7 @@ nemo_window_initialize_menus (NemoWindow *window)
     gtk_action_set_visible (action_to_hide, eel_vfs_supports_uri_scheme ("trash"));
     action_to_hide = gtk_action_group_get_action (action_group, "Go to Network");
     gtk_action_set_visible (action_to_hide, eel_vfs_supports_uri_scheme ("network"));
-g_printerr ("FUCKKKKKK\n");
+
 	gtk_action_group_add_toggle_actions (action_group,
 					     main_toggle_entries, G_N_ELEMENTS (main_toggle_entries),
 					     window);