Ticket #125: dvdimage.diff

mythplugins/mythdvd/mythdvd/titledialog.cpp

@@ -113 +113 @@
         if(quality_select)
         {
             quality_select->cleanOut();
+            quality_select->addItem(-1, tr("ISO Image"));
             quality_select->addItem(0, tr("Perfect"));
             QString q_string = QString("SELECT name,intid FROM dvdtranscode "
                                        "WHERE input = %1 ;")

mythplugins/mythdvd/mtd/jobthread.cpp

@@ -8 +8 @@
 
 */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <iostream>
 using namespace std;
 
@@ -543 +547 @@
 ---------------------------------------------------------------------
 */
 
+DVDISOCopyThread::DVDISOCopyThread(MTD *owner, 
+                                   QMutex *drive_mutex, 
+                                   const QString &dvd_device, 
+                                   int track, 
+                                   const QString &dest_file, 
+                                   const QString &name,
+                                   const QString &start_string,
+                                   int nice_priority)
+                 :DVDThread(owner,
+                            drive_mutex, 
+                            dvd_device, 
+                            track, 
+                            dest_file, 
+                            name,
+                            start_string,
+                            nice_priority)
+
+{
+}
+
+void DVDISOCopyThread::run()
+{
+    //
+    //  Be nice
+    //
+    
+    nice(nice_level);
+    job_name = QString(QObject::tr("ISO Image Copy of %1")).arg(rip_name);
+    if(keepGoing())
+    {
+        copyFullDisc();
+    }
+}
+
+bool DVDISOCopyThread::copyFullDisc(void)
+{
+    bool loop = true;
+
+    setSubName(QObject::tr("Waiting for Access to DVD"), 1);
+
+    while(loop)
+    {
+        if(dvd_device_access->tryLock())
+        {
+            loop = false;
+        }
+        else
+        {
+            if(keepGoing())
+            {
+                sleep(5);
+            }
+            else
+            {
+                problem("abandoned job because master control said we need to shut down");
+                return false;
+            }
+        }
+    }
+
+    if(!keepGoing())
+    {
+        problem("abandoned job because master control said we need to shut down");
+        dvd_device_access->unlock();
+        return false;
+    }
+
+    ripfile = new RipFile(destination_file_string, ".iso");
+    if(!ripfile->open(IO_WriteOnly | IO_Raw | IO_Truncate, false))
+    {
+        problem(QString("DVDISOCopyThread could not open output file: %1").arg(ripfile->name()));
+        dvd_device_access->unlock();
+        return false;
+    }
+
+    sendLoggingEvent(QString("ISO DVD image copy to: %1").arg(ripfile->name()));
+
+    int file = open( dvd_device_location, O_RDONLY );
+    if(file == -1)
+    {
+        problem(QString("DVDISOCopyThread could not open dvd device: %1").arg(dvd_device_location));
+        ripfile->remove();
+        delete ripfile;
+        ripfile = NULL;
+        dvd_device_access->unlock();
+        return false;
+    }
+
+    off_t dvd_size = lseek(file, 0, SEEK_END);
+    lseek(file, 0, SEEK_SET);
+
+    int buf_size = 4098;
+    unsigned char *buffer = new unsigned char[buf_size];
+    long long total_bytes(0);
+
+    QTime job_time;
+    job_time.start();
+
+    while( 1 )
+    {
+        int bytes_read = read(file, buffer, buf_size);
+        if(bytes_read == -1)
+        {
+            perror("read");
+            problem(QString("DVDISOCopyThread dvd device read error"));
+            ripfile->remove();
+            delete ripfile;
+            ripfile = NULL;
+            delete buffer;
+            dvd_device_access->unlock();
+            return false;
+        }
+        if(bytes_read == 0)
+        {
+            break;
+        }
+
+        if(!ripfile->writeBlocks(buffer, bytes_read))
+        {
+            problem(QString("DVDISOCopyThread rip file write error"));
+            ripfile->remove();
+            delete ripfile;
+            ripfile = NULL;
+            delete buffer;
+            dvd_device_access->unlock();
+            return false;
+        }
+
+        total_bytes += bytes_read;
+
+        setSubProgress((double) (total_bytes) / (double) (dvd_size), 1);
+        overall_progress = subjob_progress * sub_to_overall_multiple;
+        updateSubjobString(job_time.elapsed() / 1000,
+                           QObject::tr("Ripping to file ~"));
+
+        //
+        //  Escape out and clean up if mtd main thread
+        //  tells us to
+        //
+            
+        if(!keepGoing())
+        {
+            problem("abandoned job because master control said we need to shut down");
+            ripfile->remove();
+            delete ripfile;
+            ripfile = NULL;
+            delete buffer;
+            dvd_device_access->unlock();
+            return false;
+        }
+    }
+
+    delete buffer;
+    ripfile->close();
+    delete ripfile;
+    dvd_device_access->unlock();
+    sendLoggingEvent("job thread finished copying ISO image");
+    return true;
+}
+
+DVDISOCopyThread::~DVDISOCopyThread()
+{
+}
+
+/*
+---------------------------------------------------------------------
+*/
+
 DVDPerfectThread::DVDPerfectThread(MTD *owner, 
                                    QMutex *drive_mutex, 
                                    const QString &dvd_device, 

mythplugins/mythdvd/mtd/jobthread.h

@@ -113 +113 @@
     QString      rip_name;
 };
 
+class DVDISOCopyThread : public DVDThread
+{
+    //
+    // Copy a byte-for-byte image of the disk
+    // to an iso file.
+    //
+
+  public:
+
+    DVDISOCopyThread(MTD *owner,
+                     QMutex *drive_mutex, 
+                     const QString &dvd_device, 
+                     int track, 
+                     const QString &dest_file, 
+                     const QString &name,
+                     const QString &start_string,
+                     int nice_priority);
+
+    ~DVDISOCopyThread();
+                     
+    virtual void run();
+
+    bool copyFullDisc(void);
+};
+
 class DVDPerfectThread : public DVDThread
 {
     //

mythplugins/mythdvd/mtd/mtd.cpp

@@ -625 +625 @@
     }
     
     int quality = tokens[4].toInt(&ok);
-    if(quality < 0 || !ok)
+    if(quality < -1 || !ok)
     {
         emit writeToLog(QString("bad quality value in job request: %1").arg(flat));
         return;
@@ -685 +685 @@
 
     //
     //  OK, we are ready to launch this job
-    // 
+    //
 
-    if(quality == 0)
+    if(quality == -1)
     {
         QFile final_file(dest_dir.filePath(file_name));
 
+        if(!checkFinalFile(&final_file, ".iso"))
+        {
+            emit writeToLog("Final file name is not useable. File exists? Other Pending job?");
+            return;
+        }
+    
+        emit writeToLog(QString("launching job: %1").arg(flat));
+
+        //
+        //  Full disc copy to an iso image.
+        //
+ 
+        JobThread *new_job = new DVDISOCopyThread(this, 
+                                                  dvd_drive_access, 
+                                                  dvd_device, 
+                                                  dvd_title, 
+                                                  final_file.name(), 
+                                                  file_name,
+                                                  flat,
+                                                  nice_level);
+        job_threads.append(new_job);
+        new_job->start();
+    }
+    else if(quality == 0)
+    {
+        QFile final_file(dest_dir.filePath(file_name));
+
         if(!checkFinalFile(&final_file, ".mpg"))
         {
             emit writeToLog("Final file name is not useable. File exists? Other Pending job?");