6 Commits
1.1.3 ... 1.1.5

9 changed files with 902 additions and 19 deletions

View File

@@ -1,6 +1,6 @@
# PPTX Image Compressor (CaesiumCLT only) # PPTX Image Compressor (CaesiumCLT only)
**Version 1.1.3** **Version 1.1.4**
Dieses Paket enthält: Dieses Paket enthält:
@@ -32,14 +32,13 @@ Die Batch lädt bei Bedarf automatisch das **Windows Embeddable Python Package**
## Was das Tool macht ## Was das Tool macht
- Entpackt die PPTX in einen TempOrdner - Entpackt die PPTX in einen TempOrdner
- Komprimiert **JPG/JPEG, PNG, WebP** mit **CaesiumCLT** (Default `-q 90`, `-O bigger`) - Komprimiert **JPG/JPEG, PNG, WebP, GIF** mit **CaesiumCLT** (Default `-q 90`, `-O bigger`)
- Ersetzt Bilder nur, wenn die komprimierte Datei kleiner ist - Ersetzt Bilder nur, wenn die komprimierte Datei kleiner ist
- Schreibt ein CSVLog (`.log` neben der OutputPPTX) - Schreibt ein CSVLog (`.log` neben der OutputPPTX)
- Baut eine neue PPTX und zeigt eine Summary (Name, Größe vorher/nachher, Ersparnis %, Zeit) - Baut eine neue PPTX und zeigt eine Summary (Name, Größe vorher/nachher, Ersparnis %, Zeit)
- Räumt alle temporären Dateien auf (keine CaesiumTempfiles in der finalen PPTX) - Räumt alle temporären Dateien auf (keine CaesiumTempfiles in der finalen PPTX)
## Hinweise ## Hinweise
- **GIF** wird übersprungen (keine Rekodierung).
- `-t` steuert die Parallelität der PythonThreads; intern wird `caesiumclt --threads 1` gesetzt, sobald `-t > 1`, um Oversubscription zu vermeiden. Default ist 16 - `-t` steuert die Parallelität der PythonThreads; intern wird `caesiumclt --threads 1` gesetzt, sobald `-t > 1`, um Oversubscription zu vermeiden. Default ist 16
- `-q` steuert das Qualitätslevel; intern wird `caesiumclt -q` mit diesem Wert von `0..100` benutzt, Default ist 90 - `-q` steuert das Qualitätslevel; intern wird `caesiumclt -q` mit diesem Wert von `0..100` benutzt, Default ist 90
- Die Batch **verwendet bevorzugt das Embeddable Python** neben der BAT; ansonsten sucht sie echte `python.exe`/`py.exe` im PATH, **ignoriert** aber die MicrosoftStoreAliasPfade (`WindowsApps`). - Die Batch **verwendet bevorzugt das Embeddable Python** neben der BAT; ansonsten sucht sie echte `python.exe`/`py.exe` im PATH, **ignoriert** aber die MicrosoftStoreAliasPfade (`WindowsApps`).

Binary file not shown.

61
check_new_version.bat Normal file
View File

@@ -0,0 +1,61 @@
@echo off
setlocal EnableExtensions EnableDelayedExpansion
set UPDATE_DIR=%~dp0updates
if not exist "%UPDATE_DIR%" mkdir "%UPDATE_DIR%"
set TMP_OUT=%TEMP%\update_check_%RANDOM%.txt
set TMP_OUT_2=%TEMP%\update_check_%RANDOM%.txt
python check_new_version.py > "%TMP_OUT%"
set EXITCODE=%ERRORLEVEL%
if %EXITCODE%==20 (
echo Fehler beim Update-Check
goto :END
)
if %EXITCODE%==0 (
echo Keine Updates verfuegbar.
goto :END
)
echo.
type "%TMP_OUT%"
choice /c jn /m "Wollen Sie die Updates-Packages herunterladen?"
if errorlevel 2 goto :END
if exist "%TMP_OUT%" (
findstr /b "PYTHON_DOWNLOAD=" "%TMP_OUT%" >nul
if not errorlevel 1 (
for /f "tokens=1,* delims==" %%a in (
'findstr /b "PYTHON_DOWNLOAD=" "%TMP_OUT%"'
) do (
echo Downloading Python update from PYTHON_DOWNLOAD
powershell -NoProfile -Command ^
"Invoke-WebRequest '%%b' -OutFile '%UPDATE_DIR%\python-embed.zip'"
)
)
findstr /b "CAESIUM_DOWNLOAD=" "%TMP_OUT_2%" >nul
if not errorlevel 1 (
for /f "tokens=1,* delims==" %%a in (
'findstr /b "CAESIUM_DOWNLOAD=" "%TMP_OUT_2%"'
) do (
echo Downloading caesiumclt update from CAESIUM_DOWNLOAD
powershell -NoProfile -Command ^
"Invoke-WebRequest '%%b' -OutFile '%UPDATE_DIR%\caesiumclt.zip'"
)
)
)
:END
del "%TMP_OUT%" >nul 2>&1
del "%TMP_OUT_2%" >nul 2>&1
endlocal

121
check_new_version.py Normal file
View File

@@ -0,0 +1,121 @@
import argparse
import configparser
import json
import sys
import urllib.request
from pathlib import Path
INI_FILE = Path("latestversion.ini")
PYTHON_API = "https://endoflife.date/api/v1/products/python"
CAESIUM_API = "https://api.github.com/repos/Lymphatus/caesium-clt/tags"
EXIT_NO_UPDATE = 0
EXIT_UPDATE_AVAILABLE = 10
EXIT_ERROR = 20
def fetch_json(url):
with urllib.request.urlopen(url, timeout=15) as r:
return json.loads(r.read().decode("utf-8"))
def load_ini():
cfg = configparser.ConfigParser()
cfg.read(INI_FILE, encoding="utf-8")
return cfg
def save_ini(cfg):
with open(INI_FILE, "w", encoding="utf-8") as f:
cfg.write(f)
def check_python(cfg, result):
used = cfg["DEFAULT"].get("python_used_version", "").strip()
major_minor = ".".join(used.split(".")[:2])
data = fetch_json(PYTHON_API)
releases = data.get("result", {}).get("releases", [])
for rel in releases:
if rel.get("name") != major_minor:
continue
latest = rel.get("latest", {}).get("name", "")
is_maintained = rel.get("isMaintained", True)
cfg["DEFAULT"]["python_latest_version"] = latest
if used != latest:
result["updates"].append({
"tool": "python",
"used": used,
"latest": latest,
"maintained": is_maintained,
"url": (
f"https://www.python.org/ftp/python/{latest}/"
f"python-{latest}-embed-amd64.zip"
)
})
def check_caesium(cfg, result):
used = cfg["DEFAULT"].get("caesiumclt_used_version", "").strip()
tags = fetch_json(CAESIUM_API)
latest = tags[0]["name"]
cfg["DEFAULT"]["caesiumclt_latest_version"] = latest
if used != latest:
result["updates"].append({
"tool": "caesiumclt",
"used": used,
"latest": latest,
"maintained": True,
"url": (
f"https://github.com/Lymphatus/caesium-clt/releases/download/{latest}/"
f"caesiumclt-{latest}-x86_64-pc-windows-msvc.zip"
)
})
def main():
parser = argparse.ArgumentParser()
parser.add_argument("--yes", action="store_true")
parser.add_argument("--json", action="store_true")
args = parser.parse_args()
cfg = load_ini()
result = {"updates": []}
try:
check_python(cfg, result)
check_caesium(cfg, result)
except Exception as e:
print(f"ERROR: {e}")
sys.exit(EXIT_ERROR)
save_ini(cfg)
if args.json:
print(json.dumps(result, indent=2))
else:
for u in result["updates"]:
print(
f"{u['tool'].capitalize()}: aktuell genutzt {u['used']}, "
f"neu {u['latest']}, download?"
)
print(f"{u['tool'].upper()}_DOWNLOAD={u['url']}")
if not u["maintained"]:
print(
f"WARNING: Achtung Version {u['latest']} "
"wird nicht mehr gewartet!"
)
sys.exit(EXIT_UPDATE_AVAILABLE if result["updates"] else EXIT_NO_UPDATE)
if __name__ == "__main__":
main()

655
endoflifeapi.json Normal file
View File

@@ -0,0 +1,655 @@
{
"schema_version": "1.2.0",
"generated_at": "2026-04-08T07:17:19+00:00",
"last_modified": "2026-04-08T00:10:16+00:00",
"result": {
"name": "python",
"aliases": [],
"label": "Python",
"category": "lang",
"tags": [
"lang"
],
"versionCommand": "python --version\n\n# or alternatively\npython3 --version",
"identifiers": [
{
"type": "purl",
"id": "pkg:generic/python"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.14"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.13"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.12"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.11"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.10"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.9"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.8"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.7"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.6"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.5"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.4"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.3"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.2"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.1"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python3.0"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.7"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.6"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.5"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.4"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.3"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.2"
},
{
"type": "purl",
"id": "pkg:deb/ubuntu/python2.1"
},
{
"type": "purl",
"id": "pkg:deb/debian/python"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.14"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.13"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.11"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.9"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.7"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.5"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.4"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.2"
},
{
"type": "purl",
"id": "pkg:deb/debian/python3.1"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.7"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.6"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.5"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.4"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.3"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.2"
},
{
"type": "purl",
"id": "pkg:deb/debian/python2.1"
},
{
"type": "purl",
"id": "pkg:deb/debian/python1.5"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.14"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.13"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.12"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.11"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.10"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.9"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.8"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.6"
},
{
"type": "purl",
"id": "pkg:rpm/fedora/python3.5"
},
{
"type": "purl",
"id": "pkg:rpm/amzn/python"
},
{
"type": "purl",
"id": "pkg:rpm/amzn/python2"
},
{
"type": "purl",
"id": "pkg:rpm/amzn/python3"
},
{
"type": "purl",
"id": "pkg:rpm/redhat/python"
},
{
"type": "purl",
"id": "pkg:rpm/redhat/python2"
},
{
"type": "purl",
"id": "pkg:rpm/redhat/python3"
},
{
"type": "purl",
"id": "pkg:rpm/centos/python"
},
{
"type": "purl",
"id": "pkg:rpm/centos/python2"
},
{
"type": "purl",
"id": "pkg:rpm/centos/python3"
},
{
"type": "purl",
"id": "pkg:docker/library/python"
},
{
"type": "purl",
"id": "pkg:docker/circleci/python"
},
{
"type": "purl",
"id": "pkg:docker/bitnami/python"
},
{
"type": "purl",
"id": "pkg:github/python/cpython"
},
{
"type": "repology",
"id": "python"
},
{
"type": "cpe",
"id": "cpe:/a:python:python"
},
{
"type": "cpe",
"id": "cpe:2.3:a:python:python"
}
],
"labels": {
"eoas": "Active Support",
"discontinued": null,
"eol": "Security Support",
"eoes": null
},
"links": {
"icon": "https://cdn.jsdelivr.net/npm/simple-icons/icons/python.svg",
"html": "https://endoflife.date/python",
"releasePolicy": "https://devguide.python.org/versions/"
},
"releases": [
{
"name": "3.14",
"codename": null,
"label": "3.14",
"releaseDate": "2025-10-07",
"isLts": false,
"ltsFrom": null,
"isEoas": false,
"eoasFrom": "2027-10-01",
"isEol": false,
"eolFrom": "2030-10-31",
"isMaintained": true,
"latest": {
"name": "3.14.4",
"date": "2026-04-07",
"link": "https://www.python.org/downloads/release/python-3144/"
},
"custom": {
"pep": "PEP-0745"
}
},
{
"name": "3.13",
"codename": null,
"label": "3.13",
"releaseDate": "2024-10-07",
"isLts": false,
"ltsFrom": null,
"isEoas": false,
"eoasFrom": "2026-10-01",
"isEol": false,
"eolFrom": "2029-10-31",
"isMaintained": true,
"latest": {
"name": "3.13.13",
"date": "2026-04-07",
"link": "https://www.python.org/downloads/release/python-31313/"
},
"custom": {
"pep": "PEP-0719"
}
},
{
"name": "3.12",
"codename": null,
"label": "3.12",
"releaseDate": "2023-10-02",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2025-04-02",
"isEol": false,
"eolFrom": "2028-10-31",
"isMaintained": true,
"latest": {
"name": "3.12.13",
"date": "2026-03-03",
"link": "https://www.python.org/downloads/release/python-31213/"
},
"custom": {
"pep": "PEP-0693"
}
},
{
"name": "3.11",
"codename": null,
"label": "3.11",
"releaseDate": "2022-10-24",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2024-04-01",
"isEol": false,
"eolFrom": "2027-10-31",
"isMaintained": true,
"latest": {
"name": "3.11.15",
"date": "2026-03-03",
"link": "https://www.python.org/downloads/release/python-31115/"
},
"custom": {
"pep": "PEP-0664"
}
},
{
"name": "3.10",
"codename": null,
"label": "3.10",
"releaseDate": "2021-10-04",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2023-04-05",
"isEol": false,
"eolFrom": "2026-10-31",
"isMaintained": true,
"latest": {
"name": "3.10.20",
"date": "2026-03-03",
"link": "https://www.python.org/downloads/release/python-31020/"
},
"custom": {
"pep": "PEP-0619"
}
},
{
"name": "3.9",
"codename": null,
"label": "3.9",
"releaseDate": "2020-10-05",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2022-05-17",
"isEol": true,
"eolFrom": "2025-10-31",
"isMaintained": false,
"latest": {
"name": "3.9.25",
"date": "2025-10-31",
"link": "https://www.python.org/downloads/release/python-3925/"
},
"custom": {
"pep": "PEP-0596"
}
},
{
"name": "3.8",
"codename": null,
"label": "3.8",
"releaseDate": "2019-10-14",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2021-05-03",
"isEol": true,
"eolFrom": "2024-10-07",
"isMaintained": false,
"latest": {
"name": "3.8.20",
"date": "2024-09-06",
"link": "https://www.python.org/downloads/release/python-3820/"
},
"custom": {
"pep": "PEP-0569"
}
},
{
"name": "3.7",
"codename": null,
"label": "3.7",
"releaseDate": "2018-06-27",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2020-06-27",
"isEol": true,
"eolFrom": "2023-06-27",
"isMaintained": false,
"latest": {
"name": "3.7.17",
"date": "2023-06-05",
"link": "https://www.python.org/downloads/release/python-3717/"
},
"custom": {
"pep": "PEP-0537"
}
},
{
"name": "3.6",
"codename": null,
"label": "3.6",
"releaseDate": "2016-12-23",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": "2018-12-24",
"isEol": true,
"eolFrom": "2021-12-23",
"isMaintained": false,
"latest": {
"name": "3.6.15",
"date": "2021-09-03",
"link": "https://www.python.org/downloads/release/python-3615/"
},
"custom": {
"pep": "PEP-0494"
}
},
{
"name": "3.5",
"codename": null,
"label": "3.5",
"releaseDate": "2015-09-13",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2020-09-30",
"isMaintained": false,
"latest": {
"name": "3.5.10",
"date": "2020-09-05",
"link": "https://www.python.org/downloads/release/python-3510/"
},
"custom": {
"pep": "PEP-0478"
}
},
{
"name": "3.4",
"codename": null,
"label": "3.4",
"releaseDate": "2014-03-16",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2019-03-18",
"isMaintained": false,
"latest": {
"name": "3.4.10",
"date": "2019-03-18",
"link": "https://www.python.org/downloads/release/python-3410/"
},
"custom": {
"pep": "PEP-0429"
}
},
{
"name": "3.3",
"codename": null,
"label": "3.3",
"releaseDate": "2012-09-29",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2017-09-29",
"isMaintained": false,
"latest": {
"name": "3.3.7",
"date": "2017-09-19",
"link": "https://www.python.org/downloads/release/python-337/"
},
"custom": {
"pep": "PEP-0398"
}
},
{
"name": "3.2",
"codename": null,
"label": "3.2",
"releaseDate": "2011-02-20",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2016-02-20",
"isMaintained": false,
"latest": {
"name": "3.2.6",
"date": "2014-10-12",
"link": "https://www.python.org/downloads/release/python-326/"
},
"custom": {
"pep": "PEP-0392"
}
},
{
"name": "2.7",
"codename": null,
"label": "2.7",
"releaseDate": "2010-07-03",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2020-01-01",
"isMaintained": false,
"latest": {
"name": "2.7.18",
"date": "2020-04-19",
"link": "https://www.python.org/downloads/release/python-2718/"
},
"custom": {
"pep": "PEP-0373"
}
},
{
"name": "3.1",
"codename": null,
"label": "3.1",
"releaseDate": "2009-06-27",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2012-04-09",
"isMaintained": false,
"latest": {
"name": "3.1.5",
"date": "2012-04-06",
"link": "https://www.python.org/downloads/release/python-315/"
},
"custom": {
"pep": "PEP-0375"
}
},
{
"name": "3.0",
"codename": null,
"label": "3.0",
"releaseDate": "2008-12-03",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2009-06-27",
"isMaintained": false,
"latest": {
"name": "3.0.1",
"date": "2009-02-12",
"link": "https://www.python.org/downloads/release/python-301/"
},
"custom": {
"pep": "PEP-0361"
}
},
{
"name": "2.6",
"codename": null,
"label": "2.6",
"releaseDate": "2008-10-01",
"isLts": false,
"ltsFrom": null,
"isEoas": true,
"eoasFrom": null,
"isEol": true,
"eolFrom": "2013-10-29",
"isMaintained": false,
"latest": {
"name": "2.6.9",
"date": "2013-10-29",
"link": "https://www.python.org/downloads/release/python-269/"
},
"custom": {
"pep": "PEP-0361"
}
}
]
}
}

View File

@@ -12,7 +12,7 @@ set "SELF_DIR=%~dp0"
set "SCRIPT=%SELF_DIR%pptx_image_compress.py" set "SCRIPT=%SELF_DIR%pptx_image_compress.py"
rem ---- Python Embeddable config ---- rem ---- Python Embeddable config ----
set "PY_EMBED_VERSION=3.13.7" set "PY_EMBED_VERSION=3.14.4"
set "PY_EMBED_ZIP=python-%PY_EMBED_VERSION%-embed-amd64.zip" set "PY_EMBED_ZIP=python-%PY_EMBED_VERSION%-embed-amd64.zip"
set "PY_EMBED_URL=https://www.python.org/ftp/python/%PY_EMBED_VERSION%/%PY_EMBED_ZIP%" set "PY_EMBED_URL=https://www.python.org/ftp/python/%PY_EMBED_VERSION%/%PY_EMBED_ZIP%"
set "PY_DIR=%SELF_DIR%python-embed" set "PY_DIR=%SELF_DIR%python-embed"

6
latestversion.ini Normal file
View File

@@ -0,0 +1,6 @@
[DEFAULT]
python_used_version = 3.14.4
python_latest_version = 3.14.4
caesiumclt_used_version = v1.3.0
caesiumclt_latest_version = v1.3.0

View File

@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
PPTX Grafik-Komprimier-Tool (nur CaesiumCLT, Multi-Thread, Batch, sauberes Cleanup) PPTX Grafik-Komprimier-Tool (nur CaesiumCLT, Multi-Thread, Batch, sauberes Cleanup)
Version: 1.1.3 Version: 1.1.4
Highlights: Highlights:
@@ -12,12 +12,14 @@ Highlights:
- Log: image_name,size_before,size_after,saving,saving_percent - Log: image_name,size_before,size_after,saving,saving_percent
- Summary inkl. Zeit benötigt - Summary inkl. Zeit benötigt
Änderungen in 1.1.3: Änderungen in 1.1.4:
- Changed all UNICODE Chars to ASCII - Libcaesium 1.1.0 kann nun auch gif verkleinern
""" """
import argparse import argparse
import os import os
import re
import xml.etree.ElementTree as ET
import sys import sys
import zipfile import zipfile
import tempfile import tempfile
@@ -30,10 +32,12 @@ from pathlib import Path
from datetime import timedelta from datetime import timedelta
from concurrent.futures import ThreadPoolExecutor, as_completed from concurrent.futures import ThreadPoolExecutor, as_completed
from threading import Lock from threading import Lock
from typing import List, Optional
__version__ = "1.1.3"
ALLOWED_EXT = {".jpg", ".jpeg", ".png", ".webp", ".gif"} # GIF wird übersprungen __version__ = "1.1.4"
ALLOWED_EXT = {".jpg", ".jpeg", ".png", ".webp", ".gif"}
PROGRESS_BAR_LEN = 40 PROGRESS_BAR_LEN = 40
TEMP_PREFIX = "pptx_compress_" TEMP_PREFIX = "pptx_compress_"
@@ -91,7 +95,7 @@ def compress_with_caesium(original: Path, out_dir: Path, caesium_threads: int |
raise RuntimeError("[ERROR] 'caesiumclt' wurde nicht gefunden. Bitte CaesiumCLT installieren und in PATH verfügbar machen.") raise RuntimeError("[ERROR] 'caesiumclt' wurde nicht gefunden. Bitte CaesiumCLT installieren und in PATH verfügbar machen.")
out_dir.mkdir(parents=True, exist_ok=True) out_dir.mkdir(parents=True, exist_ok=True)
ext = original.suffix.lower() ext = original.suffix.lower()
if ext not in {".jpg", ".jpeg", ".png", ".webp"}: if ext not in {".jpg", ".jpeg", ".png", ".webp", ".gif"}:
return None return None
cmd = [exe, "-q", str(quality), "-O", "bigger", "-o", str(out_dir)] cmd = [exe, "-q", str(quality), "-O", "bigger", "-o", str(out_dir)]
if caesium_threads is not None: if caesium_threads is not None:
@@ -117,6 +121,38 @@ def format_duration(seconds: float) -> str:
return f"{hms}.{frac[:2]}" return f"{hms}.{frac[:2]}"
return base return base
def get_slide_numbers_for_image(rels_dir: str, image_filename: str) -> Optional[List[int]]:
"""
Durchsucht alle .rels-Dateien im angegebenen Verzeichnis und gibt die Slide-Nummern zurück,
in denen die angegebene Bilddatei referenziert wird.
:param rels_dir: Pfad zum Verzeichnis ppt/slides/_rels
:param image_filename: z.B. 'image80.png'
:return: Liste von Slide-Nummern oder None
"""
slide_numbers = []
for rels_file in os.listdir(rels_dir):
if rels_file.startswith("slide") and rels_file.endswith(".xml.rels"):
rels_path = os.path.join(rels_dir, rels_file)
try:
tree = ET.parse(rels_path)
root = tree.getroot()
for rel in root.findall(".//{http://schemas.openxmlformats.org/package/2006/relationships}Relationship"):
target = rel.attrib.get("Target", "")
if image_filename in target:
match = re.search(r"slide(\d+).xml.rels", rels_file)
if match:
slide_number = int(match.group(1))
slide_numbers.append(slide_number)
except ET.ParseError:
print(f"Fehler beim Parsen von {rels_file}")
return slide_numbers if slide_numbers else None
# -------------------- Core per-deck processing -------------------- # -------------------- Core per-deck processing --------------------
def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quality: int) -> dict: def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quality: int) -> dict:
start_time = time.perf_counter() start_time = time.perf_counter()
@@ -143,7 +179,7 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
log_file = output_pptx.with_suffix(".log.csv") log_file = output_pptx.with_suffix(".log.csv")
ensure_clean_file(log_file) ensure_clean_file(log_file)
log_lines = ["image_name;size_before(kb);size_after(kb);saving(kb);saving_percent(%)\n"] log_lines = ["image_name;size_before(kb);size_after(kb);saving(kb);saving_percent(%);in_slide_number\n"]
size_before = input_pptx.stat().st_size size_before = input_pptx.stat().st_size
result["size_before"] = size_before result["size_before"] = size_before
@@ -151,8 +187,11 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
with zipfile.ZipFile(input_pptx, "r") as z: with zipfile.ZipFile(input_pptx, "r") as z:
z.extractall(work_dir) z.extractall(work_dir)
slides_dir = work_dir / "ppt" / "slides"
media_dir = work_dir / "ppt" / "media" media_dir = work_dir / "ppt" / "media"
images = [] images = []
if media_dir.exists(): if media_dir.exists():
for f in sorted(media_dir.iterdir()): for f in sorted(media_dir.iterdir()):
if f.is_file() and f.suffix.lower() in ALLOWED_EXT: if f.is_file() and f.suffix.lower() in ALLOWED_EXT:
@@ -173,14 +212,16 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
nonlocal done_count nonlocal done_count
ext = img_path.suffix.lower() ext = img_path.suffix.lower()
orig_size = img_path.stat().st_size orig_size = img_path.stat().st_size
if ext == ".gif":
with lock:
done_count += 1
log_lines.append(f"{img_path.name};{human_kb(orig_size)};{human_kb(orig_size)};0;0.0\n")
print_progress(done_count, total)
return
chosen_size = orig_size chosen_size = orig_size
found_in_slide=None
slide_nr=""
try: try:
found_in_slide = get_slide_numbers_for_image(slides_dir.name, img_path.name)
if found_in_slide is None:
slide_nr = "NOT_USED"
else:
slide_nr = str(found_in_slide)
out_sub = scratch_dir / f"img_{idx:06d}" out_sub = scratch_dir / f"img_{idx:06d}"
caesium_out = compress_with_caesium(img_path, out_sub, caesium_threads, quality) caesium_out = compress_with_caesium(img_path, out_sub, caesium_threads, quality)
if caesium_out and caesium_out.exists(): if caesium_out and caesium_out.exists():
@@ -195,8 +236,9 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
finally: finally:
saving = orig_size - chosen_size saving = orig_size - chosen_size
saving_percent = round((saving / orig_size) * 100, 2) if orig_size > 0 else 0.0 saving_percent = round((saving / orig_size) * 100, 2) if orig_size > 0 else 0.0
with lock: with lock:
log_lines.append(f"{img_path.name};{human_kb(orig_size)};{human_kb(chosen_size)};{human_kb(saving)};{saving_percent}\n") log_lines.append(f"{img_path.name};{human_kb(orig_size)};{human_kb(chosen_size)};{human_kb(saving)};{saving_percent};{slide_nr}\n")
done_count += 1 done_count += 1
print_progress(done_count, total) print_progress(done_count, total)

View File

@@ -1 +0,0 @@
Place your PPTX files here for testing, or use -i with a full path.