Llloooggg/ImageCompressor
1
0
Fork 0
mirror of https://github.com/Llloooggg/ImageCompressor.git synced 2026-03-06 03:26:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Сохранение exif

Browse Source
This commit is contained in:
Denis Podshivalov
2025-05-14 03:42:53 +03:00
parent 08ea3ff21b
commit 8a373d2e3a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
image_compressor.py
View File

@@ -31,7 +31,7 @@ DB_PATH = "image_compressor.db"
conn = sqlite3.connect(DB_PATH, check_same_thread=False) conn = sqlite3.connect(DB_PATH, check_same_thread=False)
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute( cursor.execute(
"CREATE TABLE IF NOT EXISTS processed (hash TEXT PRIMARY KEY, filename TEXT)" "CREATE TABLE IF NOT EXISTS processed_images (hash TEXT PRIMARY KEY, filename TEXT)"
) )
conn.commit() conn.commit()
@@ -95,6 +95,8 @@ def compress_with_external(path: str, ext: str) -> tuple[bool, Path]:
tmp_path = path.with_name(path.stem + ".compressed" + path.suffix) tmp_path = path.with_name(path.stem + ".compressed" + path.suffix)
target_size = TARGET_SIZE_MB target_size = TARGET_SIZE_MB
exif_data = extract_exif(path)
try: try:
if ext == ".png": if ext == ".png":
new_path = convert_png_to_jpeg(path) new_path = convert_png_to_jpeg(path)
@@ -104,7 +106,6 @@ def compress_with_external(path: str, ext: str) -> tuple[bool, Path]:
ext = ".jpg" ext = ".jpg"
if ext in [".jpg", ".jpeg"]: if ext in [".jpg", ".jpeg"]:
exif_data = extract_exif(path)
tool = get_tool_path("cjpeg-static.exe") tool = get_tool_path("cjpeg-static.exe")
quality = 85 quality = 85
while True: while True:
@@ -124,8 +125,6 @@ def compress_with_external(path: str, ext: str) -> tuple[bool, Path]:
if os.path.getsize(tmp_path) <= target_size or quality < 50: if os.path.getsize(tmp_path) <= target_size or quality < 50:
break break
quality -= 5 quality -= 5
if tmp_path.exists() and exif_data:
inject_exif(tmp_path, exif_data)
elif ext == ".webp": elif ext == ".webp":
tool = get_tool_path("cwebp.exe") tool = get_tool_path("cwebp.exe")
@@ -160,6 +159,8 @@ def compress_with_external(path: str, ext: str) -> tuple[bool, Path]:
return False, path return False, path
if tmp_path.exists(): if tmp_path.exists():
if exif_data:
inject_exif(tmp_path, exif_data)
new_size = tmp_path.stat().st_size new_size = tmp_path.stat().st_size
if new_size < original_size: if new_size < original_size:
tmp_path.replace(path) tmp_path.replace(path)
@@ -217,7 +218,9 @@ def compress_image(path: str, fallback_to_pillow: bool = False):
h = file_hash(path) h = file_hash(path)
with db_lock: with db_lock:
cursor.execute("SELECT 1 FROM processed WHERE hash = ?", (h,)) cursor.execute(
"SELECT 1 FROM processed_images WHERE hash = ?", (h,)
)
if cursor.fetchone(): if cursor.fetchone():
skipped_count += 1 skipped_count += 1
logging.info( logging.info(
@@ -247,7 +250,7 @@ def compress_image(path: str, fallback_to_pillow: bool = False):
h = file_hash(path) h = file_hash(path)
with db_lock: with db_lock:
cursor.execute( cursor.execute(
"INSERT INTO processed(hash, filename) VALUES(?, ?)", "INSERT INTO processed_images(hash, filename) VALUES(?, ?)",
(h, path.name), (h, path.name),
) )
conn.commit() conn.commit()