From 7ed04ffd22dfbc9485bc05bbbbf12ab545e82399 Mon Sep 17 00:00:00 2001 From: OleSTEEP Date: Fri, 12 Jan 2024 23:38:07 +0300 Subject: [PATCH] FFMpeg-Compressor: Windows cmd support --- FFMpeg-Compressor/main.py | 6 ++++-- FFMpeg-Compressor/modules/printer.py | 9 ++++++++- FFMpeg-Compressor/modules/utils.py | 7 ++++++- FFMpeg-Compressor/requirements.txt | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/FFMpeg-Compressor/main.py b/FFMpeg-Compressor/main.py index 54f6c1d..ca91c75 100755 --- a/FFMpeg-Compressor/main.py +++ b/FFMpeg-Compressor/main.py @@ -26,6 +26,7 @@ def get_file_type(filename): if __name__ == "__main__": + utils.win_ascii_esc() try: if sys.argv[1][len(sys.argv[1])-1] == "/": arg_path = sys.argv[1][:len(sys.argv[1])-1] @@ -35,8 +36,8 @@ if __name__ == "__main__": print(utils.help_message()) exit() - orig_folder = arg_path - printer.orig_folder = arg_path + orig_folder = os.path.abspath(arg_path) + printer.orig_folder = os.path.abspath(arg_path) printer.bar_init(orig_folder) @@ -72,3 +73,4 @@ if __name__ == "__main__": pass utils.get_compression_status(orig_folder) + utils.sys_pause() diff --git a/FFMpeg-Compressor/modules/printer.py b/FFMpeg-Compressor/modules/printer.py index a473dc0..f82b2e2 100644 --- a/FFMpeg-Compressor/modules/printer.py +++ b/FFMpeg-Compressor/modules/printer.py @@ -1,5 +1,7 @@ -import os from progress.bar import IncrementalBar +import colorama +import sys +import os # Fill whole string with spaces for cleaning progress bar @@ -38,3 +40,8 @@ def files(source, dest, dest_ext, comment): def unknown_file(file): print(clean_str(f"\r* \033[0;33m{file}\033[0m (Not recognized)")) bar.next() + + +def win_ascii_esc(): + if sys.platform == "win32": + colorama.init() diff --git a/FFMpeg-Compressor/modules/utils.py b/FFMpeg-Compressor/modules/utils.py index 226ecb5..f1a3256 100644 --- a/FFMpeg-Compressor/modules/utils.py +++ b/FFMpeg-Compressor/modules/utils.py @@ -1,7 +1,7 @@ from modules import configloader from modules import printer from shutil import copyfile -from glob import glob +import sys import os errors_count = 0 @@ -70,5 +70,10 @@ def check_duplicates(new_folder): return new_folder +def sys_pause(): + if sys.platform == "win32": + os.system("pause") + + def help_message(): return "Usage: ffmpeg-comp {folder}" diff --git a/FFMpeg-Compressor/requirements.txt b/FFMpeg-Compressor/requirements.txt index 8d1f56a..88b8dd7 100644 --- a/FFMpeg-Compressor/requirements.txt +++ b/FFMpeg-Compressor/requirements.txt @@ -2,3 +2,4 @@ Pillow==9.5.0 pillow-avif-plugin==1.4.1 ffmpeg-python==0.2.0 progress==1.6 +colorama==0.4.6 \ No newline at end of file