Compare commits
2 Commits
0338fd6524
...
1.1.6
| Author | SHA1 | Date | |
|---|---|---|---|
| 332e62b764 | |||
| 5e7a6643ea |
61
check_new_version.bat
Normal file
61
check_new_version.bat
Normal 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
121
check_new_version.py
Normal 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
655
endoflifeapi.json
Normal 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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
6
latestversion.ini
Normal file
6
latestversion.ini
Normal 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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
PPTX Grafik-Komprimier-Tool (nur CaesiumCLT, Multi-Thread, Batch, sauberes Cleanup)
|
||||
Version: 1.1.4
|
||||
Version: 1.1.6
|
||||
|
||||
|
||||
Highlights:
|
||||
@@ -12,8 +12,8 @@ Highlights:
|
||||
- Log: image_name,size_before,size_after,saving,saving_percent
|
||||
- Summary inkl. Zeit benötigt
|
||||
|
||||
Änderungen in 1.1.4:
|
||||
- Libcaesium 1.1.0 kann nun auch gif verkleinern
|
||||
Änderungen in 1.1.6:
|
||||
- Libcaesium 1.3.0 kann nun auch files ignorieren, wenn die Kompression kleiner als <MIN_SAVING> ist
|
||||
"""
|
||||
|
||||
import argparse
|
||||
@@ -35,11 +35,12 @@ from threading import Lock
|
||||
from typing import List, Optional
|
||||
|
||||
|
||||
__version__ = "1.1.4"
|
||||
__version__ = "1.1.6"
|
||||
|
||||
ALLOWED_EXT = {".jpg", ".jpeg", ".png", ".webp", ".gif"}
|
||||
PROGRESS_BAR_LEN = 40
|
||||
TEMP_PREFIX = "pptx_compress_"
|
||||
DEFAULT_MIN_SAVINGS = "2%"
|
||||
|
||||
|
||||
# -------------------- Utilities --------------------
|
||||
@@ -89,7 +90,7 @@ def zip_dir_to_pptx(src_dir: Path, out_pptx: Path):
|
||||
def which(cmd: str):
|
||||
return shutil.which(cmd)
|
||||
|
||||
def compress_with_caesium(original: Path, out_dir: Path, caesium_threads: int | None, quality: int) -> Path | None:
|
||||
def compress_with_caesium(original: Path, out_dir: Path, caesium_threads: int | None, quality: int, min_savings: str) -> Path | None:
|
||||
exe = which("caesiumclt")
|
||||
if not exe:
|
||||
raise RuntimeError("[ERROR] 'caesiumclt' wurde nicht gefunden. Bitte CaesiumCLT installieren und in PATH verfügbar machen.")
|
||||
@@ -97,7 +98,7 @@ def compress_with_caesium(original: Path, out_dir: Path, caesium_threads: int |
|
||||
ext = original.suffix.lower()
|
||||
if ext not in {".jpg", ".jpeg", ".png", ".webp", ".gif"}:
|
||||
return None
|
||||
cmd = [exe, "-q", str(quality), "-O", "bigger", "-o", str(out_dir)]
|
||||
cmd = [exe, "-q", str(quality), "-O", "bigger", "--min-savings", min_savings, "-o", str(out_dir)]
|
||||
if caesium_threads is not None:
|
||||
cmd += ["--threads", str(caesium_threads)]
|
||||
cmd += [str(original)]
|
||||
@@ -121,40 +122,45 @@ def format_duration(seconds: float) -> str:
|
||||
return f"{hms}.{frac[:2]}"
|
||||
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.
|
||||
def build_image_slide_index(rels_dir: Path) -> dict[str, List[int]]:
|
||||
if not rels_dir.exists() or not rels_dir.is_dir():
|
||||
return {}
|
||||
|
||||
: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 = []
|
||||
image_to_slides: dict[str, set[int]] = {}
|
||||
|
||||
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)
|
||||
for rels_path in rels_dir.iterdir():
|
||||
rels_file = rels_path.name
|
||||
if rels_file.startswith("slide") and rels_file.endswith(".xml.rels") and rels_path.is_file():
|
||||
match = re.search(r"slide(\d+)\.xml\.rels$", rels_file)
|
||||
if not match:
|
||||
continue
|
||||
slide_number = int(match.group(1))
|
||||
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}")
|
||||
image_name = Path(target).name
|
||||
if image_name:
|
||||
if image_name not in image_to_slides:
|
||||
image_to_slides[image_name] = set()
|
||||
image_to_slides[image_name].add(slide_number)
|
||||
except (ET.ParseError, OSError):
|
||||
print(f"Fehler beim Lesen von {rels_file}")
|
||||
|
||||
return slide_numbers if slide_numbers else None
|
||||
return {img: sorted(slides) for img, slides in image_to_slides.items()}
|
||||
|
||||
|
||||
def get_slide_numbers_for_image(rels_dir: Path, image_filename: str) -> Optional[List[int]]:
|
||||
image_to_slides = build_image_slide_index(rels_dir)
|
||||
slides = image_to_slides.get(image_filename)
|
||||
return slides if slides else None
|
||||
|
||||
|
||||
|
||||
|
||||
# -------------------- 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, min_savings: str) -> dict:
|
||||
start_time = time.perf_counter()
|
||||
result = {
|
||||
"input": str(input_pptx),
|
||||
@@ -188,6 +194,7 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
|
||||
z.extractall(work_dir)
|
||||
|
||||
slides_dir = work_dir / "ppt" / "slides"
|
||||
rels_dir = slides_dir / "_rels"
|
||||
media_dir = work_dir / "ppt" / "media"
|
||||
|
||||
images = []
|
||||
@@ -207,23 +214,23 @@ def process_single_deck(input_pptx: Path, output_pptx: Path, threads: int, quali
|
||||
caesium_threads = 1 if threads and threads > 1 else None
|
||||
lock = Lock()
|
||||
done_count = 0
|
||||
image_to_slides = build_image_slide_index(rels_dir)
|
||||
|
||||
def worker(idx: int, img_path: Path):
|
||||
nonlocal done_count
|
||||
ext = img_path.suffix.lower()
|
||||
orig_size = img_path.stat().st_size
|
||||
chosen_size = orig_size
|
||||
found_in_slide=None
|
||||
slide_nr=""
|
||||
found_in_slide = None
|
||||
slide_nr = ""
|
||||
|
||||
try:
|
||||
found_in_slide = get_slide_numbers_for_image(slides_dir.name, img_path.name)
|
||||
found_in_slide = image_to_slides.get(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}"
|
||||
caesium_out = compress_with_caesium(img_path, out_sub, caesium_threads, quality)
|
||||
caesium_out = compress_with_caesium(img_path, out_sub, caesium_threads, quality, min_savings)
|
||||
if caesium_out and caesium_out.exists():
|
||||
s = caesium_out.stat().st_size
|
||||
if s < orig_size:
|
||||
@@ -359,15 +366,16 @@ def main():
|
||||
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
|
||||
)
|
||||
parser.add_argument('-i','--input', nargs='*', help='Input-PPTX (eine oder mehrere, Wildcards erlaubt). Bei mehreren: -O erforderlich.')
|
||||
parser.add_argument('--input-dir', help='Eingabe-Verzeichnis (optional, für Batch)')
|
||||
parser.add_argument('-o','--output', help='Output-PPTX (nur Single-Mode)')
|
||||
parser.add_argument('-O','--output-dir', help='Output-Verzeichnis (erforderlich für Batch)')
|
||||
parser.add_argument('--input-dir', help='Eingabe-Verzeichnis (optional, für Batch)')
|
||||
parser.add_argument('--pattern', default='*.pptx', help='Dateimuster für --input-dir')
|
||||
parser.add_argument('--recursive', action='store_true', help='Rekursiv in --input-dir suchen')
|
||||
#parser.add_argument('-t','--threads', type=int, default=min(32, os.cpu_count() or 4), help='Anzahl paralleler Threads pro Datei')
|
||||
parser.add_argument('-t','--threads', type=int, default=16, help='Anzahl paralleler Threads pro Datei')
|
||||
parser.add_argument('-q','--quality', type=int, default=90, help='Qualität für caesiumclt (0..100), höher = bessere Qualität / größere Datei')
|
||||
parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}')
|
||||
parser.add_argument('--min-savings', default=DEFAULT_MIN_SAVINGS, help="Mindestersparnis für caesiumclt (z. B. 2%%, 100KB, 1MB oder Bytes als Zahl)")
|
||||
parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}', help="Zeigt die Versionsnummer an" )
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
@@ -412,7 +420,7 @@ def main():
|
||||
failures += 1
|
||||
continue
|
||||
dst = out_dir / f"{src.stem}_compressed.pptx"
|
||||
res = process_single_deck(src, dst, args.threads, args.quality)
|
||||
res = process_single_deck(src, dst, args.threads, args.quality, args.min_savings)
|
||||
if res['ok']:
|
||||
successes += 1
|
||||
overall_before += res['size_before']
|
||||
@@ -427,7 +435,7 @@ def main():
|
||||
dst = Path(args.output_dir) / f"{src.stem}_compressed.pptx"
|
||||
else:
|
||||
dst = Path(args.output).resolve() if args.output else src.with_name(f"{src.stem}_compressed.pptx")
|
||||
res = process_single_deck(src, dst, args.threads, args.quality)
|
||||
res = process_single_deck(src, dst, args.threads, args.quality, args.min_savings)
|
||||
if res['ok']:
|
||||
successes += 1
|
||||
overall_before += res['size_before']
|
||||
|
||||
Reference in New Issue
Block a user