Ticket #248: mythvideo-dvd-copy-feature.patch

mythvideo/metadata.cpp

@@ -1 +1 @@
 #include <qfile.h>
+#include <qdir.h>
+#include <qfileinfo.h>
 #include <cmath>
 #include <iostream>
 #include <mythtv/mythdbcon.h>
@@ -76 +78 @@
     }
 }
 
+bool Metadata::removeDir(QString& dirName)
+{
+    QDir d(dirName);
+
+    const QFileInfoList *contents = d.entryInfoList();
+    if (!contents)
+    {
+        return d.rmdir(dirName);
+    }
+
+    const QFileInfoListIterator it(*contents);
+    QFileInfo *fi;
+
+    while ((fi = it.current()) != 0)
+    {
+        if (fi->fileName() == "." ||
+            fi->fileName() == "..")
+        {
+            continue;
+        }
+        if (fi->isDir())
+        {
+            QString fileName = fi->fileName();
+            if (!removeDir(fileName))
+                return false;
+        }
+        else
+        {
+            if (!QFile(fi->fileName()).remove())
+                return false;
+        }
+    }
+    return d.rmdir(dirName);
+}
+
 bool Metadata::Remove()
 {
-    QFile videofile;
-    videofile.setName(filename);
-    bool isremoved = videofile.remove();
+    bool isremoved = false;
+    QFileInfo fi(filename);
+    if (fi.isDir())
+    {
+        isremoved = removeDir(filename);
+    }
+    else
+    {
+        QFile videofile;
+        videofile.setName(filename);
+        isremoved = videofile.remove();
+    }
     if (isremoved)
     {
         MSqlQuery query(MSqlQuery::InitCon());

mythvideo/dbcheck.cpp

@@ -96 +96 @@
 "    VALUES (\"vob\", \"\", 0, 1);",
 "INSERT INTO videotypes (extension, playcommand, f_ignore, use_default)"
 "    VALUES (\"mpeg\", \"\", 0, 1);",
+"INSERT INTO videotypes (extension, playcommand, f_ignore, use_default)"
+"    VALUES (\"VIDEO_TS\", \"mplayer -fs -zoom -quiet -vo xv -dvd-device %s dvd://1\", 0, 1);",
 ""
 };
         dbver = "";

mythvideo/videoscan.cpp

@@ -191 +191 @@
         
         QString filename = fi->absFilePath();
         if (fi->isDir())
-            buildFileList(filename, imageExtensions);
+        {
+            if (fi->fileName() == QString("VIDEO_TS") ||
+                fi->fileName() == QString("video_ts"))
+            {
+                filename = fi->dirPath(true);
+                if (!filename.isEmpty())
+                    m_VideoFiles[filename] = kFileSystem;
+            }
+            else
+                buildFileList(filename, imageExtensions);
+        }
         else
         {
             r.setPattern("^" + fi->extension() + "$");

mythvideo/metadata.h

@@ -181 +181 @@
     void updateCountries();
     void fillGenres();
     void updateGenres();
+    bool removeDir(QString& dirName);
     QImage* coverImage;
     QPixmap* coverPixmap;