(Update) - banned release groups and compile some existing PR's

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 6000

.github/workflows/.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 6000

.github/workflows/docker-image.yml

@@ -1,8 +1,10 @@
-name: Create and publish a Docker image
+name: Create and publish Docker images
 
 on:
-  push:
-    branches: ['master']
+  release:
+    types:
+      - published
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
@@ -40,18 +42,31 @@ jobs:
         run: |
           REPO_NAME=${{ env.IMAGE_NAME }} 
           echo "LOWER_CASE_REPO_NAME=${REPO_NAME,,}" >> $GITHUB_ENV
-          
-      - name: Get short commit id
-        id: get_short_commit_id
+
+      - name: Get release version or branch name
+        id: get_version_or_branch
         run: |
-          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
+          if [ "${{ github.event_name }}" == "release" ]; then
+            RELEASE_VERSION=${{ github.event.release.tag_name }}
+            if [ -z "$RELEASE_VERSION" ]; then
+              echo "RELEASE_VERSION is empty. Please ensure a release tag is provided."
+              exit 1
+            fi
+            echo "VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            BRANCH_NAME=${{ github.ref_name }}
+            echo "VERSION=${BRANCH_NAME}" >> $GITHUB_ENV
+          else
+            echo "Unsupported event: ${{ github.event_name }}"
+            exit 1
+          fi
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.SHA_SHORT }}
+          tags: ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}, ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

.github/workflows/lint.yml

@@ -0,0 +1,33 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - master
+      - develop
+  workflow_dispatch:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8
+
+    - name: Run linter
+      run: flake8 .

.gitignore

@@ -4,8 +4,10 @@ data/tags.json
 data/cookies/*.txt
 data/cookies/*.pkl
 data/cookies/*.pickle
+data/banned/*.*
 *.mkv
 .vscode/
 __pycache__/
 tmp/*
-.wdm/
+.wdm/
+.DS_Store

Dockerfile

@@ -1,19 +1,35 @@
-FROM alpine:latest
+FROM python:3.12
 
-# add mono repo and mono
-RUN apk add --no-cache mono --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
+# Update the package list and install system dependencies including mono
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ffmpeg \
+    mediainfo=23.04-1 \
+    git \
+    g++ \
+    cargo \
+    mktorrent \
+    rustc \
+    mono-complete \
+    nano && \
+    rm -rf /var/lib/apt/lists/*
 
-# install requirements
-RUN  apk add --no-cache --upgrade ffmpeg mediainfo python3 git py3-pip python3-dev g++ cargo mktorrent rust
-RUN pip3 install wheel
+# Set up a virtual environment to isolate our Python dependencies
+RUN python -m venv /venv
+ENV PATH="/venv/bin:$PATH"
 
-WORKDIR Upload-Assistant
+# Install wheel and other Python dependencies
+RUN pip install --upgrade pip wheel
 
-# install reqs
+# Set the working directory in the container
+WORKDIR /Upload-Assistant
+
+# Copy the Python requirements file and install Python dependencies
 COPY requirements.txt .
-RUN pip3 install -r requirements.txt
+RUN pip install -r requirements.txt
 
-# copy everything
+# Copy the rest of the application's code
 COPY . .
 
-ENTRYPOINT ["python3", "/Upload-Assistant/upload.py"]
+# Set the entry point for the container
+ENTRYPOINT ["python", "/Upload-Assistant/upload.py"]

README.md

@@ -1,58 +1,67 @@
-# L4G's Upload Assistant
+[![Create and publish a Docker image](https://github.com/Audionut/Upload-Assistant/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/Audionut/Upload-Assistant/actions/workflows/docker-image.yml)
+
+Discord support https://discord.gg/QHHAZu7e2A
+
+# Audionut's Upload Assistant
 
 A simple tool to take the work out of uploading.
 
+This project is a fork of the original work of L4G https://github.com/L4GSP1KE/Upload-Assistant
+Immense thanks to him for establishing this project. Without his (and supporters) time and effort, this fork would not be a thing.
+What started as simply pushing some pull requests to keep the main repo inline, as L4G seemed busy with IRL, has since snowballed into full time development, bugs and all.
+
+Many other forks exist, most are simply a rebranding of this fork without any credit whatsoever.
+Better just to be on this fork and bug me about my bugs, rather than bugging someone who can ctrl+c/ctrl+v, but likely can't fix the bugs.
+
 ## What It Can Do:
   - Generates and Parses MediaInfo/BDInfo.
   - Generates and Uploads screenshots.
-  - Uses srrdb to fix scene filenames
-  - Can grab descriptions from PTP (automatically on filename match or arg) / BLU (arg)
+  - Uses srrdb to fix scene filenames.
+  - Can grab descriptions from PTP/BLU/Aither/LST/OE (with config option automatically on filename match, or using arg).
+  - Can strip existing screenshots from descriptions to skip screenshot generation and uploading.
   - Obtains TMDb/IMDb/MAL identifiers.
-  - Converts absolute to season episode numbering for Anime
+  - Converts absolute to season episode numbering for Anime.
   - Generates custom .torrents without useless top level folders/nfos.
-  - Can re-use existing torrents instead of hashing new
-  - Generates proper name for your upload using Mediainfo/BDInfo and TMDb/IMDb conforming to site rules
-  - Checks for existing releases already on site
-  - Uploads to PTP/BLU/BHD/Aither/THR/STC/R4E(limited)/STT/HP/ACM/LCD/LST/NBL/ANT/FL/HUNO/RF/SN
-  - Adds to your client with fast resume, seeding instantly (rtorrent/qbittorrent/deluge/watch folder)
+  - Can re-use existing torrents instead of hashing new.
+  - Generates proper name for your upload using Mediainfo/BDInfo and TMDb/IMDb conforming to site rules.
+  - Checks for existing releases already on site.
+  - Uploads to ACM/Aither/AL/ANT/AR/BHD/BHDTV/BLU/CBR/FRIKI/FNP/FL/HDB/HDT/HHD/HP/HUNO/JPTV/LCD/LST/LT/MTV/NBL/OE/OTW/PSS/PTP/PTER/PTT/RF/R4E(limited)/RTF/SHRI/SN/SP/SPD/STC/STT/TLC/THR/TL/TVC/TTG/ULCX/UTP/YOINK
+  - Adds to your client with fast resume, seeding instantly (rtorrent/qbittorrent/deluge/watch folder).
   - ALL WITH MINIMAL INPUT!
-  - Currently works with .mkv/.mp4/Blu-ray/DVD/HD-DVDs
-
-
+  - Currently works with .mkv/.mp4/Blu-ray/DVD/HD-DVDs.
 
-## Coming Soon:
-  - Features
-
-
-
+Built with updated BDInfoCLI from https://github.com/rokibhasansagar/BDInfoCLI-ng
 
 ## **Setup:**
-   - **REQUIRES AT LEAST PYTHON 3.7 AND PIP3**
+   - **REQUIRES AT LEAST PYTHON 3.8 AND PIP3**
    - Needs [mono](https://www.mono-project.com/) on linux systems for BDInfo
    - Also needs MediaInfo and ffmpeg installed on your system
       - On Windows systems, ffmpeg must be added to PATH (https://windowsloop.com/install-ffmpeg-windows-10/)
       - On linux systems, get it from your favorite package manager
-   - Clone the repo to your system `git clone https://github.com/L4GSP1KE/Upload-Assistant.git`
+   - Clone the repo to your system `git clone https://github.com/Audionut/Upload-Assistant.git` - or download a zip of the source
    - Copy and Rename `data/example-config.py` to `data/config.py`
-   - Edit `config.py` to use your information (more detailed information in the [wiki](https://github.com/L4GSP1KE/Upload-Assistant/wiki))
+   - Edit `config.py` to use your information (more detailed information in the [wiki](https://github.com/Audionut/Upload-Assistant/wiki))
       - tmdb_api (v3) key can be obtained from https://developers.themoviedb.org/3/getting-started/introduction
       - image host api keys can be obtained from their respective sites
    - Install necessary python modules `pip3 install --user -U -r requirements.txt`
 
 
-
-   **Additional Resources are found in the [wiki](https://github.com/L4GSP1KE/Upload-Assistant/wiki)**
+   **Additional Resources are found in the [wiki](https://github.com/Audionut/Upload-Assistant/wiki)**
 
    Feel free to contact me if you need help, I'm not that hard to find.
 
 ## **Updating:**
   - To update first navigate into the Upload-Assistant directory: `cd Upload-Assistant`
   - Run a `git pull` to grab latest updates
   - Run `python3 -m pip install --user -U -r requirements.txt` to ensure dependencies are up to date
+  - Or download a fresh zip and overwrite existing files
+
 ## **CLI Usage:**
 
-  `python3 upload.py /downloads/path/to/content --args`
+  `python3 upload.py "/downloads/path/to/content" --args`
 
-  Args are OPTIONAL, for a list of acceptable args, pass `--help`
+  Args are OPTIONAL and ALWAYS follow path, for a list of acceptable args, pass `--help`.
+  Path should be in quotes.
+
 ## **Docker Usage:**
-  Visit our wonderful [docker usage wiki page](https://github.com/L4GSP1KE/Upload-Assistant/wiki/Docker)
+  Visit our wonderful [docker usage wiki page](https://github.com/Audionut/Upload-Assistant/wiki/Docker)