Ticket #7731: fix_bookmark_3.patch

programs/mythtranscode/main.cpp

@@ -28 +28 @@
                        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, bool useCutlist,
+                 QMap <long long, int> *deleteMap, int &resultCode);
 void UpdateJobQueue(float percent_done);
 int CheckJobQueue();
 static int glbl_jobID = -1;
@@ -674 +674 @@
     }
 
     if (jobID >= 0)
-        CompleteJob(jobID, pginfo, useCutlist, exitcode);
+        CompleteJob(jobID, pginfo, useCutlist, &deleteMap, exitcode);
 
     transcode->deleteLater();
 
@@ -816 +816 @@
     return unlink(filename.toLocal8Bit().constData());
 }
 
-void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist, int &resultCode)
+long long ComputeNewBookmark(long long oldBookmark,
+                             QMap<long long, int> *deleteMap)
 {
+    if (deleteMap == NULL)
+        return oldBookmark;
+    long long subtraction = 0;
+    long long startOfCutRegion = 0;
+    QMap<long long, int> delMap = *deleteMap;
+    bool withinCut = false;
+    while (delMap.count() && delMap.begin().key() <= oldBookmark)
+    {
+        if (delMap.begin().data() == MARK_CUT_START && !withinCut)
+        {
+            withinCut = true;
+            startOfCutRegion = delMap.begin().key();
+        }
+        else if (delMap.begin().data() == MARK_CUT_END && withinCut)
+        {
+            withinCut = false;
+            subtraction += (delMap.begin().key() - startOfCutRegion);
+        }
+        delMap.remove(delMap.begin());
+    }
+    if (withinCut)
+        subtraction += (oldBookmark - startOfCutRegion);
+    return oldBookmark - subtraction;
+}
+
+long long ReloadBookmark(ProgramInfo *pginfo)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    long long currentBookmark = 0;
+    query.prepare("SELECT DISTINCT mark FROM recordedmarkup "
+                  "WHERE chanid = :CHANID "
+                  "AND starttime = :STARTIME "
+                  "AND type = :MARKTYPE ;");
+    query.bindValue(":CHANID", pginfo->chanid);
+    query.bindValue(":STARTTIME", pginfo->recstartts);
+    query.bindValue(":MARKTYPE", MARK_BOOKMARK);
+    if (query.exec() && query.next())
+    {
+        currentBookmark = query.value(0).toLongLong();
+    }
+    return currentBookmark;
+}
+
+void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist,
+                 QMap <long long, int> *deleteMap, int &resultCode)
+{
     int status = JobQueue::GetJobStatus(jobID);
 
     if (!pginfo)
@@ -832 +879 @@
 
     if (status == JOB_STOPPING)
     {
+        // Transcoding may take several minutes.  Reload the bookmark
+        // in case it changed, then save its translated value back.
+        long long previousBookmark =
+            ComputeNewBookmark(ReloadBookmark(pginfo), deleteMap);
+        pginfo->SetBookmark(previousBookmark);
+
         const QString jobArgs = JobQueue::GetJobArgs(jobID);
 
         const QString tmpfile = filename + ".tmp";
@@ -977 +1030 @@
         {
             query.prepare("DELETE FROM recordedmarkup "
                           "WHERE chanid = :CHANID "
-                          "AND starttime = :STARTTIME ");
+                          "AND starttime = :STARTTIME "
+                          "AND type != :BOOKMARK ");
             query.bindValue(":CHANID", pginfo->chanid);
             query.bindValue(":STARTTIME", pginfo->recstartts);
+            query.bindValue(":BOOKMARK", MARK_BOOKMARK);
 
             if (!query.exec())
                 MythDB::DBError("Error in mythtranscode", query);
 
             query.prepare("UPDATE recorded "
-                          "SET cutlist = :CUTLIST, bookmark = :BOOKMARK, "
+                          "SET cutlist = :CUTLIST, "
                           "watched = :WATCHED WHERE chanid = :CHANID "
                           "AND starttime = :STARTTIME ;");
             query.bindValue(":CUTLIST", "0");
-            query.bindValue(":BOOKMARK", "0");
             query.bindValue(":WATCHED", "0");
             query.bindValue(":CHANID", pginfo->chanid);
             query.bindValue(":STARTTIME", pginfo->recstartts);