Ticket #716: mythgallery_7638.diff

singleview.cpp

@@ -26 +26 @@
 #include <qtimer.h>
 #include <qpainter.h>
 
+#include <mythtv/uitypes.h>
 #include <mythtv/mythcontext.h>
 #include <mythtv/util.h>
 

gallerysettings.cpp

@@ -8 +8 @@
 #include <qimage.h>
 
 #include "config.h"
+#include "constants.h"
 
 // General Settings
 
@@ -21 +22 @@
     return gc;
 };
 
+static HostLineEdit *MythGalleryFileFilter()
+{
+    HostLineEdit *gc = new HostLineEdit("GalleryFileFilter");
+    gc->setLabel(QObject::tr("Filename Filter"));
+    gc->setValue(MEDIA_FILENAMES);
+    gc->setHelpText(QObject::tr("Exclude images not matching filter. " 
+                        "Use semicolon or space as separator. Search is case sensitive. Example: HI_*;LOW_*;[0-9]*;*.tiff"));
+    return gc;
+};
+
+
 static HostCheckBox *MythGalleryThumbnailLocation()
 {
     HostCheckBox *gc = new HostCheckBox("GalleryThumbnailLocation");
@@ -150 +162 @@
         setUseLabel(false);
 
         addChild(MythGalleryDir());
+        addChild(MythGalleryFileFilter());
+        
         addChild(MythGalleryThumbnailLocation());
         addChild(MythGalleryImportDirs());
         addChild(MythGalleryMoviePlayerCmd());

iconview.cpp

@@ -915 +915 @@
     if (!d.exists())
         return;
 
-    d.setNameFilter(MEDIA_FILENAMES);
+    //JC Skip filenames not in GalleryFileFilter
+    d.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
+    
     d.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase);
     d.setFilter(QDir::Files | QDir::Dirs | QDir::NoSymLinks  | QDir::Readable);
     d.setMatchAllDirs(true);

thumbgenerator.cpp

@@ -189 +189 @@
 {
     QDir dir(fi.absFilePath());
     dir.setFilter(QDir::Files);
+    
+    // JC 091105: skip filenames not in GalleryFileFilter
+    dir.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
+    dir.setMatchAllDirs(true);
+
     const QFileInfoList *list = dir.entryInfoList();
     if (!list)
         return;
@@ -196 +201 @@
     QFileInfoListIterator it( *list );
     QFileInfo *f;
 
-    bool found = false;
     while ( (f = it.current()) != 0 ) {
-        if (QImage::imageFormat(f->absFilePath()) != 0) {
-            found = true;
-            break;
+        // let loadFile() to make this stuff so we can get thumbnails for folders containting just videos
+        QImage img;
+        if (loadFile(img,*f))
+        {
+          image = img;
+          return;
         }
         ++it;
     }
-
-    if (found) {
-        image.load(f->absFilePath());
-        return;
-    }
-    else {
+    if (true) {
+    
         // if we didn't find the image yet
         // go into subdirs and keep looking
 
@@ -233 +236 @@
     }
 }
 
-void ThumbGenerator::loadFile(QImage& image, const QFileInfo& fi)
+/* JC
+/  returns true if the thumbnail image was loaded */
+bool ThumbGenerator::loadFile(QImage& image, const QFileInfo& fi)
 {
   if (GalleryUtil::isMovie(fi.filePath()))
   {
-      bool thumbnailCreated = false;
       QDir tmpDir("/tmp/mythgallery");
       if (! tmpDir.exists())
       {
@@ -252 +256 @@
           QString cmd = "cd \"" + tmpDir.absPath()
             + "\"; mplayer -nosound -frames 1 -vo png \"" + fi.absFilePath() +
             "\"";
+          
           if (myth_system(cmd) == 0)
           {
               QFileInfo thumb(tmpDir.filePath("00000001.png"));
@@ -259 +264 @@
               {
                 QImage img(thumb.absFilePath());
                 image = img;
-                thumbnailCreated = true;
+                return true;
               }
           }
       }
-      if (! thumbnailCreated)
+      // Failed to create movie thumbnail
+      if (true)
       {
         QImage *img = gContext->LoadScaleImage("gallery-moviethumb.png");
         if (img)
@@ -274 +280 @@
   }
   else
   {
+    //JC
+    //verify we understand it
+    if (QImage::imageFormat(fi.absFilePath()) != 0)
+    {
       image.load(fi.absFilePath());
+      return true;
+    }
+    else
+    {
+        // should exist a gallery-unknownformat.png
+        std::cerr << "file " << fi.absFilePath() << " format undestod:" << QImage::imageFormat(fi.absFilePath()) << std::cerr;
+        QImage *img = gContext->LoadScaleImage("gallery-moviethumb.png");
+        if (img)
+        {
+          image = *img;
+        }    
+    }    
   }
+  return false;
 }
 
 QString ThumbGenerator::getThumbcacheDir(const QString& inDir)

thumbgenerator.h

@@ -59 +59 @@
     bool checkGalleryDir(const QFileInfo& fi);
     bool checkGalleryFile(const QFileInfo& fi);
     void loadDir(QImage& image, const QFileInfo& fi);
-    void loadFile(QImage& image, const QFileInfo& fi);
+    bool loadFile(QImage& image, const QFileInfo& fi);
     
     bool mkpath(const QString& inPath);
 

galleryutil.cpp

@@ -25 +25 @@
 #include "galleryutil.h"
 #include "thumbgenerator.h"
 
+#include <mythtv/mythcontext.h>
+
 #ifdef EXIF_SUPPORT
 #include <libexif/exif-data.h>
 #include <libexif/exif-entry.h>
@@ -141 +143 @@
     if (thumbGen)
         thumbGen->getThumbcacheDir(currDir);
 
-    d.setNameFilter(MEDIA_FILENAMES);
+    // JC Skip filenames not in GalleryFileFilter
+    d.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
     d.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase);
 
     d.setMatchAllDirs(true);