Move default value for --outputfile into commandlineparser. Add back

support for defining a recording using --file, rather than only
--chanid/--starttime.

Author: wagnerrp

mythtv/programs/mythcommflag/commandlineparser.cpp

@@ -42,7 +42,7 @@ void MythCommFlagCommandLineParser::LoadArguments(void)
     add("--force", "force", false, "Force operation, even if program appears to be in use.", "");
     add("--dontwritetodb", "dontwritedb", false, "", "Intended for external 3rd party use.");
     add("--onlydumpdb", "dumpdb", false, "", "?");
-    add("--outputfile", "outputfile", "", "File to write commercial flagging output [debug].", "");
+    add("--outputfile", "outputfile", "-", "File to write commercial flagging output [debug].", "");
     add("--dry-run", "dryrun", false, "Don't actually queue operation, just list what would be done", "");
 }
 

mythtv/programs/mythcommflag/main.cpp

@@ -1193,7 +1193,8 @@ int main(int argc, char *argv[])
         else if (cmdline.toBool("rebuild"))
             result = RebuildSeekTable(chanid, starttime, -1);
         else
-            result = FlagCommercials(chanid, starttime, -1, "");
+            result = FlagCommercials(chanid, starttime, -1, 
+                                     cmdline.toString("outputfile"));
     }
     else if (cmdline.toBool("jobid"))
     {
@@ -1243,22 +1244,36 @@ int main(int argc, char *argv[])
     }
     else if (cmdline.toBool("file"))
     {
-        // TODO: add back handling of recording defined by the basename
-        if (cmdline.toBool("rebuild"))
+        if (cmdline.toBool("skipdb"))
         {
-            cerr << "You can no longer use --file with --rebuild.  Please "
-                    "use --chanid and " << endl
-                 << "--starttime" << endl;
-            return GENERIC_EXIT_INVALID_CMDLINE;
-        }
-
-        QString outputfile = cmdline.toString("outputfile");
-        if (outputfile.isEmpty() && cmdline.toBool("skipdb"))
-            outputfile = "-";
+            if (cmdline.toBool("rebuild"))
+            {
+                cerr << "The --rebuild parameter builds the seektable for "
+                        "internal MythTV use only. It cannot be used in "
+                        "combination with --skipdb." << endl;
+                return GENERIC_EXIT_INVALID_CMDLINE;
+            }
 
-        // perform commercial flagging on file outside the database
-        FlagCommercials(cmdline.toString("file"), -1, outputfile,
-                        !cmdline.toBool("skipdb"));
+            // perform commercial flagging on file outside the database
+            FlagCommercials(cmdline.toString("file"), -1,
+                            cmdline.toString("outputfile"),
+                            !cmdline.toBool("skipdb"));
+        }
+        else
+        {
+            ProgramInfo pginfo(cmdline.toString("file"));
+            // pass chanid and starttime
+            // inefficient, but it lets the other function
+            // handle sanity checking
+            if (cmdline.toBool("rebuild"))
+                result = RebuildSeekTable(pginfo.GetChanID(),
+                                          pginfo.GetRecordingStartTime(),
+                                          -1);
+            else
+                result = FlagCommercials(pginfo.GetChanID(),
+                                         pginfo.GetRecordingStartTime(),
+                                         -1, cmdline.toString("outputfile"));
+        }
     }
     else if (cmdline.toBool("queue"))
     {