Merge lp:~michael-sheldon/thumbnailer/fix-1499341 into lp:thumbnailer

[Michael Sheldon]

Fall back to full content type detector if the fast detector fails to return anything useful (e.g. because a file doesn't have an extension)

Fall back to full content type detector if the fast detector fails to return anything useful (e.g. because a file doesn't have an extension)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/174/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Thank you for the fix, much appreciated!

review: Approve

[Michi Henning (michihenning)]

Oops, I just realized: this is targeted at trunk, but should be targeted at devel instead. Could you re-target please?

Unmerged revisions

=== modified file 'src/thumbnailer.cpp'
--- src/thumbnailer.cpp	2015-09-15 09:37:17 +0000
+++ src/thumbnailer.cpp	2015-09-25 11:31:37 +0000
@@ -565,6 +565,29 @@
         return ImageData(FetchStatus::error, Location::local);  // LCOV_EXCL_LINE
     }
 
+    if (content_type == "application/octet-stream") {
+        // The FAST_CONTENT_TYPE detector will return 'application/octet-stream'
+        // for all files without an extension (as it only uses the extension to
+        // determine file type), in these cases we fall back to the full content
+        // type detector.
+        gobj_ptr<GFileInfo> full_info(g_file_query_info(file.get(), G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+                                                        G_FILE_QUERY_INFO_NONE,
+                                                        /* cancellable */ NULL,
+                                                        /* error */ NULL));
+
+        if (!full_info)
+        {
+            return ImageData(FetchStatus::error, Location::local);  // LCOV_EXCL_LINE
+        }
+
+        content_type = g_file_info_get_attribute_string(full_info.get(), G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+        if (content_type.empty())
+        {
+            return ImageData(FetchStatus::error, Location::local);  // LCOV_EXCL_LINE
+        }
+
+    }
+
     // Call the appropriate image extractor and return the image data as JPEG (not scaled).
     // We indicate that full-size images are to be cached only for audio and video files,
     // for which extraction is expensive. For local images, we don't cache full size.