Merge branch 'development'

data/example-config.py

@@ -86,6 +86,11 @@
         # Needs a 5 second wait to ensure the API is updated
         "get_permalink": False,
 
+        # How many trackers need to pass successfull checking to continue with the upload process
+        # Default = 1. If 1 (or more) tracker/s pass banned_group and dupe checking, uploading will continue
+        # If less than the number of trackers pass the checking, exit immediately.
+        "tracker_pass_checks": "1",
+
     },
 
     "TRACKERS": {

src/args.py

@@ -49,6 +49,7 @@ def parse(self, args, meta):
         parser.add_argument('--no-tag', dest='no_tag', action='store_true', required=False, help="Remove Group Tag from title")
         parser.add_argument('--no-edition', dest='no_edition', action='store_true', required=False, help="Remove Edition from title")
         parser.add_argument('--dual-audio', dest='dual_audio', action='store_true', required=False, help="Add Dual-Audio to the title")
+        parser.add_argument('-ol', '--original-language', dest='manual_language', nargs='*', required=False, help="Set original audio language")
         parser.add_argument('-ns', '--no-seed', action='store_true', required=False, help="Do not add torrent to the client")
         parser.add_argument('-year', '--year', dest='manual_year', nargs='?', required=False, help="Override the year found", type=int, default=0)
         parser.add_argument('-ptp', '--ptp', nargs='*', required=False, help="PTP torrent id/permalink", type=str)

src/trackers/ACM.py

@@ -269,7 +269,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on ACM...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdb': meta['tmdb'],

src/trackers/AITHER.py

@@ -227,7 +227,7 @@ async def get_res_id(self, resolution):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on Aither...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/AL.py

@@ -162,7 +162,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on AL...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/ANT.py

@@ -147,7 +147,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "ANT"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on ANT...")
         params = {
             'apikey': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             't': 'search',

src/trackers/BHD.py

@@ -410,7 +410,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "BHD"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on BHD...")
         category = meta['category']
         if category == 'MOVIE':
             tmdbID = "movie"

src/trackers/BLU.py

@@ -208,7 +208,7 @@ async def derived_dv_layer(self, meta):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on BLU...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/FNP.py

@@ -154,7 +154,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on FNP...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/HDB.py

@@ -320,7 +320,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on HDB...")
         url = "https://hdbits.org/api/torrents"
         data = {
             'username': self.username,

src/trackers/HP.py

@@ -143,7 +143,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on HP...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/HUNO.py

@@ -297,7 +297,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "HUNO"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on HUNO...")
 
         params = {
             'api_token': self.config['TRACKERS']['HUNO']['api_key'].strip(),

src/trackers/JPTV.py

@@ -150,7 +150,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on JPTV...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdb': meta['tmdb'],

src/trackers/LST.py

@@ -199,7 +199,7 @@ async def get_flag(self, meta, flag_name):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on LST...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/MTV.py

@@ -652,7 +652,7 @@ async def login(self, cookiefile):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on MTV...")
         params = {
             't': 'search',
             'apikey': self.config['TRACKERS'][self.tracker]['api_key'].strip(),

src/trackers/NBL.py

@@ -85,7 +85,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "NBL"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on NBL...")
         if int(meta.get('tvmaze_id', 0)) != 0:
             search_term = {'tvmaze': int(meta['tvmaze_id'])}
         elif int(meta.get('imdb_id', '0').replace('tt', '')) == 0:

src/trackers/OE.py

@@ -279,7 +279,6 @@ def process_languages(tracks):
                 else:
                     console.print("[red]No media information available in meta.[/red]")
 
-            # Existing disc metadata handling
             bbcode = BBCODE()
             if meta.get('discs', []) != []:
                 discs = meta['discs']
@@ -322,7 +321,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "OE"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on OE...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/OTW.py

@@ -154,7 +154,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on OTW...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/PSS.py

@@ -156,7 +156,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on PSS...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/R4E.py

@@ -150,7 +150,7 @@ async def is_docu(self, genres):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on R4E...")
         url = "https://racing4everyone.eu/api/torrents/filter"
         params = {
             'api_token': self.config['TRACKERS']['R4E']['api_key'].strip(),

src/trackers/RF.py

@@ -172,7 +172,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "RF"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on RF...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/RTF.py

@@ -100,7 +100,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "RTF"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on RTF...")
         headers = {
             'accept': 'application/json',
             'Authorization': self.config['TRACKERS'][self.tracker]['api_key'].strip(),

src/trackers/SHRI.py

@@ -154,7 +154,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on SHRI...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/SN.py

@@ -123,7 +123,7 @@ async def edit_desc(self, meta):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on SN...")
 
         params = {
             'api_key': self.config['TRACKERS'][self.tracker]['api_key'].strip()

src/trackers/SPD.py

@@ -125,7 +125,7 @@ async def get_cat_id(self, category_name):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on SPD...")
         headers = {
             'accept': 'application/json',
             'Authorization': self.config['TRACKERS'][self.tracker]['api_key'].strip(),

src/trackers/STC.py

@@ -170,7 +170,7 @@ async def get_res_id(self, resolution):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on STC...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/STT.py

@@ -148,7 +148,7 @@ async def get_res_id(self, resolution):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on STT...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/TIK.py

@@ -569,7 +569,7 @@ def country_code_to_name(self, code):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on TIK...")
         disctype = meta.get('disctype', None)
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),

src/trackers/TVC.py

@@ -292,7 +292,7 @@ async def search_existing(self, meta, disctype):
         # https://tvchaosuk.com/api/torrents/filter?api_token=<API_key>&tmdb=138108
 
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on TVC...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdb': meta['tmdb'],

src/trackers/ULCX.py

@@ -159,7 +159,7 @@ async def search_existing(self, meta, disctype):
             meta['skipping'] = "ULCX"
             return
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on ULCX...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/UTP.py

@@ -151,7 +151,7 @@ async def get_res_id(self, resolution):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on UTP...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],

src/trackers/YOINK.py

@@ -154,7 +154,7 @@ async def upload(self, meta, disctype):
 
     async def search_existing(self, meta, disctype):
         dupes = []
-        console.print("[yellow]Searching for existing torrents on site...")
+        console.print("[yellow]Searching for existing torrents on YOINK...")
         params = {
             'api_token': self.config['TRACKERS'][self.tracker]['api_key'].strip(),
             'tmdbId': meta['tmdb'],