Improved source file list creation and tweaked output filenames

Author: magnolialogic

transcode.py

@@ -17,6 +17,7 @@
 - allow comma-separated string for --preset, e.g. medium,slow,slower, map to list
 - add --matrix option to create default, best, small, best+small variants
 - add compression ratio / space saved to log + screen output
+- ~~if presets.json does not exist, download from github~~
 
 """
 
@@ -27,25 +28,25 @@
 class Session():
 	class Settings:
 		class RF:
-			SD = 18
-			HD = 20
-			FHD = 21
-			UHD = 24
-		
+			SD = 21
+			HD = 22
+			FHD = 23
+			UHD = 26
+
 		class ENCOPTS:
 			SD = "ctu=32:qg-size=16"
 			HD = "ctu=32:qg-size=32"
 			FHD = "ctu=64:qg-size=64"
 			UHD = "ctu=64:qg-size=64"
-	
+
 	def __init__(self, file):
 		signal.signal(signal.SIGINT, self.signal_handler)
-		
+
 		# Get source file metadata
 		cmd = "ffprobe -v quiet -print_format json -show_streams " + file
 		metadata = subprocess.check_output(shlex.split(cmd)).decode("utf-8")
 		metadata = json.loads(metadata)["streams"][0]
-		
+
 		# Populate metadata-based attributes
 		self.path = {"source": file}
 		self.source = {"height": int(metadata["height"]), "width": int(metadata["width"]), "duration": float(metadata["duration"]), "filename": os.path.splitext(os.path.relpath(self.path["source"], "source"))[0], "filesize": os.path.getsize(self.path["source"]), "bitrate": int(metadata["bit_rate"]), "frames": int(metadata["nb_frames"]), "codec": metadata["codec_name"]}
@@ -59,46 +60,47 @@ def __init__(self, file):
 		elif 2160 <= height:
 			resolution = "UHD"
 		self.source["resolution"] = resolution
-		
+
 		# Create empty attributes for dynamic session options
 		self.encoder_quality = None
 		self.encoder_preset = None
 		self.preset_name = None
 		self.encoder_options = None
-		
+
 		# Construct session options and parameters
 		self.map_options()
 		self.file_decorator = "_RF" + str(self.encoder_quality)
-		if args.best:
-			self.file_decorator += "_Best"
-		elif args.baseline:
+		if args.preset:
+			self.encoder_preset = args.preset.lower()
+		self.file_decorator += "_{preset}".format(preset=self.encoder_preset.capitalize())
+		if args.baseline:
 			self.file_decorator += "_Baseline"
+		elif args.best:
+			self.file_decorator += "_Best"
 		if args.small:
 			self.file_decorator += "_Small"
-		if args.preset:
-			self.file_decorator += "_{preset}".format(preset=args.preset.capitalize())
 		self.path["output"] = "hevc/" + self.source["filename"] + self.file_decorator + ".mp4"
 		self.path["log"] = "performance/" + self.source["filename"] + self.file_decorator + ".log"
-		
+
 		# Build HandBrakeCLI command
 		self.args = "HandBrakeCLI --encoder-preset {encoder_preset} --preset-import-file presets.json --preset {preset_name} --quality {quality} --encopts {encopts} --input {source_path} --output {output_path}".format(encoder_preset=self.encoder_preset, preset_name=self.preset_name, quality=str(self.encoder_quality), encopts=self.encoder_options, source_path=self.path["source"], output_path=self.path["output"])
-		
+
 		# Verify no attributes are None
 		self.validate()
-	
+
 	def validate(self):
 		"""	Verifies that no session attributes are null
 		"""
 		if any(value is None for attribute, value in self.__dict__.items()):
 			sys.exit("FATAL: Session.validate(): found null attribute for " + self.path["source"])
-	
+
 	def summarize(self):
 		"""	Summarize transcode session before starting
 		"""
 		print("{date}: {source}:".format(date=str(datetime.now()), source=self.path["source"]))
 		pprint(vars(self))
 		print()
-	
+
 	def map_options(self):
 		"""	Start with settings based on source resolution and then override defaults based on command-line arguments
 		"""
@@ -113,17 +115,17 @@ def map_options(self):
 		if args.preset:
 			self.encoder_preset = args.preset.lower()
 		else:
-			self.encoder_preset = "slow"
+			self.encoder_preset = "Slow"
 		if args.quality:
 			self.encoder_quality = args.quality
 		if args.small:
 			self.encoder_options += ":tu-intra-depth=3:tu-inter-depth=3"
-	
+
 	def signal_handler(self, sig, frame):
 		"""	Delete output file if ctrl+c is caught, since file will be corrupt
 		"""
 		self.cleanup()
-	
+
 	def log(self, elapsed_time, fps):
 		"""	Summarizes transcode session for screen and log
 		"""
@@ -132,7 +134,7 @@ def log(self, elapsed_time, fps):
 			logfile.write(summary + "\n\n" + session.args + "\n\n")
 			pprint(vars(self), logfile)
 			print(summary)
-	
+
 	def cleanup(self):
 		"""	Always deletes output file, deletes log if --delete is passed from command-line
 		"""
@@ -145,7 +147,7 @@ def cleanup(self):
 # Define command-line arguments
 parser = argparse.ArgumentParser()
 files_group = parser.add_mutually_exclusive_group(required=True)
-files_group.add_argument("-f", "--file", help="filename of movie in source directory")
+files_group.add_argument("-f", "--file", help="relative path to movie in source directory")
 files_group.add_argument("--all", action="store_true", help="transcode all supported movies in source directory")
 parser.add_argument("-q", "--quality", type=int, help="HandBrake quality slider value (-12,51)")
 parser.add_argument("--preset", help="override video encoder preset")
@@ -183,6 +185,15 @@ def cleanup(self):
 extensions = [".mp4", ".m4v", ".mov", ".mkv", ".mpg", ".mpeg", ".avi", ".wmv", ".flv", ".webm", ".ts"]
 if args.all:
 	source_files = ["source/" + file for file in os.listdir("source") if os.path.splitext(file)[1].lower() in extensions]
+	print(source_files)
+	for source_file in source_files:
+		session = Session(source_file)
+		if os.path.exists(session.path["output"]):
+			print("Skipping", source_file)
+			source_files = [file for file in source_files if file is not source_file]
+		print(source_files)
+	if len(source_files) == 0:
+		sys.exit("All source files have already been transcoded. Exiting.")
 else:
 	source_files = [args.file]
 if not os.path.exists("performance"):
@@ -192,34 +203,24 @@ def cleanup(self):
 
 # Do the thing
 start_time = datetime.now()
-skipped_files = []
 print("\n{date}: Starting transcode session for {source_files}\n".format(date=str(datetime.now()), source_files=str(source_files)))
 for file in source_files:
 	session = Session(file)
-	if not os.path.exists(session.path["output"]):
-		session.summarize()
-		print(session.args + "\n")
-		session_start_time = datetime.now()
-		transcode = subprocess.Popen(shlex.split(session.args, posix=False)) # Posix=False to escape double-quotes in arguments
-		transcode.wait()
-		session_end_time = datetime.now()
-		session_elapsed_time = session_end_time - session_start_time
-		fps = session.source["frames"] / session_elapsed_time.seconds
-		print("\n{date}: Finished {output_file}".format(date=str(session_end_time), output_file=session.path["output"]))
-		session.log(session_elapsed_time, fps)
-		print("\n\n\n\n\n")
-	else:
-		skipped_files.append(file)
+	session.summarize()
+	print(session.args + "\n")
+	session_start_time = datetime.now()
+	transcode = subprocess.Popen(shlex.split(session.args, posix=False)) # Posix=False to escape double-quotes in arguments
+	transcode.wait()
+	session_end_time = datetime.now()
+	session_elapsed_time = session_end_time - session_start_time
+	fps = session.source["frames"] / session_elapsed_time.seconds
+	print("\n{date}: Finished {output_file}".format(date=str(session_end_time), output_file=session.path["output"]))
+	session.log(session_elapsed_time, fps)
+	print("\n\n\n\n\n")
 	if args.delete:
 		session.cleanup()
 
 end_time = datetime.now()
 elapsed_time = end_time - start_time
 
-if len(skipped_files) > 0:
-	print("Skipped:")
-	for file in skipped_files:
-		print(file)
-	print()
-
 sys.exit("{date}: Finished after {elapsed_time}.\n".format(date=str(datetime.now()), elapsed_time=elapsed_time))