Merge rewrite into main by overwriting files

.env-sample

@@ -1,31 +1,35 @@
-ADDON_ID=stremio.comet.fast # for Stremio
-ADDON_NAME=Comet # for Stremio
-FASTAPI_HOST=0.0.0.0
-FASTAPI_PORT=8000
-FASTAPI_WORKERS=1 # remove to destroy CPU -> max performances :)
-DASHBOARD_ADMIN_PASSWORD=CHANGE_ME # The password to access the dashboard with active connections and soon more...
-DATABASE_TYPE=sqlite # or postgresql if you know what you're doing
-DATABASE_URL=username:password@hostname:port # to connect to PostgreSQL
-DATABASE_PATH=data/comet.db # only change it if you know what it is - folders in path must exist - ignored if PostgreSQL used
-CACHE_TTL=86400 # cache duration in seconds
-DEBRID_PROXY_URL=http://127.0.0.1:1080 # https://github.com/cmj2002/warp-docker to bypass Debrid Services and Torrentio server IP blacklist 
-INDEXER_MANAGER_TYPE=None # jackett or prowlarr or None if you want to disable it completely and use Zilean or Torrentio
-INDEXER_MANAGER_URL=http://127.0.0.1:9117
-INDEXER_MANAGER_API_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-INDEXER_MANAGER_TIMEOUT=60 # maximum time to obtain search results from indexer manager in seconds
-INDEXER_MANAGER_INDEXERS='["EXAMPLE1_CHANGETHIS", "EXAMPLE2_CHANGETHIS"]' # for jackett, get the names from https://github.com/Jackett/Jackett/tree/master/src/Jackett.Common/Definitions - for prowlarr you can write them like on the web dashboard
-GET_TORRENT_TIMEOUT=5 # maximum time to obtain the torrent info hash in seconds
-ZILEAN_URL=None # for DMM search - https://github.com/iPromKnight/zilean - ex: http://127.0.0.1:8181
-ZILEAN_TAKE_FIRST=500 # only change it if you know what it is
-SCRAPE_TORRENTIO=False # scrape Torrentio
-SCRAPE_MEDIAFUSION=False # scrape MediaFusion - has better results for Indian content
-MEDIAFUSION_URL=https://mediafusion.elfhosted.com # Allows you to scrape custom instances of MediaFusion
-PROXY_DEBRID_STREAM=False # Proxy Debrid Streams (very useful to use your debrid service on multiple IPs at same time)
-PROXY_DEBRID_STREAM_PASSWORD=CHANGE_ME # Secret password to enter on configuration page to prevent people from abusing your debrid stream proxy
-PROXY_DEBRID_STREAM_MAX_CONNECTIONS=-1 # IP-Based connection limit for the Debrid Stream Proxy (-1 = disabled)
-PROXY_DEBRID_STREAM_DEBRID_DEFAULT_SERVICE=realdebrid # if you want your users who use the Debrid Stream Proxy not to have to specify Debrid information, but to use the default one instead
-PROXY_DEBRID_STREAM_DEBRID_DEFAULT_APIKEY=CHANGE_ME # if you want your users who use the Debrid Stream Proxy not to have to specify Debrid information, but to use the default one instead
-TITLE_MATCH_CHECK=True # disable if you only use Torrentio / MediaFusion and are sure you're only scraping good titles, for example (keep it True if Zilean is enabled)
-REMOVE_ADULT_CONTENT=False # detect and remove adult content
-STREMTHRU_DEFAULT_URL=None # if you want your users to use StremThru without having to specify it
-CUSTOM_HEADER_HTML=None # only set it if you know what it is
+ADDON_ID=stremio.comet.fast # for Stremio
+ADDON_NAME=Comet # for Stremio
+FASTAPI_HOST=0.0.0.0
+FASTAPI_PORT=8000
+FASTAPI_WORKERS=1
+USE_GUNICORN=True # will use uvicorn if False or if on Windows
+DASHBOARD_ADMIN_PASSWORD=CHANGE_ME # The password to access the dashboard with active connections and soon more...
+DATABASE_TYPE=sqlite # or postgresql if you're making a Comet cluster
+DATABASE_URL=username:password@hostname:port # to connect to PostgreSQL
+DATABASE_PATH=data/comet.db # only change it if you know what it is - folders in path must exist - ignored if PostgreSQL used
+METADATA_CACHE_TTL=2592000 # metadata cache duration in seconds (30 days by default)
+TORRENT_CACHE_TTL=1296000 # torrent cache duration in seconds (15 days by default)
+DEBRID_CACHE_TTL=86400 # debrid availability cache duration in seconds (1 day by default)
+DEBRID_PROXY_URL=http://127.0.0.1:1080 # https://github.com/cmj2002/warp-docker to bypass Debrid Services and Torrentio server IP blacklist 
+INDEXER_MANAGER_TYPE=none # jackett or prowlarr or none if you want to disable it completely and use Zilean or Torrentio
+INDEXER_MANAGER_URL=http://127.0.0.1:9117
+INDEXER_MANAGER_API_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+INDEXER_MANAGER_TIMEOUT=60 # maximum time to obtain search results from indexer manager in seconds
+INDEXER_MANAGER_INDEXERS='["EXAMPLE1_CHANGETHIS", "EXAMPLE2_CHANGETHIS"]' # for jackett, get the names from https://github.com/Jackett/Jackett/tree/master/src/Jackett.Common/Definitions - for prowlarr you can write them like on the web dashboard
+GET_TORRENT_TIMEOUT=5 # maximum time to obtain the torrent info hash in seconds
+DOWNLOAD_TORRENT_FILES=False # set to True to enable torrent file retrieval instead of using only magnet link info (infohash and sources, ensuring file index is included in results for Jackett and Prowlarr torrents)
+SCRAPE_ZILEAN=False # scrape Zilean/DMM
+ZILEAN_URL=https://zilean.elfhosted.com # for DMM search - https://github.com/iPromKnight/zilean - ex: http://127.0.0.1:8181
+SCRAPE_TORRENTIO=False # scrape Torrentio
+TORRENTIO_URL=https://torrentio.strem.fun # or https://knightcrawler.elfhosted.com if you prefer to scrape the ElfHosted KnightCrawler instance
+SCRAPE_MEDIAFUSION=False # scrape MediaFusion - has better results for Indian content
+MEDIAFUSION_URL=https://mediafusion.elfhosted.com # Allows you to scrape custom instances of MediaFusion
+PROXY_DEBRID_STREAM=False # Proxy Debrid Streams (very useful to use your debrid service on multiple IPs at same time)
+PROXY_DEBRID_STREAM_PASSWORD=CHANGE_ME # Secret password to enter on configuration page to prevent people from abusing your debrid stream proxy
+PROXY_DEBRID_STREAM_MAX_CONNECTIONS=-1 # IP-Based connection limit for the Debrid Stream Proxy (-1 = disabled)
+PROXY_DEBRID_STREAM_DEBRID_DEFAULT_SERVICE=realdebrid # if you want your users who use the Debrid Stream Proxy not to have to specify Debrid information, but to use the default one instead
+PROXY_DEBRID_STREAM_DEBRID_DEFAULT_APIKEY=CHANGE_ME # if you want your users who use the Debrid Stream Proxy not to have to specify Debrid information, but to use the default one instead
+REMOVE_ADULT_CONTENT=False # detect and remove adult content
+CUSTOM_HEADER_HTML=None # only set it if you know what it is
+STREMTHRU_URL=https://stremthru.13377001.xyz # StremThru acts as a proxy between Comet and debrid services to support them all, so you must have it

.github/workflows/docker-build-push.yml

@@ -4,8 +4,7 @@ on:
   push:
     branches:
       - main
-#  release:
-#    types: [created]
+      - rewrite
   workflow_dispatch:
 
 jobs:
@@ -42,6 +41,19 @@ jobs:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
+    - name: Get branch name
+      id: branch-name
+      run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+
+    - name: Set Docker tags
+      id: docker_tags
+      run: |
+        if [ "${{ steps.branch-name.outputs.branch }}" = "main" ]; then
+          echo "tags=ghcr.io/g0ldyy/comet:latest,docker.io/g0ldyy/comet:latest" >> $GITHUB_OUTPUT
+        else
+          echo "tags=ghcr.io/g0ldyy/comet:${{ steps.branch-name.outputs.branch }},docker.io/g0ldyy/comet:${{ steps.branch-name.outputs.branch }}" >> $GITHUB_OUTPUT
+        fi
+
     - name: Build and push Docker image
       uses: docker/[email protected]
       with:
@@ -51,6 +63,4 @@ jobs:
         push: true
         cache-from: type=gha
         cache-to: type=gha,mode=max
-        tags: |
-          ghcr.io/g0ldyy/comet:latest
-          docker.io/g0ldyy/comet:latest
+        tags: ${{ steps.docker_tags.outputs.tags }}