Ticket #298: commflag-clearflagging.2.diff

programs/mythcommflag/main.cpp

@@ -487 +487 @@
     QApplication a(argc, argv, false);
     int argpos = 1;
     bool isVideo = false;
+    bool clearFlagging = false;
 
     QString filename;
 
@@ -575 +576 @@
         {
             stillRecording = true;
         }
+        else if (!strcmp(a.argv()[argpos], "--clearflagging")) {
+            clearFlagging = true;
+        }   
         else if (!strcmp(a.argv()[argpos], "--all"))
         {
             allRecorded = true;
@@ -794 +798 @@
                     "                             thinks it is already in use by another instance.\n"
                     "--hogcpu                     Do not nice the flagging process.\n"
                     "                             WARNING: This will consume all free CPU time.\n"
+                    "--clearflagging              Any program marked as 'Flagging' will be reset\n"
+                    "                             to 'Not Flagged'.\n"
                     "-h OR --help                 This text\n\n"
                     "Note: both --chanid and --starttime must be used together\n"
                     "      if either is used.\n\n"
@@ -986 +992 @@
                                             .arg(starttime)
                                             .arg(flagStatusStr));
 
-                            if ((flagStatus == COMM_FLAG_NOT_FLAGGED) &&
+                            if (clearFlagging) {
+                                if (flagStatus == COMM_FLAG_PROCESSING) {
+                                    QMap<long long, int> empty;
+                                    program_info = ProgramInfo::GetProgramFromRecorded(chanid, starttime);
+                                    if (program_info) {
+                                        VERBOSE(VB_COMMFLAG,
+                                            QString("Changing Status for chanid %1 @ %2 from '%3' to Not Flagged")
+                                                    .arg(chanid)   
+                                                    .arg(starttime)
+                                                    .arg(flagStatusStr));
+                                        program_info->SetCommFlagged(COMM_FLAG_NOT_FLAGGED);
+                                        program_info->ClearMarkupMap(MARK_COMM_START);
+                                        program_info->ClearMarkupMap(MARK_COMM_END);
+                                        delete(program_info);
+                                    }
+                                }
+
+
+                            } else if ((flagStatus == COMM_FLAG_NOT_FLAGGED) &&
                                 (marksFound == 0))
                                 FlagCommercials(chanid, starttime);
                         }