[pull] master from L4GSP1KE:master

.github/workflows/docker-image.yml

@@ -0,0 +1,57 @@
+name: Create and publish a Docker image
+
+on:
+  push:
+    branches: ['master']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Get lowercase repo name
+        id: get_lowercase_repo_name
+        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
+        run: |
+          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - 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 }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -3,6 +3,7 @@ data/config.py
 data/tags.json
 data/cookies/*.txt
 data/cookies/*.pkl
+data/cookies/*.pickle
 *.mkv
 .vscode/
 __pycache__/

Dockerfile

@@ -0,0 +1,19 @@
+FROM alpine:latest
+
+# add mono repo and mono
+RUN apk add --no-cache mono --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
+
+# install requirements
+RUN  apk add --no-cache --upgrade ffmpeg mediainfo python3 git py3-pip python3-dev g++ cargo mktorrent rust
+RUN pip3 install wheel
+
+WORKDIR Upload-Assistant
+
+# install reqs
+COPY requirements.txt .
+RUN pip3 install -r requirements.txt
+
+# copy everything
+COPY . .
+
+ENTRYPOINT ["python3", "/Upload-Assistant/upload.py"]

README.md

@@ -1,6 +1,6 @@
 # L4G's Upload Assistant
 
-A simple tool to take the work out of uploading. Now with a Discord Bot interface for people who don't like command line!
+A simple tool to take the work out of uploading.
 
 ## What It Can Do:
   - Generates and Parses MediaInfo/BDInfo.
@@ -13,7 +13,7 @@ A simple tool to take the work out of uploading. Now with a Discord Bot interfac
   - 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/TDB
+  - 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)
   - ALL WITH MINIMAL INPUT!
   - Currently works with .mkv/.mp4/Blu-ray/DVD/HD-DVDs
@@ -37,7 +37,6 @@ A simple tool to take the work out of uploading. Now with a Discord Bot interfac
    - Edit `config.py` to use your information (more detailed information in the [wiki](https://github.com/L4GSP1KE/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
-      - discord bot token can be obtained from https://discord.com/developers/
    - Install necessary python modules `pip3 install --user -U -r requirements.txt`
 
 
@@ -49,9 +48,11 @@ A simple tool to take the work out of uploading. Now with a Discord Bot interfac
 ## **Updating:**
   - To update first navigate into the Upload-Assistant directory: `cd Upload-Assistant`
   - Run a `git pull` to grab latest updates
-  - Run `pip3 install --user -U -r requirements.txt` to ensure dependencies are up to date
-  ## **CLI Usage:**
+  - Run `python3 -m pip install --user -U -r requirements.txt` to ensure dependencies are up to date
+## **CLI Usage:**
 
   `python3 upload.py /downloads/path/to/content --args`
 
-  Args are OPTIONAL, for a list of acceptable args, pass `--help`
+  Args are OPTIONAL, for a list of acceptable args, pass `--help`
+## **Docker Usage:**
+  Visit our wonderful [docker usage wiki page](https://github.com/L4GSP1KE/Upload-Assistant/wiki/Docker)

data/example-config.py

@@ -1,14 +1,22 @@
 config = {
     "DEFAULT" : {
+
+        # ------ READ THIS ------
+        # Any lines starting with the # symbol are commented and will not be used.
+        # If you change any of these options, remove the #
+        # -----------------------
+
         "tmdb_api" : "tmdb_api key",
         "imgbb_api" : "imgbb api key",
         "ptpimg_api" : "ptpimg api key",
+        "lensdump_api" : "lensdump api key",
 
         # Order of image hosts, and backup image hosts
         "img_host_1": "imgbb",
         "img_host_2": "ptpimg",
         "img_host_3": "imgbox",
-        # "img_host_4": "",
+	    "img_host_4": "pixhost",
+        "img_host_5": "lensdump",
 
 
         "screens" : "6",
@@ -17,29 +25,39 @@
 
 
         # The name of your default torrent client, set in the torrent client sections below
-        "default_torrent_client" : "Client1"
+        "default_torrent_client" : "Client1",
 
+        # Play the bell sound effect when asking for confirmation
+        "sfx_on_prompt" : True,
 
     },
 
     "TRACKERS" : {
         # Which trackers do you want to upload to?
-        "default_trackers" : "BLU, BHD, AITHER, STC, STT, SN, THR, R4E, HP, ACM, PTP, LCD, LST, TDB",
+        "default_trackers" : "BLU, BHD, AITHER, STC, STT, SN, THR, R4E, HP, ACM, PTP, LCD, LST, PTER, NBL, ANT, MTV",
 
         "BLU" : {
             "useAPI" : False, # Set to True if using BLU
             "api_key" : "BLU api key",
-            "announce_url" : "https://blutopia.xyz/announce/customannounceurl",
-            # "anon" : "False"
+            "announce_url" : "https://blutopia.cc/announce/customannounceurl",
+            # "anon" : False
         },
         "BHD" : {
             "api_key" : "BHD api key",
             "announce_url" : "https://beyond-hd.me/announce/customannounceurl",
             "draft_default" : "True",
+            # "anon" : False
+        },
+        "BHDTV": {
+            "api_key": "found under https://www.bit-hdtv.com/my.php",
+            "announce_url": "https://trackerr.bit-hdtv.com/announce",
+            #passkey found under https://www.bit-hdtv.com/my.php
+            "my_announce_url": "https://trackerr.bit-hdtv.com/passkey/announce",
             # "anon" : "False"
         },
         "PTP" : {
             "useAPI" : False, # Set to True if using PTP
+            "add_web_source_to_desc" : True,
             "ApiUser" : "ptp api user",
             "ApiKey" : 'ptp api key',
             "username" : "",
@@ -49,42 +67,49 @@
         "AITHER" :{
             "api_key" : "AITHER api key",
             "announce_url" : "https://aither.cc/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
         "R4E" :{
             "api_key" : "R4E api key",
             "announce_url" : "https://racing4everyone.eu/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
         "HUNO" : {
             "api_key" : "HUNO api key",
             "announce_url" : "https://hawke.uno/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
+        },
+        "MTV": {
+            'api_key' : 'get from security page',
+            'username' : '<USERNAME>',
+            'password' : '<PASSWORD>',
+            'announce_url' : "get from https://www.morethantv.me/upload.php",
+            'anon' : False,
+            # 'otp_uri' : 'OTP URI, read the following for more information https://github.com/google/google-authenticator/wiki/Key-Uri-Format'
         },
         "STC" :{
             "api_key" : "STC",
             "announce_url" : "https://skipthecommericals.xyz/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
         "STT" :{
             "api_key" : "STC",
             "announce_url" : "https://stt.xyz/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
         "SN": {
-            "PHPSESSID": "GET FROM DEV TOOLS ON YOUR BROWSER",
-            "swarmazon_remember": "GET FROM DEV TOOLS ON YOUR BROWSER",
+            "api_key": "6Z1tMrXzcYpIeSdGZueQWqb3BowlS6YuIoZLHe3dvIqkSfY0Ws5SHx78oGSTazG0jQ1agduSqe07FPPE8sdWTg",
             "announce_url": "https://tracker.swarmazon.club:8443/<YOUR_PASSKEY>/announce",
         },
         "HP" :{
             "api_key" : "HP",
             "announce_url" : "https://hidden-palace.net/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
         "ACM" :{
             "api_key" : "ACM api key",
             "announce_url" : "https://asiancinema.me/announce/customannounceurl",
-            # "anon" : "False",
+            # "anon" : False,
 
             # FOR INTERNAL USE ONLY:
             # "internal" : True,
@@ -94,6 +119,11 @@
             "api_key" : "NBL api key",
             "announce_url" : "https://nebulance.io/customannounceurl",
         },
+        "ANT" :{
+            "api_key" : "ANT api key",
+            "announce_url" : "https://anthelion.me/announce/customannounceurl",
+            # "anon" : False
+        },
         "THR" : {
             "username" : "username",
             "password" : "password",
@@ -102,30 +132,62 @@
             "pronfo_api_key" : "pronfo api key",
             "pronfo_theme" : "pronfo theme code",
             "pronfo_rapi_id" : "pronfo remote api id",
-            # "anon" : "False"
+            # "anon" : False
         },
         "LCD" : {
             "api_key" : "LCD api key",
-            "announce_url" : "https://locadora.xyz/announce/customannounceurl",
-            # "anon" : "False"
+            "announce_url" : "https://locadora.cc/announce/customannounceurl",
+            # "anon" : False
         },
         "LST" : {
             "api_key" : "LST api key",
             "announce_url" : "https://lst.gg/announce/customannounceurl",
-            # "anon" : "False"
+            # "anon" : False
         },
-
-	    "LT" : {
+        "LT" : {
             "api_key" : "LT api key",
             "announce_url" : "https://lat-team.com/announce/customannounceurl",
+            # "anon" : False
+        },
+        "PTER" : {
+            "passkey":'passkey',
+            "img_rehost" : False,
+            "username" : "",
+            "password" : "",
+            "ptgen_api": "",
+            "anon": True,
+        },
+        "TL": {
+            "announce_key": "TL announce key",
+        },
+        "TDC" :{
+            "api_key" : "TDC api key",
+            "announce_url" : "https://thedarkcommunity.cc/announce/customannounceurl",
             # "anon" : "False"
         },
-	    "TDB" : {
-            "passkey" : "TDB api key",
-            "announce_url" : "https://torrentdb.net/announce/customannounceurl",
+        "HDT" : {
+            "username" : "username",
+            "password" : "password",
+            "my_announce_url": "https://hdts-announce.ru/announce.php?pid=<PASS_KEY/PID>",
             # "anon" : "False"
+            "announce_url" : "https://hdts-announce.ru/announce.php", #DO NOT EDIT THIS LINE
+        },
+        "OE" : {
+            "api_key" : "OE api key",
+            "announce_url" : "https://onlyencodes.cc/announce/customannounceurl",
+            # "anon" : False
+        },
+        "RTF": {
+            "api_key": 'get_it_by_running_/api/ login command from https://retroflix.club/api/doc',
+            "announce_url": "get from upload page",
+            # "tag": "RetroFlix, nd",
+            "anon": True
+        },
+        "RF" : {
+            "api_key" : "RF api key",
+            "announce_url" : "https://reelflix.xyz/announce/customannounceurl",
+            # "anon" : False
         },
-
         "MANUAL" : {
             # Uncomment and replace link with filebrowser (https://github.com/filebrowser/filebrowser) link to the Upload-Assistant directory, this will link to your filebrowser instead of uploading to uguu.se
             # "filebrowser" : "https://domain.tld/filebrowser/files/Upload-Assistant/"
@@ -153,18 +215,33 @@
             "qbit_port" : "8080",
             "qbit_user" : "username",
             "qbit_pass" : "password",
-            # "qbit_tag" : "tag",
             # "torrent_storage_dir" : "path/to/BT_backup folder"
+            # "qbit_tag" : "tag",
+            # "qbit_cat" : "category"
 
+            # Content Layout for adding .torrents: "Original"(recommended)/"Subfolder"/"NoSubfolder"
+            "content_layout" : "Original"
+
+            # Enable automatic torrent management if listed path(s) are present in the path
+                # If using remote path mapping, use remote path
+                # For using multiple paths, use a list ["path1", "path2"] 
+            # "automatic_management_paths" : ""
+
+
+
             # Remote path mapping (docker/etc.) CASE SENSITIVE
             # "local_path" : "E:\\downloads\\tv",
             # "remote_path" : "/remote/downloads/tv"
+
+            # Set to False to skip verify certificate for HTTPS connections; for instance, if the connection is using a self-signed certificate.
+            # "VERIFY_WEBUI_CERTIFICATE" : True
         },
 
         "rtorrent_sample" : {
             "torrent_client" : "rtorrent",
             "rtorrent_url" : "https://user:password@server.host.tld:443/username/rutorrent/plugins/httprpc/action.php",
-            # "torrent_storage_dir" : "path/to/session folder"
+            # "torrent_storage_dir" : "path/to/session folder",
+            # "rtorrent_label" : "Add this label to all uploads"
 
             # Remote path mapping (docker/etc.) CASE SENSITIVE
             # "local_path" : "/LocalPath",
@@ -177,6 +254,7 @@
             "deluge_port" : "8080",
             "deluge_user" : "username",
             "deluge_pass" : "password",
+            # "torrent_storage_dir" : "path/to/session folder",
 
             # Remote path mapping (docker/etc.) CASE SENSITIVE
             # "local_path" : "/LocalPath",
@@ -220,3 +298,4 @@
         }
     }
 }
+