FFMpeg-Compressor: Rewrite some code

FFMpeg-Compressor/ffmpeg-comp.toml

@@ -2,14 +2,14 @@
 FFmpegParams = "-hide_banner -loglevel error"
 
 [AUDIO]
-Extension = "mp3"
+Extension = "original"
 BitRate = "320k"
 
 [IMAGE]
-Extension = "jpg"
+Extension = "original"
-CompLevel = 100
+CompLevel = 20
 JpegComp = 3
 
 [VIDEO]
-Extension = "webm"
+Extension = "original"
 Codec = "libvpx-vp9"

FFMpeg-Compressor/main.py

@@ -23,11 +23,23 @@ printer.bar_init(orig_folder)
 
 if os.path.exists(f"{orig_folder}_compressed"):
     shutil.rmtree(f"{orig_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"))
 
     printer.info(f"Compressing \"{folder.replace(orig_folder, orig_folder.split('/').pop())}\" folder...")
-    compressor.compress(orig_folder, folder)
+    target_folder = folder.replace(orig_folder, f"{orig_folder}_compressed")
+    for file in os.listdir(folder):
+        if os.path.isfile(f'{folder}/{file}'):
+            match compressor.get_file_type(file):
+                case "audio":
+                    compressor.compress_audio(folder, file, target_folder)
+                case "image":
+                    compressor.compress_image(folder, file, target_folder)
+                case "video":
+                    compressor.compress_video(folder, file, target_folder)
+                case "unknown":
+                    compressor.compress(folder, file, target_folder)
 utils.get_compression_status(orig_folder)

FFMpeg-Compressor/modules/compressor.py

@@ -1,25 +1,39 @@
 from modules import printer
+from modules import configloader
 from PIL import Image
-import tomllib
 import os
 
-audio_exts = ['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.opus', '.raw', '.wav', '.wma']
-image_exts = ['.apng', '.avif', '.jfif', '.pjpeg', '.pjp', '.svg', '.webp', '.jpg', '.jpeg', '.png', '.raw']
-video_exts = ['.3gp' '.amv', '.avi', '.gif', '.m4v', '.mkv', '.mov', '.mp4', '.m4v', '.mpeg', '.mpv', '.webm', '.ogv']
 
-try:
+def get_req_ext(file):
-    config = tomllib.load(open("ffmpeg-comp.toml", "rb"))
+    if configloader.config['AUDIO']['Extension'] == "original" or \
-except FileNotFoundError:
+       configloader.config['IMAGE']['Extension'] == "original" or \
-    try:
+       configloader.config['VIDEO']['Extension'] == "original":
-        config = tomllib.load(open("/etc/ffmpeg-comp.toml", "rb"))
+        return os.path.splitext(file)[1][1:]
-    except FileNotFoundError:
-        printer.error("Config file not found. Please put it next to binary or in to /etc folder.")
-        exit()
 
-ffmpeg_params = config['FFMPEG']['FFmpegParams']
+    match get_file_type(file):
-req_audio_ext = config['AUDIO']['Extension']
+        case "audio":
-req_image_ext = config['IMAGE']['Extension']
+            return configloader.config['AUDIO']['Extension']
-req_video_ext = config['VIDEO']['Extension']
+        case "image":
+            return configloader.config['IMAGE']['Extension']
+        case "video":
+            return configloader.config['VIDEO']['Extension']
+
+
+def get_file_type(file):
+    audio_ext = ['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.opus', '.raw', '.wav', '.wma']
+    image_ext = ['.apng', '.avif', '.jfif', '.pjpeg', '.pjp', '.svg', '.webp', '.jpg', '.jpeg', '.png', '.raw']
+    video_ext = ['.3gp' '.amv', '.avi', '.gif', '.m4v', '.mkv', '.mov', '.mp4', '.m4v', '.mpeg', '.mpv', '.webm',
+                  '.ogv']
+    file_extension = os.path.splitext(file)[1]
+
+    if file_extension in audio_ext:
+        return "audio"
+    elif file_extension in image_ext:
+        return "image"
+    elif file_extension in video_ext:
+        return "video"
+    else:
+        return "unknown"
 
 
 def has_transparency(img):
@@ -38,43 +52,45 @@ def has_transparency(img):
     return False
 
 
-def compress(root_folder, folder):
+def compress_audio(folder, file, target_folder):
-    target_folder = folder.replace(root_folder, f"{root_folder}_compressed")
+    ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams']
-    for file in os.listdir(folder):
+    bitrate = configloader.config['AUDIO']['BitRate']
-        if os.path.isfile(f'{folder}/{file}'):
-            if os.path.splitext(file)[1] in audio_exts:
 
-                bitrate = config['AUDIO']['BitRate']
+    printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"{bitrate}")
-                printer.files(file, os.path.splitext(file)[0], req_audio_ext, f"{bitrate}bit/s")
+    os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q:a {bitrate} "
-                os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} "
+              f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'")
-                          f"'{target_folder}/{os.path.splitext(file)[0]}.{req_audio_ext}'")
 
-            elif os.path.splitext(file)[1] in image_exts:
 
-                if req_image_ext == "jpg" or req_image_ext == "jpeg":
+def compress_video(folder, file, target_folder):
+    ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams']
+    codec = configloader.config['VIDEO']['Codec']
 
-                    if not has_transparency(Image.open(f'{folder}/{file}')):
+    printer.files(file, os.path.splitext(file)[0], get_req_ext(file), codec)
-                        jpg_comp = config['IMAGE']['JpegComp']
+    os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -vcodec {codec} "
-                        printer.files(file, os.path.splitext(file)[0], req_image_ext, f"level {jpg_comp}")
+              f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'")
-                        os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q {jpg_comp} "
-                                  f"'{target_folder}/{os.path.splitext(file)[0]}.{req_image_ext}'")
 
-                    else:
-                        printer.warning(f"{file} has transparency (.jpg not support it). Skipping...")
 
-                else:
+def compress_image(folder, file, target_folder):
-                    comp_level = config['IMAGE']['CompLevel']
+    ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams']
-                    printer.files(file, os.path.splitext(file)[0], req_image_ext, f"{comp_level}%")
+    comp_level = configloader.config['IMAGE']['CompLevel']
-                    os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -compression_level {comp_level} "
+    jpg_comp = configloader.config['IMAGE']['JpegComp']
-                              f"'{target_folder}/{os.path.splitext(file)[0]}.{req_image_ext}'")
 
-            elif os.path.splitext(file)[1] in video_exts:
+    if get_req_ext(file) == "jpg" or get_req_ext(file) == "jpeg":
-                codec = config['VIDEO']['Codec']
-                printer.files(file, os.path.splitext(file)[0], req_video_ext, codec)
-                os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -vcodec {codec} "
-                          f"'{target_folder}/{os.path.splitext(file)[0]}.{req_video_ext}'")
 
-            else:
+        if not has_transparency(Image.open(f'{folder}/{file}')):
-                printer.warning("File extension not recognized. This may affect the quality of the compression.")
+            printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"level {jpg_comp}")
-                printer.unknown_file(file)
+            os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q {jpg_comp} "
-                os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} '{target_folder}/{file}'")
+                      f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'")
+        else:
+            printer.warning(f"{file} has transparency (.jpg not support it). Skipping...")
+    else:
+        printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"{comp_level}%")
+        os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -compression_level {comp_level} "
+                  f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'")
+
+
+def compress(folder, file, target_folder):
+    ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams']
+    printer.warning("File extension not recognized. This may affect the quality of the compression.")
+    printer.unknown_file(file)
+    os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} '{target_folder}/{file}'")

FFMpeg-Compressor/modules/configloader.py

@@ -0,0 +1,11 @@
+import tomllib
+from modules import printer
+
+try:
+    config = tomllib.load(open("ffmpeg-comp.toml", "rb"))
+except FileNotFoundError:
+    try:
+        config = tomllib.load(open("/etc/ffmpeg-comp.toml", "rb"))
+    except FileNotFoundError:
+        printer.error("Config file not found. Please put it next to binary or in to /etc folder.")
+        exit()