Ticket #5247: count.diff

mythburn.py

@@ -1750 +1750 @@
 #############################################################
 # Pre-process a single video/recording file
 
-def preProcessFile(file, folder):
+def preProcessFile(file, folder, count):
     """Pre-process a single video/recording file."""
 
-    write( "Pre-processing file '" + file.attributes["filename"].value + \
-           "' of type '"+ file.attributes["type"].value+"'")
+    write( "Pre-processing %s %d: '%s'" % (file.attributes["type"].value, count, file.attributes["filename"].value))
 
     #As part of this routine we need to pre-process the video:
     #1. check the file actually exists
@@ -4592 +4591 @@
 # process a single file ready for burning using either
 # mythtranscode/mythreplex or ProjectX as the cutter/demuxer
 
-def processFile(file, folder):
+def processFile(file, folder, count):
     """Process a single video/recording file ready for burning."""
 
     if useprojectx:
-        doProcessFileProjectX(file, folder)
+        doProcessFileProjectX(file, folder, count)
     else:
-        doProcessFile(file, folder)
+        doProcessFile(file, folder, count)
 
 #############################################################
 # process a single file ready for burning using mythtranscode/mythreplex
 # to cut and demux 
 
-def doProcessFile(file, folder):
+def doProcessFile(file, folder, count):
     """Process a single video/recording file ready for burning."""
 
     write( "*************************************************************")
-    write( "Processing file " + file.attributes["filename"].value + " of type " + file.attributes["type"].value)
+    write( "Processing %s %d: '%s'" % (file.attributes["type"].value, count, file.attributes["filename"].value))
     write( "*************************************************************")
 
     #As part of this routine we need to pre-process the video this MAY mean:
@@ -4808 +4807 @@
             extractVideoFrame(os.path.join(folder, "stream.mv2"), titleImage, thumboffset)
 
     write( "*************************************************************")
-    write( "Finished processing file " + file.attributes["filename"].value)
+    write( "Finished processing '%s'" % file.attributes["filename"].value)
     write( "*************************************************************")
 
 
@@ -4820 +4819 @@
     """Process a single video/recording file ready for burning."""
 
     write( "*************************************************************")
-    write( "Processing file " + file.attributes["filename"].value + " of type " + file.attributes["type"].value)
+    write( "Processing %s %d: '%s'" % (file.attributes["type"].value, count, file.attributes["filename"].value))
     write( "*************************************************************")
 
     #As part of this routine we need to pre-process the video this MAY mean:
@@ -4977 +4976 @@
             extractVideoFrame(os.path.join(folder, "stream.mv2"), titleImage, thumboffset)
 
     write( "*************************************************************")
-    write( "Finished processing file " + file.attributes["filename"].value)
+    write( "Finished processing file '%s'" % file.attributes["filename"].value)
     write( "*************************************************************")
 
 #############################################################
@@ -5109 +5108 @@
                         os.rmdir (folder)
                     os.makedirs(folder)
                 #Do the pre-process work
-                preProcessFile(node,folder)
+                preProcessFile(node,folder,filecount)
 
             if debug_secondrunthrough==False:
                 #Loop through all the files again but this time do more serious work!
@@ -5119 +5118 @@
                     folder=getItemTempPath(filecount)
 
                     #Process this file
-                    processFile(node,folder)
+                    processFile(node,folder,filecount)
 
             #We can only create the menus after the videos have been processed
             #and the commercials cut out so we get the correct run time length