Added systemd service file and refactored main.py

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Unless more-specific rules are added, all PRs require @funkypenguin's approval ;)
+
+*       @funkypenguin

.gitignore

@@ -397,3 +397,6 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 settings.json
+
+venv*/
+.idea/

Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3
 
+RUN apt-get update && apt-get install -y vim less
+
 ADD . / ./
 
 RUN pip install -r requirements.txt

README.md

@@ -381,11 +381,11 @@ If github is not your cup of tea;
 ></details>
 >
 ><details>
->  <summary><b><u><img src="https://app.plex.tv/desktop/favicon.ico" height="16"> Plex lables:</u></b></summary>
+>  <summary><b><u><img src="https://app.plex.tv/desktop/favicon.ico" height="16"> Plex labels:</u></b></summary>
 >  
->  - To add automatic version and user lables to your downloaded content, navigate to '/Settings/Library Service/Library update service/Edit/'
+>  - To add automatic version and user labels to your downloaded content, navigate to '/Settings/Library Service/Library update service/Edit/'
 >  - This requires a Plex library refresh to be set up aswell (see above).
->  - Lables that will be added are: "From: ..." for each user that watchlisted this item, "Version: ..." for each version that was downloaded.
+>  - Labels that will be added are: "From: ..." for each user that watchlisted this item, "Version: ..." for each version that was downloaded.
 >
 ></details>
 >
@@ -492,6 +492,15 @@ If github is not your cup of tea;
 >  - You can find a full list of all possible parameters and their respective values at "https://panel.orionoid.com/" in the "Developers" menu, section "API Docs" under "Stream API".
 >
 ></details>
+>
+><details>
+>  <summary><b><u>zilean:</u></b></summary>
+>  
+>  - Zilean is a service that allows you to search for [DebridMediaManager](https://github.com/debridmediamanager/debrid-media-manager) sourced arr-less content.
+>  - You can integrate zilean into plex_debrid by navigating to '/Settings/Scraper/Sources/Edit/Add source/zilean'.
+>  - Details of this project can be found at https://github.com/iPromKnight/zilean
+>
+></details>
 
 ### :arrow_down_small: Debrid Services:
 

content/classes.py

@@ -570,17 +570,17 @@ def deviation(self, year=""):
                 if regex.search(str(self.year), releases.rename(self.title.replace(str(self.year), '') + ' ' + str(self.year))):
                     title = title.replace('.' + str(self.year), '')
                     if year != "":
-                        return '[^A-Za-z0-9]*(' + title + ':?.)\(?\[?(' + str(year) + ')'
-                    return '[^A-Za-z0-9]*(' + title + ':?.)\(?\[?(' + str(self.year) + '|' + str(self.year - 1) + '|' + str(self.year + 1) + ')'
+                        return '(.*?)(' + title + ':?.*)\(?\[?(' + str(year) + ')?'
+                    return '(.*?)(' + title + ':?.*)\(?\[?(' + str(self.year) + '|' + str(self.year - 1) + '|' + str(self.year + 1) + ')?'
                 else:
                     title = title.replace('.' + str(self.year), '')
-                    return '[^A-Za-z0-9]*(' + title + ')'
+                    return '(.*?)(' + title + ')'
             elif self.type == 'show':
                 title = title.replace('.' + str(self.year), '')
-                return '[^A-Za-z0-9]*(' + title + ':?.)(series.|[^A-Za-z0-9]+)?((\(?' + str(self.year) + '\)?.)|(complete.)|(seasons?.[0-9]+.[0-9]?[0-9]?.?)|(S[0-9]+.S?[0-9]?[0-9]?.?)|(S[0-9]+E[0-9]+))'
+                return '(.*?)(' + title + ':?.)(series.|[^A-Za-z0-9]+)?((\(?' + str(self.year) + '\)?.)|(complete.)|(seasons?.[0-9]+.[0-9]?[0-9]?.?)|(S[0-9]+.S?[0-9]?[0-9]?.?)|(S[0-9]+E[0-9]+))'
             elif self.type == 'season':
                 title = title.replace('.' + str(self.parentYear), '')
-                return '[^A-Za-z0-9]*(' + title + ':?.)(series.|[^A-Za-z0-9]+)?(\(?' + str(self.parentYear) + '\)?.)?(season.' + str(self.index) + '\.|season.' + str("{:02d}".format(self.index)) + '\.|S' + str("{:02d}".format(self.index)) + '\.)'
+                return '(.*?)(' + title + ':?.)(series.|[^A-Za-z0-9]+)?(\(?' + str(self.parentYear) + '\)?.)?(season.' + str(self.index) + '[^0-9]|season.' + str("{:02d}".format(self.index)) + '[^0-9]|S' + str("{:02d}".format(self.index)) + '[^0-9])'
             elif self.type == 'episode':
                 title = title.replace('.' + str(self.grandparentYear), '')
                 try:
@@ -594,9 +594,9 @@ def deviation(self, year=""):
                     airdate_formats += [airdate.strftime(
                         '(%m|%b).*%d.*(%Y|%y)').replace("0", "0?")]
                     airdate_formats = "(" + ")|(".join(airdate_formats) + ")"
-                    return '[^A-Za-z0-9]*(' + title + ':?.)(series.)?(\(?' + str(self.grandparentYear) + '\)?.)?(S' + str("{:02d}".format(self.parentIndex)) + 'E' + str("{:02d}".format(self.index)) + '.|'+airdate_formats+')'
+                    return '(.*?)(' + title + ':?.)(series.)?(\(?' + str(self.grandparentYear) + '\)?.)?(S' + str("{:02d}".format(self.parentIndex)) + 'E' + str("{:02d}".format(self.index)) + '.|'+airdate_formats+')'
                 except:
-                    return '[^A-Za-z0-9]*(' + title + ':?.)(series.)?(\(?' + str(self.grandparentYear) + '\)?.)?(S' + str("{:02d}".format(self.parentIndex)) + 'E' + str("{:02d}".format(self.index)) + '.)'
+                    return '(.*?)(' + title + ':?.)(series.)?(\(?' + str(self.grandparentYear) + '\)?.)?(S' + str("{:02d}".format(self.parentIndex)) + 'E' + str("{:02d}".format(self.index)) + '.)'
         else:
             if hasattr(self, 'alternate_titles'):
                 title = '(' + '|'.join(self.alternate_titles) + ')'
@@ -612,22 +612,22 @@ def deviation(self, year=""):
             title = title.replace('[', '\[').replace(']', '\]')
             if self.type == 'movie':
                 title = title.replace('.' + str(self.year), '')
-                return '(.*?)(' + title + '.)(.*?)(' + str(self.year) + '|' + str(self.year - 1) + '|' + str(self.year + 1) + ')'
+                return '(.*?)(' + title + ')(.*?)(' + str(self.year) + '|' + str(self.year - 1) + '|' + str(self.year + 1) + ')?'
             elif self.type == 'show':
                 title = title.replace('.' + str(self.year), '')
-                return '(.*?)(' + title + '.)(.*?)('+self.anime_count+'|(complete)|(seasons?[^0-9]?[0-9]+[^A-Z0-9]+S?[0-9]+)|(S[0-9]+[^A-Z0-9]+S?[0-9]+))'
+                return '(.*?)(' + title + ')(.*?)('+self.anime_count+'|(complete)|(seasons?[^0-9]?[0-9]+[^A-Z0-9]+S?[0-9]+)|(S[0-9]+[^A-Z0-9]+S?[0-9]+))'
             elif self.type == 'season':
                 n = self.index
                 roman = 'I' if n == 1 else 'II' if n == 2 else 'III' if n == 3 else 'IV' if n == 4 else 'V' if n == 5 else 'VI' if n == 6 else 'VII' if n == 7 else 'VIII' if n == 8 else 'IX' if n == 9 else 'X' if n == 10 else str(
                     n)
                 title = title.replace('.' + str(self.parentYear), '')
-                return '(.*?)(' + title + '.)(.*?)(season[^0-9]?0*' + str(self.index) + '|S0*' + str(self.index) + '(?!E?[0-9])|'+self.anime_count+'|[^A-Z0-9]'+roman+'[^A-Z0-9])'
+                return '(.*?)(' + title + ')(.*?)(season[^0-9]?0*' + str(self.index) + '|S0*' + str(self.index) + '(?!E?[0-9])|'+self.anime_count+'|[^A-Z0-9]'+roman+'[^A-Z0-9])'
             elif self.type == 'episode':
                 n = self.parentIndex
                 roman = 'I' if n == 1 else 'II' if n == 2 else 'III' if n == 3 else 'IV' if n == 4 else 'V' if n == 5 else 'VI' if n == 6 else 'VII' if n == 7 else 'VIII' if n == 8 else 'IX' if n == 9 else 'X' if n == 10 else str(
                     n)
                 title = title.replace('.' + str(self.grandparentYear), '')
-                return '(.*?)(' + title + '.)(.*?)((?<!part)[^0-9A-RT-Z\[]0*('+str(self.parentIndex)+'|'+roman+')[^0-9A-DF-Z\[]0*'+str(self.index)+'(?![A-Z0-9]|\])|(?<!part)[^0-9A-Z\[]0*'+self.anime_count+'(?![A-Z0-9]|\]))'
+                return '(.*?)(' + title + ')(.*?)((?<!part)[^0-9A-RT-Z\[]0*('+str(self.parentIndex)+'|'+roman+')[^0-9A-DF-Z\[]0*'+str(self.index)+'(?![A-Z0-9]|\])|(?<!part)[^0-9A-Z\[]0*'+self.anime_count+'(?![A-Z0-9]|\]))'
 
     def isanime(self):
         if 'anime' in self.genre():
@@ -926,17 +926,19 @@ def watch(self):
                         retries = int(float(trigger[2]))
         if retries == 0:
             return
+
+        message = 'retrying download in ' + str(
+            round(int(ui_settings.loop_interval_seconds) / 60)) + 'min for item: ' + self.query() + ' - version/s [' + '],['.join(
+            names) + ']'
         if not self in media.ignore_queue:
             self.ignored_count = 1
             media.ignore_queue += [self]
-            ui_print('retrying download in 30min for item: ' + self.query() + ' - version/s [' + '],['.join(
-                names) + '] - attempt ' + str(self.ignored_count) + '/' + str(retries))
+            ui_print(message + ' - attempt ' + str(self.ignored_count) + '/' + str(retries))
         else:
             match = next((x for x in media.ignore_queue if self == x), None)
             if match.ignored_count < retries:
                 match.ignored_count += 1
-                ui_print('retrying download in 30min for item: ' + self.query() + ' - version/s [' + '],['.join(
-                    names) + '] - attempt ' + str(match.ignored_count) + '/' + str(retries))
+                ui_print(message + ' - attempt ' + str(match.ignored_count) + '/' + str(retries))
             else:
                 media.ignore_queue.remove(match)
                 ignore.add(self)
@@ -949,6 +951,9 @@ def watched(self):
 
     def released(self):
         try:
+            if not hasattr(self, "originallyAvailableAt"):
+                return False  # attribute may not be present
+
             released = datetime.datetime.utcnow(
             ) - datetime.datetime.strptime(self.originallyAvailableAt, '%Y-%m-%d')
             if hasattr(self, "offset_airtime"):
@@ -1078,7 +1083,7 @@ def available(self):
     def collect(self, refresh_=True):
         for refresh_service in refresh():
             if refresh_service.__module__ == self.__module__ or (self.__module__ in ["content.services.trakt", "releases", "content.services.overseerr", "content.services.plex"] and refresh_service.__module__ in ["content.services.plex", "content.services.jellyfin"]):
-                if refresh_ or refresh_service.name == "Plex Lables":
+                if refresh_ or refresh_service.name == "Plex Labels":
                     refresh_service(self)
             elif self.__module__ in ["content.services.plex", "content.services.overseerr"] and refresh_service.__module__ == "content.services.trakt":
                 try:
@@ -1366,7 +1371,7 @@ def download(self, retries=0, library=[], parentReleases=[]):
             if len(self.Episodes) > 2:
                 if self.season_pack(scraped_releases):
                     debrid_downloaded, retry = self.debrid_download()
-                    # if scraper.traditional() or debrid_downloaded:
+                if scraper.traditional() or debrid_downloaded:
                     for episode in self.Episodes:
                         episode.skip_scraping = True
                 # If there was nothing downloaded, scrape specifically for this season
@@ -1400,6 +1405,7 @@ def download(self, retries=0, library=[], parentReleases=[]):
             if not debrid_downloaded:
                 for release in self.Releases[:]:
                     if not regex.match(self.deviation(), release.title, regex.I):
+                        ui_print("[download (show)] " + release.title + " does not match deviation " + self.deviation())
                         self.Releases.remove(release)
                 if self.season_pack(scraped_releases):
                     debrid_downloaded, retry = self.debrid_download()
@@ -1550,7 +1556,7 @@ def debrid_download(self, force=False):
     def files(self):
         files = []
         if self.type == 'movie':
-            files = ['(mkv|mp4)']
+            files = ['(mkv|mp4|avi)']
         elif self.type == 'show':
             for season in self.Seasons:
                 for episode in season.Episodes:

content/services/plex.py

@@ -30,8 +30,10 @@ def logerror(response):
 
 def get(url, timeout=60):
     try:
+        ui_print("[plex] Processing (get): " + url + " ...")
         response = session.get(url, headers=headers, timeout=timeout)
         logerror(response)
+        ui_print("done")
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
         return response
     except Exception as e:
@@ -40,8 +42,10 @@ def get(url, timeout=60):
 
 def post(url, data):
     try:
+        ui_print("[plex] Processing (post): " + url)
         response = session.post(url, data=data, headers=headers)
         logerror(response)
+        ui_print("[plex] (post) response: " + repr(response), debug=ui_settings.debug)
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
         return response
     except Exception as e:
@@ -128,6 +132,8 @@ def add(self, item, user):
         elif item.type == 'movie':
             self.data.append(movie(item.ratingKey))
 
+    # collect all new unique watchlisted items ACROSS ALL USERS by retrieving user watchlists and adding them to self.data
+    # (then remove any that are no longer in the watchlist which were added in previous runs)
     def update(self):
         update = False
         new_watchlist = []
@@ -172,6 +178,7 @@ def __init__(self, other):
         self.__dict__.update(other.__dict__)
         self.EID = setEID(self)
         self.Episodes = []
+        ui_print("[plex] Processing " + self.parentTitle + " " + self.title)
         token = users[0][1]
         if library.ignore.name in classes.ignore.active:
             for user in users:
@@ -529,7 +536,7 @@ def __new__(cls, element):
 
     class lable(classes.refresh):
 
-        name = 'Plex Lables'
+        name = 'Plex Labels'
 
         def setup(cls, new=False):
             ui_cls("Options/Settings/Library Services/Library update services")
@@ -586,7 +593,7 @@ def call(element):
                     retries += 1
                 library_item = next((x for x in current_library if element == x), None)
                 if library_item == None:
-                    ui_print('[plex] error: couldnt add lables - item: "' + element.query() + '" could not be found on server.')
+                    ui_print('[plex] error: couldnt add labels - item: "' + element.query() + '" could not be found on server.')
                     return
                 tags_string = ""
                 for tag in tags:
@@ -598,7 +605,7 @@ def call(element):
                 response = get(url)
                 library_item.__dict__.update(response.MediaContainer.Metadata[0].__dict__)
             except Exception as e:
-                ui_print("[plex] error: couldnt add lables! Turn on debug printing for more info.")
+                ui_print("[plex] error: couldnt add labels! Turn on debug printing for more info.")
                 ui_print(str(e), debug=ui_settings.debug)
 
         def __new__(cls, element):
@@ -632,12 +639,12 @@ def __new__(cls, element):
                 if len(tags) == 0:
                     return
                 element.post_tags = tags
-                ui_print('[plex] adding lables: "' + '","'.join(tags) + '" to item: "' + element.query() + '"')
+                ui_print('[plex] adding labels: "' + '","'.join(tags) + '" to item: "' + element.query() + '"')
                 results = [None]
                 t = Thread(target=multi_init, args=(library.lable.call, element, results, 0))
                 t.start()
             except Exception as e:
-                ui_print("[plex] error: couldnt add lables! Turn on debug printing for more info.")
+                ui_print("[plex] error: couldnt add labels! Turn on debug printing for more info.")
                 ui_print(str(e), debug=ui_settings.debug)
 
     class ignore(classes.ignore):
@@ -791,8 +798,8 @@ def __new__(self,silent=False):
                     types = ['1'] if Directory.type == "movie" else  ['2', '3', '4']
                     sections += [[Directory.key,types]]
                     names += [Directory.title]
-        except:
-            ui_print("[plex error]: couldnt reach local plex server at: " + library.url + " to determine library sections. Make sure the address is correct, the server is running, and youve set up at least one library.")
+        except Exception as e:
+            ui_print("[plex error]: couldnt reach local plex server at: " + library.url + " to determine library sections. Make sure the address is correct, the server is running, and youve set up at least one library. Error:" + e)
         if len(sections) == 0:
             return list_
         if not silent:
@@ -876,11 +883,12 @@ def __new__(self,silent=False):
                             episode.grandparentEID = item.EID
             except:
                 ui_print('done')
-                ui_print("[plex error]: found incorrectly matched library item : " + item.title + " - this item needs a metadata refresh (open plex webui, find item, open item menu, refresh metadata).")  
+                ui_print("[plex error]: found incorrectly matched library item : " + item.title + " - this item needs a metadata refresh (open plex webui, find item, open item menu, refresh metadata).")
         ui_print('done')
         current_library = copy.deepcopy(list_)
         if first_load and updated:
-            store.save(current_library,"plex","metadata")       
+            ui_print('[plex] saving library cache.')
+            store.save(current_library,"plex","metadata")
         return list_
 
 def search(query, library=[]):

content/services/textfile.py

@@ -24,6 +24,7 @@ def add(self):
                 with open(library.ignore.path + "ignored.txt",'a') as f:
                     if not self.query() + '\n' in lines:
                         f.write(self.query() + '\n')
+                        ui_print("[textfile] added " + self.query() + " to ignore list")
                 f.close()
                 if not self in classes.ignore.ignored:
                     classes.ignore.ignored += [self]