Ticket #303: DetectMediaType.diff

libs/libmyth/mythcdrom.cpp

@@ -9 +9 @@
 #include <cstdlib>
 #include <cerrno>
 
+#include <qdir.h>
+
 using namespace std;
 
 // end for testing
@@ -99 +101 @@
         m_Status = MEDIASTAT_USEABLE; 
     }
 
+    //
+    // Try to make an educated guess about the type of data present on the
+    // cd/dvd.
+    //
+    DetectMediaType(m_MountPath);
+    if (ExtensionMap.isEmpty ())
+    {
+        VERBOSE(VB_GENERAL,
+           QString("No files with extension found in '%1'").arg (m_MountPath));
+    } else {
+        struct {
+            int     type;
+            char    *extensions[16];
+        } TypeMapping[] = {
+                    { MEDIATYPE_MVIDEO,
+                        { "wmv", "mpg", "avi", "vob", "mpeg", "nuv", NULL }},
+                    { MEDIATYPE_MMUSIC,
+                        { "mp3", "ogg", "flac", NULL }},
+                    { MEDIATYPE_MGALLERY,
+                        { "tif", "jpg", "png", NULL }},
+                    { 0 , {NULL} }};
+
+        int  score = 0, highscore = 0, type = 0;
+        int  i; char **p;
+
+        for (i = 0, score = 0; TypeMapping[i].type != 0; i++)
+        {
+            for (p = TypeMapping[i].extensions; *p != NULL; p++)
+            {
+                if (ExtensionMap.contains(*p))
+                    score += ExtensionMap[*p];
+            }
+            if (score > highscore)
+                type = TypeMapping[i].type; highscore = score;
+        }
+        // cerr << "Cdtype: " << type << "Score: " << highscore << endl;
+    }
+    ExtensionMap.clear();
+ 
     if (m_AllowEject)
         unlock();
 }
 
+
+//
+// Recursively scan directories and create an associative array with
+// key: 'tolower(extension)' and value the number of times we've
+// seen it.
+//
+void MythCDROM::DetectMediaType(const QString& directory)
+{
+    QDir d(directory);
+
+    d.setSorting(QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
+    if (!d.exists())
+            return;
+
+    const QFileInfoList *list = d.entryInfoList();
+    if (!list)                        
+        return;
+
+    QFileInfoListIterator it(*list);
+    QFileInfo *fi;
+
+    while ((fi = it.current()) != 0)
+    {
+        ++it;
+        if (fi->fileName() == "." || fi->fileName() == ".." )
+                continue;
+        if (!fi->isDir())
+        {
+            QString extension = fi->extension(false);
+            if (!extension.isEmpty())
+            {
+                extension = extension.lower();
+                if (ExtensionMap.contains(extension))
+                    ExtensionMap[extension]++;
+                else
+                    ExtensionMap[extension] = 1;
+            }
+        }
+        else DetectMediaType(fi->absFilePath());
+    }
+}

libs/libmyth/mythcdrom.h

@@ -28 +28 @@
 
   protected:
     virtual void onDeviceMounted();
+    void DetectMediaType(const QString& directory);
+
+  private:
+     QMap<QString, int> ExtensionMap;
 };
 
 class MythCDROMLinux: public MythCDROM

libs/libmyth/mythmedia.h

@@ -19 +19 @@
     MEDIATYPE_MIXED=4,
     MEDIATYPE_AUDIO=8,
     MEDIATYPE_DVD=16,
-    MEDIATYPE_VCD=32
+    MEDIATYPE_VCD=32,
+    MEDIATYPE_MMUSIC=64,
+    MEDIATYPE_MVIDEO=128,
+    MEDIATYPE_MGALLERY=256
 } MediaType;
 
 typedef enum {