From 1dcf4f455f3678517dc8f8b1ec642b19b0d0c5c7 Mon Sep 17 00:00:00 2001 From: David Gay Date: Sat, 27 Jan 2024 00:37:04 -0500 Subject: Call programs directly rather than checking lib dir --- subsync.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/subsync.py b/subsync.py index 4c446b9..56f85db 100644 --- a/subsync.py +++ b/subsync.py @@ -30,10 +30,6 @@ class mopen: self.file_o.close() -def get_lib_folder(): - return "auto-sub-retimer" - - def remove_styles(lines, styles): res = [] for line in lines: @@ -91,7 +87,7 @@ def select_keep_styles(all_styles, lines): def extract_eng_subs(mkv, index=None): print("\nExtracting english subtitles, this may take a while...\n") mkv_json = json.loads(subprocess.check_output([ - os.path.join(get_lib_folder(), 'ffmpeg', 'bin', 'ffprobe'), + "ffmpeg", "-v", "quiet", "-print_format", @@ -135,8 +131,7 @@ def extract_eng_subs(mkv, index=None): print("#" * 20) sys.exit(1) extracted = mkv.replace(".mkv", f".EXTRACTED.{codec_name}") - subprocess.run( - [os.path.join(get_lib_folder(), "mkvtoolnix\\mkvextract.exe"), "tracks", mkv, f"{index}:{extracted}"]) + subprocess.run(["mkvextract", "tracks", mkv, f"{index}:{extracted}"]) return index @@ -158,8 +153,7 @@ def fix_styling(): def retime_based_on_audio(mkv, srt, conf): retimed = mkv.replace(".mkv", ".ja.RETIMED.{}".format(conf['ext'])) - subprocess.run( - [os.path.join(get_lib_folder(), "alass\\alass.bat"), "--split-penalty", conf['split_pen'], mkv, srt, retimed]) + subprocess.run(["alass", "--split-penalty", conf['split_pen'], mkv, srt, retimed]) os.remove(srt) os.rename(retimed, mkv.replace(".mkv", ".ja.{}".format(conf['ext']))) @@ -167,11 +161,9 @@ def retime_based_on_audio(mkv, srt, conf): def retime(mkv, srt, conf): retimed = mkv.replace(".mkv", ".ja.RETIMED.{}".format(conf['ext'])) extracted = [f for f in os.listdir() if mkv.replace(".mkv", ".EXTRACTED.") in f][0] - print([os.path.join(get_lib_folder(), "alass\\alass.bat"), "--split-penalty", conf['split_pen'], extracted, srt, - retimed]) + print(["alass", "--split-penalty", conf['split_pen'], extracted, srt, retimed]) subprocess.run( - [os.path.join(get_lib_folder(), "alass\\alass.bat"), "--split-penalty", conf['split_pen'], extracted, srt, - retimed]) + ["alass", "--split-penalty", conf['split_pen'], extracted, srt, retimed]) os.remove(srt) os.rename(retimed, mkv.replace(".mkv", ".ja.{}".format(conf['ext']))) os.remove(extracted) -- cgit v1.2.3