Ticket #716: mythgallery.10213.diff

mythgallery/i18n/mythgallery_es.ts

@@ -116 +116 @@
         <translation>Este directorio tiene que existir y se necesita permiso de lectura.</translation>
     </message>
     <message>
+        <source>Filename Filter</source>
+        <translation>Filtro por nombre</translation>
+    </message>
+    <message>
+        <source>Exclude images not matching filter. Search is case sensitive. Example: HI_* LOW_* [0-9]* *.tiff</source>
+        <translation>Excluye ficheros que no complen el patron. Es sensible a mayusculas. Ejemplo: HI_* LOW_* [0-9]* *.tiff</translation>
+    </message>
+    <message>
         <source>Paths to import images from</source>
         <translation>Ruta desde donde se importan las imágenes</translation>
     </message>

mythgallery/mythgallery/gallerysettings.cpp

@@ -8 +8 @@
 #include <qimage.h>
 
 #include "config.h"
-
+#include "constants.h"
 // General Settings
 
 static HostLineEdit *MythGalleryDir()
@@ -21 +21 @@
     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. Search is case sensitive. Example: HI_* LOW_* [0-9]* *.tiff"));
+    return gc;
+};
+
 static HostCheckBox *MythGalleryThumbnailLocation()
 {
     HostCheckBox *gc = new HostCheckBox("GalleryThumbnailLocation");
@@ -160 +169 @@
         setUseLabel(false);
 
         addChild(MythGalleryDir());
+        addChild(MythGalleryFileFilter());
         addChild(MythGalleryThumbnailLocation());
         addChild(MythGalleryImportDirs());
         addChild(MythGalleryMoviePlayerCmd());

mythgallery/mythgallery/iconview.cpp

@@ -118 +118 @@
     m_isGallery   = false;
     m_showDevices = false;
     m_currDevice  = initialDevice;
+    
+    //JC 170606: restore MEDIA_FILENAMES
+    if (!gContext->GetSetting("GalleryFileFilter") || gContext->GetSetting("GalleryFileFilter")=="")
+      gContext->SaveSetting("GalleryFileFilter", MEDIA_FILENAMES);
+    
+    std::cerr << "FileFilter is " << gContext->GetSetting("GalleryFileFilter") << std::endl;
 
     srand(time(NULL));
 

mythgallery/mythgallery/thumbgenerator.cpp

@@ -200 +200 @@
 {
     QDir dir(fi.absFilePath());
     dir.setFilter(QDir::Files);
+
+//  JC 170606: Skip filenames not in GalleryFileFilter
+    dir.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
+    
     const QFileInfoList *list = dir.entryInfoList();
     if (!list)
         return;

mythgallery/mythgallery/galleryutil.cpp

@@ -1 @@
-/* ============================================================
+  /* ============================================================
  * File  : exifutil.cpp
  * Description : 
  * 
@@ -156 +156 @@
     if (thumbGen)
         thumbGen->getThumbcacheDir(currDir);
 
-    d.setNameFilter(MEDIA_FILENAMES);
+//  JC 170606: Skip filenames not in GalleryFileFilter
+    d.setNameFilter(gContext->GetSetting("GalleryFileFilter"));
+
     d.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase);
 
     d.setMatchAllDirs(true);