Ticket #2150: mythburn-use-localfilename.diff

mythburn.py

@@ -1015 +1015 @@
     if doesFileExist(mediafile) == False:
         fatalError("Source file does not exist: " + mediafile)
 
+    if file.hasAttribute("localfilename"):
+            mediafile = file.attributes["localfilename"].value
+
     #write( "Original file is",os.path.getsize(mediafile),"bytes in size")
     getFileInformation(file, os.path.join(folder, "info.xml"))
 
-    if file.hasAttribute("localfilename"):
-            mediafile = file.attributes["localfilename"].value
-
     getStreamInformation(mediafile, os.path.join(folder, "streaminfo.xml"), 0)
 
     videosize = getVideoSize(os.path.join(folder, "streaminfo.xml"))
@@ -2722 +2734 @@
 
     mediafile=""
 
-    if file.attributes["type"].value=="recording":
+    if file.hasAttribute("localfilename"):
+        mediafile=file.attributes["localfilename"].value
+    elif file.attributes["type"].value=="recording":
         mediafile = os.path.join(recordingpath, file.attributes["filename"].value)
     elif file.attributes["type"].value=="video":
         mediafile=os.path.join(videopath, file.attributes["filename"].value)