gnome-commander r1957 - in trunk: . src/tags

[epiotr svn gnome org]

Author: epiotr
Date: Sat Aug  9 19:36:30 2008
New Revision: 1957
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1957&view=rev

Log:
Do not search metatags for non-pdf documents

Modified:
   trunk/ChangeLog
   trunk/src/tags/gnome-cmd-tags-poppler.cc

Modified: trunk/src/tags/gnome-cmd-tags-poppler.cc
==============================================================================
--- trunk/src/tags/gnome-cmd-tags-poppler.cc	(original)
+++ trunk/src/tags/gnome-cmd-tags-poppler.cc	Sat Aug  9 19:36:30 2008
@@ -301,10 +301,12 @@
     if (!finfo->metadata)  return;
 
     finfo->metadata->mark_as_accessed(TAG_PDF);
-    finfo->metadata->mark_as_accessed(TAG_DOC);
 
     if (!gnome_cmd_file_is_local (finfo))  return;
 
+    // skip non pdf files, as pdf metatags extraction is very expensive...
+    if (!strstr (finfo->info->mime_type, "pdf"))  return;
+
     gchar *fname = gnome_cmd_file_get_real_path (finfo);
 
     DEBUG('t', "Loading PDF metadata for '%s'\n", fname);
@@ -316,6 +318,8 @@
     if (!doc.isOk())
         return;
 
+    finfo->metadata->mark_as_accessed(TAG_DOC);
+
     finfo->metadata->addf(TAG_PDF_VERSION, "%.1f", doc.getPDFVersion());
     finfo->metadata->addf(TAG_DOC_PAGECOUNT, "%i", doc.getNumPages());
     finfo->metadata->addf(TAG_PDF_OPTIMIZED, "%u", doc.isLinearized());
@@ -331,7 +335,7 @@
     finfo->metadata->addf(TAG_PDF_ACCESSIBILITYSUPPORT, "%u", doc.okToAccessibility());
     finfo->metadata->addf(TAG_PDF_DOCASSEMBLY, "%u", doc.okToAssemble());
 
-    if (doc.getPDFVersion()>0)
+    if (doc.getNumPages()>0)
     {
         double width = doc.getPageCropWidth(1)/72.0f*25.4f;
         double height = doc.getPageCropHeight(1)/72.0f*25.4f;