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

Исправление подсчета ошибок

Browse Source
This commit is contained in:
Denis Podshivalov
2025-05-15 12:24:33 +03:00
parent 9a2ca8ea85
commit 269269c66e
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
image_compressor.py
View File

@@ -162,8 +162,8 @@ def compress_with_external(
inject_exif(tmp_path, exif) inject_exif(tmp_path, exif)
tmp_path.replace(path) tmp_path.replace(path)
return True, path return True, path
logging.info( logging.error(
f"Пропущено (не уменьшилось): {path} ({original_size // 1024}KB)" f"Не удалось сжать (не уменьшилось): {path} ({original_size // 1024}KB)"
) )
tmp_path.unlink() tmp_path.unlink()
return False, path return False, path
@@ -194,8 +194,8 @@ def compress_with_pillow(path: Path) -> Tuple[bool, Path]:
if temp_path.stat().st_size < original_size: if temp_path.stat().st_size < original_size:
temp_path.replace(path) temp_path.replace(path)
return True, path return True, path
logging.info( logging.error(
f"Пропущено (не уменьшилось): {path} ({original_size // 1024}KB)" f"Не удалось сжать (не уменьшилось): {path} ({original_size // 1024}KB)"
) )
temp_path.unlink() temp_path.unlink()
except Exception as e: except Exception as e:
@@ -273,17 +273,12 @@ def compress_image(path: Path, use_fallback: bool = False):
total_new_size += new_size total_new_size += new_size
if result: if result:
if new_size < original_size: saved = original_size - new_size
saved = original_size - new_size total_saved_bytes += saved
total_saved_bytes += saved percent = (1 - new_size / original_size) * 100
percent = (1 - new_size / original_size) * 100 logging.info(
logging.info( f"Сжато: {path} ({original_size//1024}KB -> {new_size//1024}KB, {percent:.2f}%)"
f"Сжато: {path} ({original_size//1024}KB -> {new_size//1024}KB, {percent:.2f}%)" )
)
else:
logging.info(
f"Пропущено (не уменьшилось): {path} ({original_size // 1024}KB)"
)
h = file_hash(final_path) h = file_hash(final_path)
with db_lock: with db_lock:
@@ -312,7 +307,7 @@ def compress_image(path: Path, use_fallback: bool = False):
processed_hashes.add(h) processed_hashes.add(h)
processed_count += 1 processed_count += 1
else: else:
skipped_count += 1 error_count += 1
except Exception as e: except Exception as e:
error_count += 1 error_count += 1