Ticket #7306: mythcommflag_video_cutlist.diff

programs/mythcommflag/main.cpp

@@ -230 +230 @@
     return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
 }
 
-int SetCutList(QString chanid, QString starttime, QString newCutList)
+int SetCutList(QString chanid, QString starttime, QString newCutList,
+               ProgramInfo *pginfo=NULL)
 {
     QMap<long long, int> cutlist;
 
@@ -245 +246 @@
         cutlist[cutpair[1].toInt()] = MARK_CUT_END;
     }
 
-    ProgramInfo *pginfo =
-        ProgramInfo::GetProgramFromRecorded(chanid, starttime);
+    if (pginfo == NULL)
+    {
+        pginfo = ProgramInfo::GetProgramFromRecorded(chanid, starttime);
 
-    if (!pginfo)
-    {
-        VERBOSE(VB_IMPORTANT,
-                QString("No program data exists for channel %1 at %2")
-                .arg(chanid).arg(starttime));
-        return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
+        if (!pginfo)
+        {
+            VERBOSE(VB_IMPORTANT,
+                    QString("No program data exists for channel %1 at %2")
+                    .arg(chanid).arg(starttime));
+            return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
+        }
     }
 
     pginfo->SetCutList(cutlist);
@@ -263 +266 @@
     return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
 }
 
-int GetMarkupList(QString list, QString chanid, QString starttime)
+int GetMarkupList(QString list, QString chanid, QString starttime,
+                  ProgramInfo *pginfo=NULL)
 {
     QMap<long long, int> cutlist;
     QMap<long long, int>::Iterator it;
     QString result;
 
-    ProgramInfo *pginfo =
-        ProgramInfo::GetProgramFromRecorded(chanid, starttime);
+    if (pginfo == NULL)
+    {
+        pginfo = ProgramInfo::GetProgramFromRecorded(chanid, starttime);
 
-    if (!pginfo)
-    {
-        VERBOSE(VB_IMPORTANT,
-                QString("No program data exists for channel %1 at %2")
-                .arg(chanid).arg(starttime));
-        return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
+        if (!pginfo)
+        {
+            VERBOSE(VB_IMPORTANT,
+                    QString("No program data exists for channel %1 at %2")
+                    .arg(chanid).arg(starttime));
+            return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
+        }
     }
 
     if (list == "cutlist")
@@ -1235 +1241 @@
     if (copyToCutlist)
         return CopySkipListToCutList(chanid, starttime);
 
-    if (clearCutlist)
+    if (clearCutlist && !isVideo)
         return SetCutList(chanid, starttime, "");
 
-    if (!newCutList.isEmpty())
+    if (!newCutList.isEmpty() && !isVideo)
         return SetCutList(chanid, starttime, newCutList);
 
-    if (getCutlist)
+    if (getCutlist && !isVideo)
         return GetMarkupList("cutlist", chanid, starttime);
 
     if (getSkipList)
@@ -1309 +1315 @@
             cerr << "------  --------------  "
                     "-----------------------------------------  ------\n";
         }
-        else
+        else if (newCutList.isEmpty() && !clearCutlist && !getCutlist)
         {
             cerr << "Building seek table for: "
                  << filename.toLocal8Bit().constData() << endl;
@@ -1328 +1334 @@
         else
             pginfo->pathname = QFileInfo(filename).absoluteFilePath();
 
-        result = BuildVideoMarkup(pginfo, useDB);
+        if (!newCutList.isEmpty())
+            result = SetCutList(chanid, starttime, newCutList, pginfo);
+        else if (clearCutlist)
+            result = SetCutList(chanid, starttime, "", pginfo);
+        else if (getCutlist)
+            result = GetMarkupList("cutlist", chanid, starttime, pginfo);
+        else
+            result = BuildVideoMarkup(pginfo, useDB);
 
         delete pginfo;
     }