[HEVC-14] Updated all path references to use os.path constructs

Author: magnolialogic

compareEncoding.py

@@ -8,7 +8,7 @@
 import sys
 
 parser = argparse.ArgumentParser()
-parser.add_argument("filename", help="Source filename (or \"all\" to compare all files which exist in both source/ and hevc/)")
+parser.add_argument("filename", help="Source filename (or \"all\" to compare all files which exist in both ./source/ and ./hevc/)")
 parser.add_argument("num_frames", nargs="?", default=5, type=int, help="Number of comparison frames to generate")
 parser.add_argument("-s", "--stack", action="store_true", help="Also create 2-up stacked comparison")
 args = parser.parse_args()
@@ -26,19 +26,19 @@
 print("\nComparison frames:\t{frames}".format(frames=args.num_frames))
 
 for source_file in source_files:
-	source_file_path = os.path.relpath("source/{filename}".format(filename=source_file))
-	source_file_size = int(os.path.getsize(source_file_path) / 1000000)
+	source_file_path = os.path.joinpath("source", source_file)
+	source_file_size = int(os.path.getsize(source_file_path)/1000000)
 	source_file_handle = cv2.VideoCapture(source_file_path)
 	hevc_files = [filename for filename in os.listdir("hevc") if filename.startswith(os.path.splitext(source_file)[0])]
 
 	for hevc_file in hevc_files:
 		output_directory = os.path.join(os.path.relpath("comparison"), os.path.splitext(os.path.basename(hevc_file))[0])
-		hevc_file_path = os.path.relpath("hevc/{filename}".format(filename=hevc_file))
+		hevc_file_path = os.path.joinpath("hevc", hevc_file)
 		hevc_file_handle = cv2.VideoCapture(hevc_file_path)
-		hevc_file_size = int(os.path.getsize(hevc_file_path) / 1000000)
+		hevc_file_size = int(os.path.getsize(hevc_file_path)/1000000)
 		compression_ratio = int(100-(hevc_file_size/source_file_size*100))
 		total_frames = source_file_handle.get(cv2.CAP_PROP_FRAME_COUNT)
-		stride = int(total_frames / (args.num_frames + 1))
+		stride = int(total_frames/(args.num_frames+1))
 
 		print("\nFilename:\t\t{filename}".format(filename=hevc_file))
 		if source_file_handle.get(cv2.CAP_PROP_FRAME_COUNT) != hevc_file_handle.get(cv2.CAP_PROP_FRAME_COUNT):

src/TranscodeSession.py

@@ -36,7 +36,7 @@ def __init__(self, file, args):
 		metadata = json.loads(metadata)["streams"][0]
 
 		# Populate metadata-based attributes
-		self.path = {"source": file}
+		self.path = {"source": os.path.relpath(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"]}
 		height = self.source["height"]
 		if height < 720:
@@ -60,14 +60,14 @@ def __init__(self, file, args):
 		self.map_options()
 
 		self.output["filename"] = self.source["filename"] + self.output["file_decorator"]
-		self.path["output"] = "hevc/" + self.output["filename"] + ".mp4"
-		self.path["log"] = "performance/" + self.output["filename"] + ".log"
+		self.path["output"] = os.path.join("hevc", self.output["filename"] + ".mp4")
+		self.path["log"] = os.path.join("performance", self.output["filename"] + ".log")
 
 		# Verify no attributes are None
 		self.validate()
 
 		# Build HandBrakeCLI command
-		self.command = "HandBrakeCLI --encoder-preset {encoder_preset} --preset-import-file {json_path} --preset {preset_name} --quality {quality} --encopts {encopts} --input {source_path} --output {output_path}".format(encoder_preset=self.encoder_preset, json_path=os.path.join(sys.path[0], "src/presets.json"), preset_name=self.preset_name, quality=str(self.encoder_quality), encopts=self.encoder_options, source_path=self.path["source"], output_path=self.path["output"])
+		self.command = "HandBrakeCLI --encoder-preset {encoder_preset} --preset-import-file {json_path} --preset {preset_name} --quality {quality} --encopts {encopts} --input {source_path} --output {output_path}".format(encoder_preset=self.encoder_preset, json_path=os.path.join(sys.path[0], "src", "presets.json"), preset_name=self.preset_name, quality=str(self.encoder_quality), encopts=self.encoder_options, source_path=self.path["source"], output_path=self.path["output"])
 
 	def signal_handler(self, sig, frame):
 		"""	Delete output file if ctrl+c is caught, since file will be corrupt

transcode.py

@@ -104,7 +104,7 @@ def link():
 			print("Use default location? /usr/local/bin")
 			default_location = get_user_response()
 			if default_location:
-				os.symlink(script_realpath, os.path.join("/usr/local/bin", script_name))
+				os.symlink(script_realpath, os.path.join("usr", "local", "bin", script_name))
 				sys.exit("Created symlink to {script_name} in /usr/local/bin\n")
 			else:
 				print("Use alternate $PATH location?")
@@ -168,7 +168,7 @@ def build_source_list(args):
 	print("\nBuilding source list...")
 
 	if args.all:
-		source_files = ["source/" + file for file in os.listdir("source") if os.path.splitext(file)[1].lower() in extensions]
+		source_files = [os.path.join("source", file) for file in os.listdir("source") if os.path.splitext(file)[1].lower() in extensions]
 	else:
 		if os.path.splitext(args.file)[1].lower() in extensions:
 			source_files = [args.file]