Ticket #6125: mythgallery_filter.diff

mythgallery/gallerysettings.cpp

@@ -11 +11 @@
 
 // General Settings
 
+static HostLineEdit *MythGalleryFilter()
+{
+    HostLineEdit *gc = new HostLineEdit("GalleryFilter");
+    gc->setLabel(QObject::tr("Directory filter"));
+        gc->setValue("");
+    gc->setHelpText(QObject::tr("Enter direcory names to be excluded in browser. "
+                       "(multiple entries delimited with ':')"));
+    return gc;
+};
+
 static HostLineEdit *MythGalleryDir()
 {
     HostLineEdit *gc = new HostLineEdit("GalleryDir");
@@ -218 +228 @@
     general->addChild(MythGallerySortOrder());
     general->addChild(MythGalleryImportDirs());
     general->addChild(MythGalleryMoviePlayerCmd());
+    general->addChild(MythGalleryFilter());
     addChild(general);
 
     GalleryConfigurationGroup* config = new GalleryConfigurationGroup();

mythgallery/galleryutil.cpp

@@ -144 +144 @@
     QString blah = dir;
     QDir d(blah);
     QString currDir = d.absPath();
+        QStringList filterDir(QStringList::split(":", gContext->GetSetting("GalleryFilter")));
 
     bool isGallery;
     const QFileInfoList* gList = d.entryInfoList("serial*.dat", QDir::Files);
@@ -186 +187 @@
                 (fi->fileName().find(".highlight.") > 0)))
             continue;
 
+                // skip filtered directory
+                if (fi->isDir() && filterDir.count() > 0)
+                {
+                        bool match = false;
+                        
+            for (QStringList::Iterator itFD = filterDir.begin(); itFD != filterDir.end(); itFD++) {
+                            if ( *itFD == fi->fileName())
+                {
+                    match = true;
+                                        break;
+                    }
+            }
+                        if (match)
+                                continue;
+                }
+                
         if (fi->isDir() && recurse) 
         {
             GalleryUtil::LoadDirectory(
@@ -194 +211 @@
         }
         else 
         {
-            ThumbItem *item = new ThumbItem(
-                fi->fileName(),
-                QDir::cleanDirPath(fi->absFilePath()), fi->isDir());
+                ThumbItem *item = new ThumbItem(
+                    fi->fileName(),
+                    QDir::cleanDirPath(fi->absFilePath()), fi->isDir());
 
-            itemList.append(item);
+                itemList.append(item);
 
-            if (itemDict)
-                itemDict->insert(item->GetName(), item);
+                if (itemDict)
+                    itemDict->insert(item->GetName(), item);
 
-            if (thumbGen)
-                thumbGen->addFile(item->GetName());
+                if (thumbGen)
+                    thumbGen->addFile(item->GetName());
         }
     }