Compare commits
8 Commits
1.1.8
..
370cd80bbe
| Author | SHA1 | Date | |
|---|---|---|---|
| 370cd80bbe | |||
| ab62ce4f7b | |||
| dae74da39e | |||
| 16f30e8d38 | |||
| e6a8fcb963 | |||
| d0fd8e9996 | |||
| fc0d515a42 | |||
| 3c65f8cf65 |
@@ -4,3 +4,5 @@ python-embed/*
|
||||
logs/*.log
|
||||
__pycache__/*
|
||||
.coverage
|
||||
build/*
|
||||
dist/*
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
# PPTX Image Compressor (CaesiumCLT only)
|
||||
**Version 1.1.8**
|
||||
# PPTX Image Compressor (CaesiumCLT + svg-polish)
|
||||
**Version 1.1.9**
|
||||
|
||||
Dieses Paket enthält:
|
||||
|
||||
@@ -33,22 +32,23 @@ Zusätzlich wird **pip** installiert, damit das **svg-polish** Modul installiert
|
||||
## Was das Tool macht
|
||||
- Entpackt die PPTX in einen Temp‑Ordner
|
||||
- Komprimiert **JPG/JPEG, PNG, WebP, GIF** mit **CaesiumCLT** (Default `-q 90`, `-O bigger`)
|
||||
- Komprimiert **SVG** mit **svg-polish** (Default-Modus: `agressive`)
|
||||
- Komprimiert **SVG** mit **svg-polish** (Default-Modus: `balanced`)
|
||||
- Ersetzt Bilder nur, wenn die komprimierte Datei kleiner ist
|
||||
- Versucht bei PNG zusätzlich einen PNG->JPG Wechsel, wenn das Bild nach Kompression noch größer als 500 KB ist
|
||||
- Ersetzt Bilder nur, wenn sei mindestens 2% kleiner sind (verhindert *doppelte Komprimierung*)
|
||||
- Schreibt ein CSV‑Log (`.log` neben der Output‑PPTX)
|
||||
- Baut eine neue PPTX und zeigt eine Summary (Name, Größe vorher/nachher, Ersparnis %, Zeit)
|
||||
|
||||
## Änderungen in 1.1.8
|
||||
- SVG Files werden bei Vorhandensein von svg-polish anhand von 2 Profilen optimiert: balanced|agressive
|
||||
## Änderungen in 1.1.9
|
||||
- SVG Files Default Profile: `balanced` statt `aggressive`
|
||||
- Datei-Eigenschaften der neu generierten PPTX enthält Hinweis auf Compression `compressed by PPTX Image Compressor`
|
||||
|
||||
## Hinweise
|
||||
- `-t` steuert die Parallelität der Python‑Threads; 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
|
||||
- `--min-savings` steuert das Mindestmass an Komprimierung zur Verhinderung von doppelter Komprimierunt, Default ist 2%
|
||||
- Die Batch **verwendet bevorzugt das Embeddable Python** neben der BAT; ansonsten sucht sie echte `python.exe`/`py.exe` im PATH, **ignoriert** aber die Microsoft‑Store‑Alias‑Pfade (`WindowsApps`).
|
||||
- `--svg-profile` steuert das Vector-Optimierungsprofil `balanced|agressive`
|
||||
- `--svg-profile` steuert das Vector-Optimierungsprofil `balanced|aggressive`
|
||||
|
||||
## Manuelle Nutzung des .py (falls Python vorhanden)
|
||||
```bat
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions
|
||||
|
||||
set "SELF_DIR=%~dp0"
|
||||
pushd "%SELF_DIR%"
|
||||
|
||||
set "BUILD_DIR=%SELF_DIR%dist"
|
||||
set "SPEC_DIR=%SELF_DIR%build"
|
||||
set "PY_CMD=%SELF_DIR%.venv\Scripts\python.exe"
|
||||
set "UPX_DIR=%SELF_DIR%buildtools"
|
||||
|
||||
set "MINIFY="
|
||||
if /I "%~1"=="--minify" set "MINIFY=1"
|
||||
|
||||
echo [INFO] Build started...
|
||||
|
||||
rem =========================
|
||||
rem Check Python
|
||||
rem =========================
|
||||
|
||||
if not exist "%PY_CMD%" (
|
||||
echo [ERROR] Python not found
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
rem =========================
|
||||
rem Check PyInstaller
|
||||
rem =========================
|
||||
|
||||
"%PY_CMD%" -m pip show pyinstaller >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo [INFO] Installing PyInstaller...
|
||||
"%PY_CMD%" -m pip install pyinstaller --quiet
|
||||
)
|
||||
|
||||
rem =========================
|
||||
rem Clean
|
||||
rem =========================
|
||||
|
||||
if exist "%BUILD_DIR%" rmdir /s /q "%BUILD_DIR%"
|
||||
if exist "%SPEC_DIR%" rmdir /s /q "%SPEC_DIR%"
|
||||
|
||||
rem =========================
|
||||
rem Optional icon
|
||||
rem =========================
|
||||
|
||||
set "ICON_ARG="
|
||||
if exist "%SELF_DIR%pptx-image-compress.ico" (
|
||||
set "ICON_ARG=%SELF_DIR%pptx-image-compress.ico"
|
||||
)
|
||||
echo [INFO] Icon param: %ICON_ARG%
|
||||
|
||||
|
||||
rem =========================
|
||||
rem Build EXE (STABLE)
|
||||
rem =========================
|
||||
|
||||
echo [INFO] Building EXE...
|
||||
|
||||
if defined ICON_ARG (
|
||||
"%PY_CMD%" -m PyInstaller ^
|
||||
--onefile ^
|
||||
--console ^
|
||||
--name pptx-image-compress ^
|
||||
--distpath "%BUILD_DIR%" ^
|
||||
--specpath "%SPEC_DIR%" ^
|
||||
--workpath "%SPEC_DIR%\build" ^
|
||||
--icon="%ICON_ARG%" ^
|
||||
--hidden-import svg_polish ^
|
||||
pptx_image_compress.py
|
||||
) else (
|
||||
"%PY_CMD%" -m PyInstaller ^
|
||||
--onefile ^
|
||||
--console ^
|
||||
--name pptx-image-compress ^
|
||||
--distpath "%BUILD_DIR%" ^
|
||||
--specpath "%SPEC_DIR%" ^
|
||||
--workpath "%SPEC_DIR%\build" ^
|
||||
--hidden-import svg_polish ^
|
||||
pptx_image_compress.py
|
||||
)
|
||||
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Build failed
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
rem =========================
|
||||
rem Optional UPX
|
||||
rem =========================
|
||||
|
||||
if defined MINIFY (
|
||||
if exist "%UPX_DIR%\upx.exe" (
|
||||
echo [INFO] Running UPX compression...
|
||||
"%UPX_DIR%\upx.exe" --best --force "%BUILD_DIR%\pptx-image-compress.exe"
|
||||
) else (
|
||||
echo [WARN] UPX not found at %UPX_DIR%
|
||||
)
|
||||
)
|
||||
|
||||
rem =========================
|
||||
rem Copy templates
|
||||
rem =========================
|
||||
|
||||
copy "%SELF_DIR%templates\run.tpl.bat" "%BUILD_DIR%\run.bat" >nul
|
||||
copy "%SELF_DIR%templates\dragdrop.tpl.bat" "%BUILD_DIR%\dragdrop.bat" >nul
|
||||
|
||||
|
||||
rem =========================
|
||||
rem Copy caesiumclt.exe
|
||||
rem =========================
|
||||
copy "%SELF_DIR%bin\caesiumclt.exe" "%BUILD_DIR%\caesiumclt.exe"
|
||||
|
||||
rem =========================
|
||||
rem Done
|
||||
rem =========================
|
||||
|
||||
echo(
|
||||
echo [SUCCESS] Build complete!
|
||||
echo Output:
|
||||
echo %BUILD_DIR%\pptx-image-compress.exe
|
||||
|
||||
popd
|
||||
endlocal
|
||||
Binary file not shown.
+1
-38
@@ -1,11 +1,7 @@
|
||||
@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%
|
||||
@@ -23,39 +19,6 @@ if %EXITCODE%==0 (
|
||||
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
|
||||
endlocal
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[DEFAULT]
|
||||
python_used_version = 3.14.5
|
||||
python_latest_version = 3.14.5
|
||||
python_used_version = 3.14.6
|
||||
python_latest_version = 3.14.6
|
||||
caesiumclt_used_version = v1.3.0
|
||||
caesiumclt_latest_version = v1.3.0
|
||||
|
||||
@@ -2,10 +2,11 @@ import argparse
|
||||
import configparser
|
||||
import json
|
||||
import sys
|
||||
import os
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
INI_FILE = Path("latestversion.ini")
|
||||
INI_FILE = Path("check_new_version.ini")
|
||||
PYTHON_API = "https://endoflife.date/api/v1/products/python"
|
||||
CAESIUM_API = "https://api.github.com/repos/Lymphatus/caesium-clt/tags"
|
||||
|
||||
@@ -79,7 +80,6 @@ def check_caesium(cfg, result):
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--yes", action="store_true")
|
||||
@@ -104,10 +104,11 @@ def main():
|
||||
for u in result["updates"]:
|
||||
print(
|
||||
f"{u['tool'].capitalize()}: aktuell genutzt {u['used']}, "
|
||||
f"neu {u['latest']}, download?"
|
||||
f"neu {u['latest']}"
|
||||
)
|
||||
print(f"{u['tool'].upper()}_DOWNLOAD={u['url']}")
|
||||
|
||||
print(f"{u['tool'].upper()}_LATEST_VERSION={u['latest']}")
|
||||
|
||||
if not u["maintained"]:
|
||||
print(
|
||||
f"WARNING: Achtung Version {u['latest']} "
|
||||
|
||||
+30
-5
@@ -12,7 +12,7 @@ set "SELF_DIR=%~dp0"
|
||||
set "SCRIPT=%SELF_DIR%pptx_image_compress.py"
|
||||
|
||||
rem ---- Python Embeddable config ----
|
||||
set "PY_EMBED_VERSION=3.14.5"
|
||||
set "PY_EMBED_VERSION=3.14.6"
|
||||
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_DIR=%SELF_DIR%python-embed"
|
||||
@@ -110,6 +110,14 @@ if errorlevel 1 (
|
||||
)
|
||||
set "PY_CMD=%PY_EXE%"
|
||||
|
||||
rem ---- Fix embedded Python isolation for the installation of pip ----
|
||||
set "PTH_FILE=%PY_DIR%\python314._pth"
|
||||
if exist "%PTH_FILE%" (
|
||||
echo [INFO] Enabling site-packages in embedded Python...
|
||||
powershell -Command ^
|
||||
"(Get-Content '%PTH_FILE%') -replace '^#?\s*import site','import site' | Set-Content '%PTH_FILE%'"
|
||||
)
|
||||
|
||||
:have_python
|
||||
if not defined PY_CMD (
|
||||
echo [ERROR] Konnte Python nicht ermitteln. Abbruch.
|
||||
@@ -122,8 +130,17 @@ if not exist "%SCRIPT%" (
|
||||
exit /b 6
|
||||
)
|
||||
|
||||
set "RUN_ARGS=%*"
|
||||
if "%~1"=="" set "RUN_ARGS=-h"
|
||||
set "ALL_ARGS=%*"
|
||||
set "RUN_ARGS=%ALL_ARGS%"
|
||||
set "DEBUG_MODE=0"
|
||||
|
||||
if "%~1"=="--debug" (
|
||||
set "DEBUG_MODE=1"
|
||||
set "RUN_ARGS=!ALL_ARGS:~8!"
|
||||
if "!RUN_ARGS:~0,1!"==" " set "RUN_ARGS=!RUN_ARGS:~1!"
|
||||
)
|
||||
|
||||
if "!RUN_ARGS!"=="" set "RUN_ARGS=-h"
|
||||
|
||||
echo [INFO] Pruefe und installiere Python-Abhaengigkeit: svg-polish ...
|
||||
set "PIP_OK=0"
|
||||
@@ -165,14 +182,22 @@ if "%PIP_OK%"=="0" (
|
||||
|
||||
if "%PIP_OK%"=="1" (
|
||||
if defined USE_PY_LAUNCHER (
|
||||
"%PY_CMD%" -3 -m pip install --disable-pip-version-check --quiet svg-polish
|
||||
"%PY_CMD%" -3 -m pip install --disable-pip-version-check --quiet --no-warn-script-location svg-polish
|
||||
) else (
|
||||
"%PY_CMD%" -m pip install --disable-pip-version-check --quiet svg-polish
|
||||
"%PY_CMD%" -m pip install --disable-pip-version-check --quiet --no-warn-script-location svg-polish
|
||||
)
|
||||
if errorlevel 1 (
|
||||
echo [WARN] 'svg-polish' konnte nicht installiert werden. SVG-Dateien werden nicht komprimiert.
|
||||
) else (
|
||||
echo [OK] 'svg-polish' ist verfuegbar.
|
||||
if %DEBUG_MODE%==1 (
|
||||
echo [DEBUG] pip list:
|
||||
if defined USE_PY_LAUNCHER (
|
||||
"%PY_CMD%" -3 -m pip list
|
||||
) else (
|
||||
"%PY_CMD%" -m pip list
|
||||
)
|
||||
)
|
||||
)
|
||||
) else (
|
||||
echo [WARN] pip konnte nicht eingerichtet werden. SVG-Dateien werden nicht komprimiert.
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
# PPTX Image Compressor – Installation Logic
|
||||
|
||||
## 1. Intro – One Line Summary
|
||||
|
||||
> The script selects the best available Python environment, falls back to a self-installed embedded runtime if necessary, ensures `pip`, installs `svg-polish` when possible, and runs the application with graceful degradation.
|
||||
|
||||
## 2. Lightweight Overview
|
||||
|
||||
```text
|
||||
START
|
||||
│
|
||||
├─► Find usable Python
|
||||
│ ├─ venv (active / local)
|
||||
│ ├─ system Python
|
||||
│ └─ fallback: download embedded Python
|
||||
│
|
||||
├─► Ensure pip works
|
||||
│ ├─ pip exists → OK
|
||||
│ ├─ ensurepip → try fix
|
||||
│ └─ get-pip.py → fallback fix
|
||||
│
|
||||
├─► Install dependency
|
||||
│ └─ svg-polish (optional but preferred)
|
||||
│
|
||||
├─► Run main script
|
||||
│
|
||||
└─► END
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Detailed Logic Tree
|
||||
|
||||
```text
|
||||
START
|
||||
│
|
||||
├─► [A] Pre-check: caesiumclt
|
||||
│ ├─ found → continue
|
||||
│ └─ not found → EXIT
|
||||
│
|
||||
├─► [B] Python resolution (priority-based)
|
||||
│ │
|
||||
│ ├─ Active venv (VIRTUAL_ENV)?
|
||||
│ │ └─ use it ✅
|
||||
│ │
|
||||
│ ├─ Local ".venv"?
|
||||
│ │ └─ use it ✅
|
||||
│ │
|
||||
│ ├─ Local "venv"?
|
||||
│ │ └─ use it ✅
|
||||
│ │
|
||||
│ ├─ System Python (python.exe, excluding WindowsApps)?
|
||||
│ │ └─ use it ✅
|
||||
│ │
|
||||
│ ├─ Python launcher (py.exe)?
|
||||
│ │ └─ use py -3 ✅
|
||||
│ │
|
||||
│ ├─ Existing embedded Python?
|
||||
│ │ └─ use it ✅
|
||||
│ │
|
||||
│ └─ NONE FOUND →
|
||||
│ ├─ Download embeddable Python
|
||||
│ ├─ Extract to python-embed
|
||||
│ ├─ Fix isolation (enable "import site")
|
||||
│ └─ use it ✅
|
||||
│
|
||||
├─► [C] Validate main script exists
|
||||
│ ├─ missing → EXIT
|
||||
│ └─ exists → continue
|
||||
│
|
||||
├─► [D] Ensure pip availability
|
||||
│ │
|
||||
│ ├─ pip works?
|
||||
│ │ └─ YES → continue ✅
|
||||
│ │
|
||||
│ └─ NO →
|
||||
│ ├─ try: ensurepip
|
||||
│ │ ├─ success → ✅
|
||||
│ │ └─ fail →
|
||||
│ │
|
||||
│ └─ if embedded Python:
|
||||
│ ├─ download get-pip.py
|
||||
│ ├─ execute it
|
||||
│ ├─ remove file
|
||||
│ └─ re-check pip
|
||||
│
|
||||
│ ├─ still no pip →
|
||||
│ │ └─ WARN: disable SVG compression
|
||||
│ │
|
||||
│ └─ pip available →
|
||||
│ ✅ continue
|
||||
│
|
||||
├─► [E] Install dependency
|
||||
│ ├─ install svg-polish
|
||||
│ │ ├─ success → ✅ SVG enabled
|
||||
│ │ └─ fail → ⚠ SVG disabled
|
||||
│ │
|
||||
│ └─ optional debug: pip list
|
||||
│
|
||||
├─► [F] Run application
|
||||
│ ├─ execute Python script
|
||||
│ ├─ capture return code
|
||||
│ ├─ success → "Fertig"
|
||||
│ └─ error → report exit code
|
||||
│
|
||||
└─► END
|
||||
```
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 800 KiB |
+54
-16
@@ -2,7 +2,11 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
PPTX Raster & Vector Komprimier-Tool (Raster-Iamges: via CaesiumCLT, Vector-Images: via python Module svg_polish)
|
||||
Version: 1.1.8
|
||||
Version: 1.1.9
|
||||
|
||||
Änderungen in 1.1.9
|
||||
- SVG Files Default Profile: `balanced` statt `aggressive`
|
||||
- Datei-Eigenschaften der neu generierten PPTX enthält Hinweis auf Compression `compressed by PPTX Image Compressor`
|
||||
|
||||
Änderungen in 1.1.8:
|
||||
- SVG Files werden bei Vorhandensein von svg_polish anhand von 2 Profilen optimiert: balanced|agressive
|
||||
@@ -38,7 +42,7 @@ from typing import Callable, List, Optional
|
||||
|
||||
|
||||
|
||||
__version__ = "1.1.8"
|
||||
__version__ = "1.1.9"
|
||||
|
||||
RASTER_EXT = {".jpg", ".jpeg", ".png", ".webp", ".gif"}
|
||||
VECTOR_EXT = {".svg"}
|
||||
@@ -50,7 +54,7 @@ PNG_TO_JPEG_THRESHOLD_BYTES = 500 * 1024
|
||||
SVG_POLISH_MODULE_NAME = "svg_polish"
|
||||
SVG_PROFILE_BALANCED = "balanced"
|
||||
SVG_PROFILE_AGGRESSIVE = "aggressive"
|
||||
SVG_PROFILE_DEFAULT = SVG_PROFILE_AGGRESSIVE
|
||||
SVG_PROFILE_DEFAULT = SVG_PROFILE_BALANCED
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -252,17 +256,8 @@ def build_svg_polish_options(svg_polish_module: object, profile: str = SVG_PROFI
|
||||
try:
|
||||
if profile == SVG_PROFILE_BALANCED:
|
||||
return options_type(
|
||||
digits=3,
|
||||
style_to_xml=True,
|
||||
group_collapse=True,
|
||||
simple_colors=True,
|
||||
indent_type="none",
|
||||
newlines=False,
|
||||
strip_xml_prolog=True,
|
||||
strip_comments=True,
|
||||
remove_metadata=True,
|
||||
remove_titles=True,
|
||||
remove_descriptions=True,
|
||||
shorten_ids=True,
|
||||
enable_viewboxing=True,
|
||||
)
|
||||
return options_type(
|
||||
digits=2,
|
||||
@@ -648,6 +643,8 @@ def process_single_deck(
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
update_core_description(work_dir, "PPTX Image Compressor",__version__)
|
||||
|
||||
zip_dir_to_pptx(work_dir, output_pptx)
|
||||
size_after = output_pptx.stat().st_size
|
||||
result.size_after = size_after
|
||||
@@ -832,8 +829,9 @@ def extractParserArguments():
|
||||
parser.add_argument('-O','--output-dir', help='Output-Verzeichnis (erforderlich 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')
|
||||
# Standard as of https://docs.python.org/3/library/concurrent.futures.html. Changed in version 3.13: Default value of max_workers is changed to min(32, (os.process_cpu_count() or 1) + 4).
|
||||
# On my machine this is 16 Threads
|
||||
parser.add_argument('-t','--threads', type=int, default=min(32, (os.process_cpu_count() or 1) + 4), 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('--min-savings', default=DEFAULT_MIN_SAVINGS, help="Mindestersparnis für caesiumclt (z. B. 2%%, 100KB, 1MB oder Bytes als Zahl)")
|
||||
parser.add_argument('--svg-profile', choices=[SVG_PROFILE_BALANCED, SVG_PROFILE_AGGRESSIVE], default=SVG_PROFILE_DEFAULT, help='Optimierungsprofil für SVG-Kompression')
|
||||
@@ -845,6 +843,46 @@ def extractParserArguments():
|
||||
|
||||
|
||||
|
||||
def update_core_description(base_dir, app_name, version):
|
||||
core_xml_path = Path(base_dir) / "docProps" / "core.xml"
|
||||
|
||||
if not core_xml_path.exists():
|
||||
raise FileNotFoundError(f"{core_xml_path} nicht gefunden")
|
||||
|
||||
# Namespaces definieren
|
||||
ns = {
|
||||
"cp": "http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
|
||||
"dc": "http://purl.org/dc/elements/1.1/",
|
||||
"dcterms": "http://purl.org/dc/terms/",
|
||||
"xsi": "http://www.w3.org/2001/XMLSchema-instance"
|
||||
}
|
||||
|
||||
# Registrieren, damit Prefixe erhalten bleiben
|
||||
for prefix, uri in ns.items():
|
||||
ET.register_namespace(prefix, uri)
|
||||
|
||||
tree = ET.parse(core_xml_path)
|
||||
root = tree.getroot()
|
||||
|
||||
description_text = f"compressed by {app_name} {version}"
|
||||
|
||||
# Suche vorhandenes Element
|
||||
desc_elem = root.find("dc:description", ns)
|
||||
|
||||
if desc_elem is None:
|
||||
# neu anlegen
|
||||
desc_elem = ET.SubElement(
|
||||
root,
|
||||
f"{{{ns['dc']}}}description"
|
||||
)
|
||||
|
||||
# Text setzen/überschreiben
|
||||
desc_elem.text = description_text
|
||||
|
||||
# Datei speichern
|
||||
tree.write(core_xml_path, encoding="utf-8", xml_declaration=True)
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
svg-polish==1.0.0
|
||||
pytest==9.0.3
|
||||
pytest-cov==7.1.0
|
||||
@@ -0,0 +1 @@
|
||||
svg-polish==1.0.0
|
||||
@@ -0,0 +1,39 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions EnableDelayedExpansion
|
||||
|
||||
if "%~1"=="" goto help
|
||||
|
||||
set "INPUT=%~1"
|
||||
set "EXT=%~x1"
|
||||
set "PATH=%PATH%;%~dp0"
|
||||
|
||||
if /I not "%EXT%"==".pptx" (
|
||||
echo [ERROR] Only .pptx supported
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo [INFO] Compressing %~n1
|
||||
|
||||
rem optional: ensure correct working dir
|
||||
pushd "%~dp0"
|
||||
|
||||
"%~dp0pptx-image-compress.exe" -i "%INPUT%"
|
||||
set RC=%ERRORLEVEL%
|
||||
|
||||
popd
|
||||
|
||||
if %RC% neq 0 (
|
||||
echo [ERROR] Failed (%RC%)
|
||||
) else (
|
||||
echo [SUCCESS] Done
|
||||
)
|
||||
|
||||
pause
|
||||
exit /b %RC%
|
||||
|
||||
:help
|
||||
echo.
|
||||
echo Drag ^& Drop a .pptx file onto this script
|
||||
echo.
|
||||
pause
|
||||
@@ -0,0 +1,8 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions
|
||||
|
||||
if "%~1"=="" (
|
||||
"%~dp0pptx-image-compress.exe" -h
|
||||
) else (
|
||||
"%~dp0pptx-image-compress.exe" %*
|
||||
)
|
||||
+22
-25
@@ -155,15 +155,17 @@ class TestPptxImageCompress(unittest.TestCase):
|
||||
out.write_bytes(b"B" * 50)
|
||||
return out
|
||||
|
||||
result = pic.process_single_deck(
|
||||
input_pptx=input_pptx,
|
||||
output_pptx=output_pptx,
|
||||
threads=2,
|
||||
quality=90,
|
||||
min_savings="2%",
|
||||
compressor=fake_compressor,
|
||||
)
|
||||
with mock.patch("pptx_image_compress.update_core_description", create=True) as mocked_update_core_description:
|
||||
result = pic.process_single_deck(
|
||||
input_pptx=input_pptx,
|
||||
output_pptx=output_pptx,
|
||||
threads=2,
|
||||
quality=90,
|
||||
min_savings="2%",
|
||||
compressor=fake_compressor,
|
||||
)
|
||||
|
||||
mocked_update_core_description.assert_called_once_with(mock.ANY, "PPTX Image Compressor", pic.__version__)
|
||||
self.assertTrue(result.ok)
|
||||
self.assertEqual(result.error, None)
|
||||
self.assertTrue(output_pptx.exists())
|
||||
@@ -222,15 +224,17 @@ class TestPptxImageCompress(unittest.TestCase):
|
||||
out.write_bytes(b"B" * 700000)
|
||||
return out
|
||||
|
||||
result = pic.process_single_deck(
|
||||
input_pptx=input_pptx,
|
||||
output_pptx=output_pptx,
|
||||
threads=1,
|
||||
quality=90,
|
||||
min_savings="2%",
|
||||
compressor=fake_compressor,
|
||||
)
|
||||
with mock.patch("pptx_image_compress.update_core_description", create=True) as mocked_update_core_description:
|
||||
result = pic.process_single_deck(
|
||||
input_pptx=input_pptx,
|
||||
output_pptx=output_pptx,
|
||||
threads=1,
|
||||
quality=90,
|
||||
min_savings="2%",
|
||||
compressor=fake_compressor,
|
||||
)
|
||||
|
||||
mocked_update_core_description.assert_called_once_with(mock.ANY, "PPTX Image Compressor", pic.__version__)
|
||||
self.assertTrue(result.ok)
|
||||
with zipfile.ZipFile(output_pptx, "r") as z:
|
||||
self.assertIn("ppt/media/image1.jpg", z.namelist())
|
||||
@@ -314,13 +318,6 @@ class TestPptxImageCompress(unittest.TestCase):
|
||||
result = pic.optimize_svg_content_with_module(fake_module, svg)
|
||||
|
||||
self.assertEqual(result, "<svg/>")
|
||||
self.assertEqual(captured_options["digits"], 2)
|
||||
self.assertEqual(captured_options["indent_type"], "none")
|
||||
self.assertEqual(captured_options["newlines"], False)
|
||||
self.assertEqual(captured_options["strip_xml_prolog"], True)
|
||||
self.assertEqual(captured_options["strip_comments"], True)
|
||||
self.assertEqual(captured_options["strip_ids"], True)
|
||||
self.assertEqual(captured_options["renderer_workaround"], False)
|
||||
self.assertEqual(fake_module.optimize_path.call_count, 1)
|
||||
|
||||
def test_build_svg_polish_options_balanced_profile(self):
|
||||
@@ -336,8 +333,8 @@ class TestPptxImageCompress(unittest.TestCase):
|
||||
options = pic.build_svg_polish_options(fake_module, pic.SVG_PROFILE_BALANCED)
|
||||
|
||||
self.assertIsNotNone(options)
|
||||
self.assertEqual(captured_options["digits"], 3)
|
||||
self.assertEqual(captured_options["group_collapse"], True)
|
||||
self.assertEqual(captured_options["shorten_ids"], True)
|
||||
self.assertEqual(captured_options["enable_viewboxing"], True)
|
||||
self.assertNotIn("strip_ids", captured_options)
|
||||
|
||||
def test_compress_svg_with_svg_polish_returns_none_when_module_missing(self):
|
||||
|
||||
Reference in New Issue
Block a user