prep version 1.2.0

.gitignore

@@ -4,3 +4,5 @@ python-embed/*
 logs/*.log
 __pycache__/*
 .coverage
+build/*
+dist/*

README.md

@@ -1,6 +1,5 @@
-
-# PPTX Image Compressor (CaesiumCLT only)
-**Version 1.1.9**
+# PPTX Image Compressor (CaesiumCLT + svg-polish)
+**Version 1.2.0**
 
 Dieses Paket enthält:
 
@@ -40,9 +39,9 @@ Zusätzlich wird **pip** installiert, damit das **svg-polish** Modul installiert
 - 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.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.2.0
+- Möglichkeit mit build.bat eine pptx-image-compressor.exe zu erstellen
+- Fixes für install_and_run.bat in venv / "raw" environments
 
 ## 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

build.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

check_new_version.bat

@@ -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

check_new_version.ini

@@ -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
 

check_new_version.py

@@ -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']} "

install_and_run.bat

@@ -4,7 +4,7 @@ setlocal EnableExtensions EnableDelayedExpansion
 
 rem ============================================
 rem  PPTX Image Compressor - Installer/Runner (Batch-enabled)
-rem  Fix: caesiumclt.exe aus [ROOT]\bin; Python-Discovery ohne MS Store Alias
+rem  Version 1.2.0
 rem ============================================
 
 set "APP_NAME=PPTX Image Compressor"
@@ -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.

install_and_run.md

@@ -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
+```

pptx_image_compress.py

@@ -42,7 +42,7 @@ from typing import Callable, List, Optional
 
 
 
-__version__ = "1.1.9"
+__version__ = "1.2.0"
 
 RASTER_EXT = {".jpg", ".jpeg", ".png", ".webp", ".gif"}
 VECTOR_EXT = {".svg"}
@@ -829,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')

requirements-dev.txt

@@ -0,0 +1,3 @@
+svg-polish==1.0.0
+pytest==9.0.3
+pytest-cov==7.1.0

requirements.txt

@@ -0,0 +1 @@
+svg-polish==1.0.0

templates/dragdrop.tpl.bat

@@ -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

templates/run.tpl.bat

@@ -0,0 +1,8 @@
+@echo off
+setlocal EnableExtensions
+
+if "%~1"=="" (
+    "%~dp0pptx-image-compress.exe" -h
+) else (
+    "%~dp0pptx-image-compress.exe" %*
+)