FFMpeg-Compressor: Refactor and bar fix
This commit is contained in:
parent
9612d30d06
commit
e71cad4d5f
4 changed files with 87 additions and 75 deletions
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from modules import configloader
|
||||
from modules import compressor
|
||||
from modules import printer
|
||||
from modules import utils
|
||||
|
|
@ -10,70 +9,39 @@ import sys
|
|||
import os
|
||||
|
||||
|
||||
def get_file_type(filename):
|
||||
audio_ext = ['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.opus', '.raw', '.wav', '.wma']
|
||||
image_ext = ['.apng', '.avif', '.bmp', '.tga', '.tiff', '.dds', '.svg', '.webp', '.jpg', '.jpeg', '.png']
|
||||
video_ext = ['.3gp' '.amv', '.avi', '.gif', '.m2t', '.m4v', '.mkv', '.mov', '.mp4', '.m4v', '.mpeg', '.mpv',
|
||||
'.webm', '.ogv']
|
||||
|
||||
if os.path.splitext(filename)[1] in audio_ext:
|
||||
return "audio"
|
||||
elif os.path.splitext(filename)[1] in image_ext:
|
||||
return "image"
|
||||
elif os.path.splitext(filename)[1] in video_ext:
|
||||
return "video"
|
||||
def get_args():
|
||||
try:
|
||||
if sys.argv[1][len(sys.argv[1])-1] == "/":
|
||||
path = sys.argv[1][:len(sys.argv[1])-1]
|
||||
else:
|
||||
return "unknown"
|
||||
path = sys.argv[1]
|
||||
return path
|
||||
except IndexError:
|
||||
print(utils.help_message())
|
||||
exit()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
start_time = datetime.now()
|
||||
printer.win_ascii_esc()
|
||||
try:
|
||||
if sys.argv[1][len(sys.argv[1])-1] == "/":
|
||||
arg_path = sys.argv[1][:len(sys.argv[1])-1]
|
||||
else:
|
||||
arg_path = sys.argv[1]
|
||||
except IndexError:
|
||||
print(utils.help_message())
|
||||
exit()
|
||||
req_folder = os.path.abspath(get_args())
|
||||
|
||||
orig_folder = os.path.abspath(arg_path)
|
||||
printer.orig_folder = os.path.abspath(arg_path)
|
||||
printer.bar_init(req_folder)
|
||||
|
||||
printer.bar_init(orig_folder)
|
||||
|
||||
if os.path.exists(f"{orig_folder}_compressed"):
|
||||
shutil.rmtree(f"{orig_folder}_compressed")
|
||||
if os.path.exists(f"{req_folder}_compressed"):
|
||||
shutil.rmtree(f"{req_folder}_compressed")
|
||||
|
||||
printer.info("Creating folders...")
|
||||
for folder, folders, files in os.walk(orig_folder):
|
||||
if not os.path.exists(folder.replace(orig_folder, f"{orig_folder}_compressed")):
|
||||
os.mkdir(folder.replace(orig_folder, f"{orig_folder}_compressed"))
|
||||
for folder, folders, files in os.walk(req_folder):
|
||||
if not os.path.exists(folder.replace(req_folder, f"{req_folder}_compressed")):
|
||||
os.mkdir(folder.replace(req_folder, f"{req_folder}_compressed"))
|
||||
|
||||
printer.info(f"Compressing \"{folder.replace(orig_folder, orig_folder.split('/').pop())}\" folder...")
|
||||
target_folder = folder.replace(orig_folder, f"{orig_folder}_compressed")
|
||||
printer.info(f"Compressing \"{folder.replace(req_folder, req_folder.split('/').pop())}\" folder...")
|
||||
target_folder = folder.replace(req_folder, f"{req_folder}_compressed")
|
||||
for file in os.listdir(folder):
|
||||
if os.path.isfile(f'{folder}/{file}'):
|
||||
match get_file_type(file):
|
||||
case "audio":
|
||||
comp_file = compressor.compress_audio(folder, file, target_folder,
|
||||
configloader.config['AUDIO']['Extension'])
|
||||
case "image":
|
||||
comp_file = compressor.compress_image(folder, file, target_folder,
|
||||
configloader.config['IMAGE']['Extension'])
|
||||
case "video":
|
||||
comp_file = compressor.compress_video(folder, file, target_folder,
|
||||
configloader.config['VIDEO']['Extension'])
|
||||
case "unknown":
|
||||
comp_file = compressor.compress(folder, file, target_folder)
|
||||
compressor.compress_file(folder, file, target_folder, req_folder)
|
||||
|
||||
if configloader.config['FFMPEG']['MimicMode']:
|
||||
try:
|
||||
os.rename(comp_file, f'{folder}/{file}'.replace(orig_folder, f"{orig_folder}_compressed"))
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
utils.get_compression_status(orig_folder)
|
||||
utils.get_compression_status(req_folder)
|
||||
utils.sys_pause()
|
||||
print(f"Time taken: {datetime.now() - start_time}")
|
||||
|
|
|
|||
|
|
@ -7,6 +7,22 @@ from ffmpeg import FFmpeg, FFmpegError
|
|||
import os
|
||||
|
||||
|
||||
def get_file_type(filename):
|
||||
audio_ext = ['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.opus', '.raw', '.wav', '.wma']
|
||||
image_ext = ['.apng', '.avif', '.bmp', '.tga', '.tiff', '.dds', '.svg', '.webp', '.jpg', '.jpeg', '.png']
|
||||
video_ext = ['.3gp' '.amv', '.avi', '.gif', '.m2t', '.m4v', '.mkv', '.mov', '.mp4', '.m4v', '.mpeg', '.mpv',
|
||||
'.webm', '.ogv']
|
||||
|
||||
if os.path.splitext(filename)[1] in audio_ext:
|
||||
return "audio"
|
||||
elif os.path.splitext(filename)[1] in image_ext:
|
||||
return "image"
|
||||
elif os.path.splitext(filename)[1] in video_ext:
|
||||
return "video"
|
||||
else:
|
||||
return "unknown"
|
||||
|
||||
|
||||
def has_transparency(img):
|
||||
if img.info.get("transparency", None) is not None:
|
||||
return True
|
||||
|
|
@ -113,3 +129,27 @@ def compress(folder, file, target_folder):
|
|||
else:
|
||||
utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}')
|
||||
return f'{target_folder}/{file}'
|
||||
|
||||
|
||||
def compress_file(_dir, filename, target_dir, source):
|
||||
match get_file_type(filename):
|
||||
case "audio":
|
||||
comp_file = compress_audio(_dir, filename, target_dir,
|
||||
configloader.config['AUDIO']['Extension'])
|
||||
case "image":
|
||||
comp_file = compress_image(_dir, filename, target_dir,
|
||||
configloader.config['IMAGE']['Extension'])
|
||||
case "video":
|
||||
comp_file = compress_video(_dir, filename, target_dir,
|
||||
configloader.config['VIDEO']['Extension'])
|
||||
case "unknown":
|
||||
comp_file = compress(_dir, filename, target_dir)
|
||||
|
||||
if configloader.config['FFMPEG']['MimicMode']:
|
||||
try:
|
||||
os.rename(comp_file, f'{_dir}/{filename}'.replace(source, f"{source}_compressed"))
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
printer.bar.update()
|
||||
printer.bar.next()
|
||||
|
|
|
|||
|
|
@ -4,42 +4,46 @@ import sys
|
|||
import os
|
||||
|
||||
|
||||
# Fill whole string with spaces for cleaning progress bar
|
||||
def clean_str(string):
|
||||
return string + " " * (os.get_terminal_size().columns - len(string))
|
||||
|
||||
|
||||
def info(string):
|
||||
print(clean_str(f"\r\033[100mI {string}\033[49m"))
|
||||
|
||||
|
||||
def warning(string):
|
||||
print(clean_str(f"\r\033[93mW\033[0m {string}\033[49m"))
|
||||
|
||||
|
||||
def error(string):
|
||||
print(clean_str(f"\r\033[31mE\033[0m {string}\033[49m"))
|
||||
|
||||
|
||||
def bar_init(folder):
|
||||
file_count = 0
|
||||
for folder, folders, file in os.walk(folder):
|
||||
file_count += len(file)
|
||||
global bar
|
||||
bar = IncrementalBar('Compressing', max=file_count, suffix='[%(index)d/%(max)d] (%(percent).1f%%)')
|
||||
bar.update()
|
||||
|
||||
|
||||
def bar_print(string):
|
||||
print(string)
|
||||
bar.update()
|
||||
|
||||
|
||||
# Fill whole string with spaces for cleaning progress bar
|
||||
def clean_str(string):
|
||||
return string + " " * (os.get_terminal_size().columns - len(string))
|
||||
|
||||
|
||||
def info(string):
|
||||
bar_print(clean_str(f"\r\033[100mI {string}\033[49m"))
|
||||
|
||||
|
||||
def warning(string):
|
||||
bar_print(clean_str(f"\r\033[93mW\033[0m {string}\033[49m"))
|
||||
|
||||
|
||||
def error(string):
|
||||
bar_print(clean_str(f"\r\033[31mE\033[0m {string}\033[49m"))
|
||||
|
||||
|
||||
def files(source, dest, dest_ext, comment):
|
||||
source_ext = os.path.splitext(source)[1]
|
||||
source_name = os.path.splitext(source)[0]
|
||||
|
||||
print(clean_str(f"\r* \033[0;37m{source_name}\033[0m{source_ext}\033[0;37m -> {dest}\033[0m.{dest_ext}\033[0;37m ({comment})\033[0m"))
|
||||
bar.next()
|
||||
bar_print(clean_str(f"\r* \033[0;37m{source_name}\033[0m{source_ext}\033[0;37m -> {dest}\033[0m.{dest_ext}\033[0;37m ({comment})\033[0m ..."))
|
||||
|
||||
|
||||
def unknown_file(file):
|
||||
print(clean_str(f"\r* \033[0;33m{file}\033[0m (File will be force compressed via ffmpeg)"))
|
||||
bar.next()
|
||||
bar_print(clean_str(f"\r* \033[0;33m{file}\033[0m (File will be force compressed via ffmpeg)"))
|
||||
|
||||
|
||||
def win_ascii_esc():
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ def get_compression(orig, comp):
|
|||
orig = get_dir_size(orig, processed_files)
|
||||
comp = get_dir_size(comp, processed_files)
|
||||
|
||||
print(f"Result: {orig/1024/1024:.2f}MB -> {comp/1024/1024:.2f}MB Δ {(orig - comp)/1024/1024:.2f}MB")
|
||||
print(f"\nResult: {orig/1024/1024:.2f}MB -> {comp/1024/1024:.2f}MB Δ {(orig - comp)/1024/1024:.2f}MB")
|
||||
except ZeroDivisionError:
|
||||
printer.warning("Nothing compressed!")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue