Ticket #6376: 142-savetranscode.fixes.patch

mythtv/libs/libmythtv/programinfo.cpp

@@ -1607 +1607 @@
     return tmpURL;
 }
 
+bool ProgramInfo::DuplicateForTranscoding()
+{
+    // Create new recording basename and update this object to identify as transcoded
+    // recording:
+    //   Modify the recgroupd -> "Deleted"
+    //   Set to autoexpire
+    //   Insert it all into the database
+    //   Copy the current seek table and markup to the new recording keys
+    //
+
+    if (!record)
+    {
+        record = new ScheduledRecording();
+        record->loadByProgram(this);
+    }
+
+    QString dirname = pathname;
+    QDateTime from_recstartts = recstartts;
+    QString from_pathname = pathname;
+
+    recgroup = "Deleted";
+
+    QString ext = pathname.section('.', -1);
+
+    hostname = gContext->GetHostName();
+    pathname = CreateRecordBasename(ext);
+
+    int count = 0;
+    while (!insert_program(this, record) && count < 50)
+    {
+        recstartts = recstartts.addSecs(1);
+        pathname = CreateRecordBasename(ext);
+        count++;
+    }
+
+    if (count >= 50)
+    {
+        VERBOSE(VB_IMPORTANT, "Couldn't insert program for transcode");
+        return false;
+    }
+
+    VERBOSE(VB_GENERAL, QString("Orig: %1, New: %2").arg(from_pathname).arg(pathname));
+
+    // Set to autoexpire
+    SetAutoExpire(kDeletedAutoExpire);
+    UpdateLastDelete(true);
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    // Copy the original recordedseek
+    query.prepare("CREATE TEMPORARY TABLE tmp_recordedseek"
+                  " SELECT * FROM recordedseek WHERE chanid = :CHANID"
+                  " AND starttime = :START;");
+
+    query.bindValue(":CHANID", chanid);
+    query.bindValue(":START", from_recstartts);
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Create temp table recordedseek on program duplicate", query);
+
+    // Update recordedseek to have the new starttime
+    query.prepare("UPDATE tmp_recordedseek SET starttime = :START;");
+    query.bindValue(":START", recstartts);
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Update tmp table on program duplicate", query);
+
+    // Copy back into the real recordedseek table
+    query.prepare("INSERT INTO recordedseek SELECT * from tmp_recordedseek;");
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Copy back into recordedseek on program duplicate", query);
+
+    query.prepare("DROP TABLE tmp_recordedseek;");
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Drop temp table recordedseek on program duplicate", query);
+
+
+    // Do the same thing for recordedmarkup
+
+    // Copy the original recordedmarkup
+    query.prepare("CREATE TEMPORARY TABLE tmp_recordedmarkup"
+                  " SELECT * FROM recordedmarkup WHERE chanid = :CHANID"
+                  " AND starttime = :START;");
+
+    query.bindValue(":CHANID", chanid);
+    query.bindValue(":START", from_recstartts);
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Create temp table recordedmarkup on program duplicate", query);
+
+    // Update recordedseek to have the new starttime
+    query.prepare("UPDATE tmp_recordedmarkup SET starttime = :START;");
+    query.bindValue(":START", recstartts);
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Update tmp table on program duplicate", query);
+
+    // Copy back into the real recordedmarkup table
+    query.prepare("INSERT INTO recordedmarkup SELECT * from tmp_recordedmarkup;");
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Copy back into recordedmarkup on program duplicate", query);
+
+    query.prepare("DROP TABLE tmp_recordedmarkup;");
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("Drop temp table recordedmarkup on program duplicate", query);
+
+    return true;
+}
+
 /**
  *  \brief Inserts this ProgramInfo into the database as an existing recording.
  *  
@@ -1718 +1829 @@
         if (!query.isActive())
             MythContext::DBError("insert_program -- select", query);
         else
-            VERBOSE(VB_IMPORTANT, "recording already exists...");
+            VERBOSE(VB_IMPORTANT, QString("recording already exists for chanid %1 starttime %2")
+                                  .arg(pg->chanid).arg(pg->recstartts.toString("yyyyMMddhhmmss")));
 
         query.prepare("UNLOCK TABLES");
         query.exec();

mythtv/libs/libmythtv/programinfo.h

@@ -215 +215 @@
                                    const QString &newSubtitle);
     void ApplyTranscoderProfileChange(QString);
 
+    // If we're transcoding and saving the original file, this
+    // will duplicate the ProgramInfo so both the original and
+    // Transcoded recording exist in MythTV
+    // returns true if successful
+    bool DuplicateForTranscoding();
+
     // Quick gets
     bool SetRecordBasename(QString basename);
     QString GetRecordBasename(bool fromDB = false) const;

mythtv/libs/libmythtv/remoteutil.cpp

@@ -276 +276 @@
     bool result = false;
 
     bool undelete_possible = 
-            gContext->GetNumSetting("AutoExpireInsteadOfDelete", 0);
+            gContext->GetNumSetting("AutoExpireInsteadOfDelete", 0) ||
+            gContext->GetNumSetting("SaveTranscoding", 0);
 
     if (!undelete_possible)
         return result;

mythtv/programs/mythbackend/mainserver.cpp

@@ -2181 +2181 @@
 {
     bool ret = -1;
     bool undelete_possible = 
-            gContext->GetNumSetting("AutoExpireInsteadOfDelete", 0);
+            gContext->GetNumSetting("AutoExpireInsteadOfDelete", 0) ||
+            gContext->GetNumSetting("SaveTranscoding", 0);
+
     MythSocket *pbssock = NULL;
     if (pbs)
         pbssock = pbs->getSocket();

mythtv/programs/mythtranscode/main.cpp

@@ -27 +27 @@
                        ProgramInfo *pginfo);
 int BuildKeyframeIndex(MPEG2fixup *m2f, QString &infile,
                         QMap <long long, long long> &posMap, int jobID);
-void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist, int &resultCode);
+void CompleteJob(int jobID, ProgramInfo *pginfo, ProgramInfo *saved_pginfo, bool useCutlist, int &resultCode);
 void UpdateJobQueue(float percent_done);
 int CheckJobQueue();
 static int glbl_jobID = -1;
@@ -472 +472 @@
     }
 
     ProgramInfo *pginfo = NULL;
+    ProgramInfo *saved_pginfo = NULL; // in case we keep the original recording as deleted
     if (isVideo)
     {
         // We want the absolute file path for the filemarkup table
@@ -495 +496 @@
         }
 
         infile = pginfo->GetPlaybackURL(false, true);
+
+        // If we're saving the old file we need to save the cut and markup info now
+        if (gContext->GetNumSetting("SaveTranscoding", 0))
+        {
+            saved_pginfo = new ProgramInfo(*pginfo);
+            if (!saved_pginfo->DuplicateForTranscoding())
+            {
+                delete saved_pginfo;
+                saved_pginfo = NULL;
+            }
+        }
     }
     else
     {
@@ -643 +655 @@
     delete transcode;
 
     if (jobID >= 0)
-        CompleteJob(jobID, pginfo, useCutlist, exitcode);
+        CompleteJob(jobID, pginfo, saved_pginfo, useCutlist, exitcode);
 
+    if (saved_pginfo)
+        delete saved_pginfo;
     delete pginfo;
     delete gContext;
     return exitcode;
@@ -777 +791 @@
     return unlink(filename);
 }
 
-void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist, int &resultCode)
+void CompleteJob(int jobID, ProgramInfo *pginfo, ProgramInfo *saved_pginfo, bool useCutlist, int &resultCode)
 {
     int status = JobQueue::GetJobStatus(jobID);
 
@@ -817 +831 @@
             perror(QString("mythtranscode: Error Renaming '%1' to '%2'")
                    .arg(tmpfile).arg(newfile).ascii());
 
-        if (!gContext->GetNumSetting("SaveTranscoding", 0))
+        if (gContext->GetNumSetting("SaveTranscoding", 0))
+        {
+            if (saved_pginfo)
+            {
+                // Get a new (old) filename
+                // and move the old transcode file to the new (old) filename
+
+                // Can't use GetPlaybackURL() because the target file doesn't exist yet.
+
+                QString origfilename = saved_pginfo->GetFileName();
+                QString origbasename = origfilename.section('/', -1);
+
+                QString dirname = oldfile.section('/', 0, -2);
+
+                QString origpath = dirname + "/" + origbasename;
+
+                if (rename(oldfile.local8Bit(), origpath.local8Bit()) == -1)
+                    perror(QString("mythtranscode: Error Renaming '%1' to '%2'")
+                           .arg(oldfile).arg(origpath).ascii());
+
+
+                // If we transcoded a "Deleted" program, undelete the output recording
+                if (pginfo->recgroup == "Deleted")
+                {
+                    pginfo->ApplyRecordRecGroupChange("Default");
+                    pginfo->UpdateLastDelete(false);
+                    pginfo->SetAutoExpire(kDisableAutoExpire);
+                }
+            }
+        }
+        else
         {
             int err;
             bool followLinks = gContext->GetNumSetting("DeletesFollowLinks", 0);

mythtv/programs/mythtv-setup/backendsettings.cpp

@@ -122 +122 @@
     gc->setLabel(QObject::tr("Save original files after transcoding (globally)"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("When set and the transcoder is active, the "
-                    "original files will be renamed to .old once the "
+                    "original recording will be moved to the 'Deleted' recording group once the "
                     "transcoding is complete."));
     return gc;
 };