- minor cli fixes

- fixing x32 CLI build

Author: EchterAlsFake

.github/workflows/build_cli_linux.yml

@@ -50,56 +50,69 @@ jobs:
 
   build-pornfetch-cli-linux-32:
     runs-on: ubuntu-latest
+    env:
+      PY311_VERSION: "3.11.5"
+      PY32_PREFIX: "/opt/python-32"
+      LD_LIBRARY_PATH: "/opt/python-32/lib:/usr/lib/i386-linux-gnu"
+      CC: "gcc -m32"
+      CXX: "g++ -m32"
+      CFLAGS: "-m32"
+      LDFLAGS: "-m32"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install dependencies for building Python
+      - name: Enable i386 & install minimal 32-bit toolchain
         run: |
-          sudo apt-get update
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install -y build-essential gcc-multilib libffi-dev zlib1g-dev libbz2-dev libsqlite3-dev binutils-dev libsqlite3-dev libgdbm-dev libc6-dev libbz2-dev
-          sudo apt-get install -y libfl-dev zlib1g:i386 zlib1g-dev:i386 openssl libssl-dev libbz2-dev:i386 libgdbm-compat-dev:i386 libgdbm-dev:i386 libssl-dev:i386 libsqlite3-dev:i386 tk-dev:i386 libx11-dev:i386 libreadline-dev:i386 libffi-dev:i386 libncurses5-dev:i386 libncursesw5-dev:i386 liblzma-dev:i386 uuid-dev:i386
-
-      - name: Download and build Python 3.11 for x32
+          sudo apt-get install -y \
+            build-essential gcc-multilib make pkg-config wget xz-utils ca-certificates \
+            libffi-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libsqlite3-dev:i386 \
+            libgdbm-dev:i386 libgdbm-compat-dev:i386 libncurses5-dev:i386 libncursesw5-dev:i386 \
+            libreadline-dev:i386 libssl-dev:i386 liblzma-dev:i386 uuid-dev:i386 \
+            libcrypt-dev:i386
+
+      - name: Build Python ${{ env.PY311_VERSION }} (32-bit)
         run: |
-          wget https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tgz
-          tar -xzf Python-3.11.5.tgz
-          cd Python-3.11.5
-          CFLAGS="-m32" LDFLAGS="-m32" ./configure --prefix=/usr/local/python-32 --with-ensurepip=install --enable-shared
-          make -j $(nproc)
+          wget https://www.python.org/ftp/python/${PY311_VERSION}/Python-${PY311_VERSION}.tgz
+          tar -xzf Python-${PY311_VERSION}.tgz
+          cd Python-${PY311_VERSION}
+          ./configure --prefix="${PY32_PREFIX}" --with-ensurepip=install --enable-shared
+          make -j"$(nproc)"
           sudo make altinstall
-        env:
-          LD_LIBRARY_PATH: /usr/local/lib
+          echo "${PY32_PREFIX}/bin" >> "$GITHUB_PATH"
 
-      - name: Install Python packages
+      - name: Create 32-bit venv & install deps (no av)
+        shell: bash
         run: |
-          export LD_LIBRARY_PATH=/usr/local/python-32/lib:$LD_LIBRARY_PATH
-          /usr/local/python-32/bin/python3.11 -m venv venv
+          python3.11 -m venv venv
           source venv/bin/activate
-          pip install --upgrade pip
-          pip install pyinstaller
+          python -m pip install --upgrade pip wheel setuptools
+          # Build PyInstaller from source so its bootloader is compiled for i686
+          pip install --no-binary=:all: pyinstaller
           pip install -r requirements_cli.txt
 
-      - name: Build Porn Fetch (CLI) (PyInstaller - Termux)
+      - name: Build Porn Fetch (CLI) (PyInstaller - x32)
+        shell: bash
         run: |
-          export LD_LIBRARY_PATH=/usr/local/python-32/lib:$LD_LIBRARY_PATH
           source venv/bin/activate
-          pyinstaller -F Porn_Fetch_CLI.py && cd dist && mv Porn_Fetch_CLI PornFetch_Linux_CLI_x32 && chmod +x PornFetch_Linux_CLI_x32
-
-      - name: Generate SHA256 Checksum
-        run: |
-          sha256sum dist/PornFetch_Linux_CLI_x32 > dist/PornFetch_Linux_CLI_x32.sha256
-
-      - name: Publish SHA256 to GitHub Actions Summary
-        run: |
-          echo "### SHA256 Checksum for PornFetch_Linux_CLI_x32" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          cat dist/PornFetch_Linux_CLI_x32.sha256 >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-
-      - name: Archive Porn Fetch CLI (Linux_32) build
-        uses: actions/upload-artifact@v4
-        with:
-          name: PornFetch_Linux_CLI_x32
-          path: dist/PornFetch_Linux_CLI_x32
+          pyinstaller -F Porn_Fetch_CLI.py
+          cd dist && mv Porn_Fetch_CLI PornFetch_Linux_CLI_x32 && chmod +x PornFetch_Linux_CLI_x32
+
+          - name: Generate SHA256 Checksum
+            run: sha256sum dist/PornFetch_Linux_CLI_x32 > dist/PornFetch_Linux_CLI_x32.sha256
+
+          - name: Publish SHA256 to GitHub Actions Summary
+            run: |
+              {
+                echo "### SHA256 Checksum for PornFetch_Linux_CLI_x32";
+                echo '```';
+                cat dist/PornFetch_Linux_CLI_x32.sha256;
+                echo '```';
+              } >> "$GITHUB_STEP_SUMMARY"
+
+          - name: Archive Porn Fetch CLI (Linux_32) build
+            uses: actions/upload-artifact@v4
+            with:
+              name: PornFetch_Linux_CLI_x32
+              path: dist/PornFetch_Linux_CLI_x32

requirements_cli.txt

@@ -11,4 +11,5 @@ requests
 hue_shift
 markdown
 rich
-mutagen
+mutagen
+spankbang_api

src/backend/CLI_model_feature_addon.py

@@ -152,8 +152,7 @@ def show_help():
     """
     help_text = """
 Automatic Model Downloader:
-
-This feature tracks videos per model without immediate download.
+This feature tracks videos per model with download capabilities.
 
 Options:
 1) Show this help text.
@@ -168,8 +167,7 @@ def show_help():
 State file (`download_state.json`) stores for each model:
   - downloaded: list of URLs already downloaded
   - pending: list of URLs to download next
-
-After gathering pending URLs, you can separately process `state["models"][model_url]["pending"]` with your existing download code.
+  
 """
     print(help_text)