Merge pull request #58 from sirstudly/2_103

Author: funkypenguin

base/__init__.py

@@ -94,7 +94,7 @@ def request(self, method, url, **kwargs):
                 self.last_request_time = time.time()
 
                 if response.status_code in self.RETRY_CODES:
-                    logger.error(f"request error: {response.status_code} - retrying...")
+                    logger.error(f"request error: {response.status_code} - retrying... {url}")
                     retries += 1
                     if method == 'GET':
                         time.sleep(self.GET_RATE_LIMIT)

content/classes.py

@@ -989,6 +989,8 @@ def available(self):
                             if datetime.datetime.utcnow() > self.offset_airtime[offset]:
                                 return True
                         return False
+                    if not hasattr(self, 'first_aired') or self.first_aired is None:
+                        return False
                     return datetime.datetime.utcnow() > datetime.datetime.strptime(self.first_aired, '%Y-%m-%dT%H:%M:%S.000Z')
                 elif self.type == 'movie':
                     release_date = None
@@ -998,18 +1000,18 @@ def available(self):
                         if release.release_type == 'digital' or release.release_type == 'physical' or release.release_type == 'tv':
                             if release_date == None:
                                 release_date = release.release_date
-                            elif datetime.datetime.strptime(release_date, '%Y-%m-%d') > datetime.datetime.strptime(release.release_date, '%Y-%m-%d'):
+                            elif release.release_date is not None and datetime.datetime.strptime(release_date, '%Y-%m-%d') > datetime.datetime.strptime(release.release_date, '%Y-%m-%d'):
                                 release_date = release.release_date
                     # If no release date was found, select the theatrical release date + 2 Month delay
                     if release_date == None:
                         for release in releases:
                             if release_date == None:
                                 release_date = release.release_date
-                            elif datetime.datetime.strptime(release_date, '%Y-%m-%d') > datetime.datetime.strptime(release.release_date, '%Y-%m-%d'):
+                            elif release.release_date is not None and datetime.datetime.strptime(release_date, '%Y-%m-%d') > datetime.datetime.strptime(release.release_date, '%Y-%m-%d'):
                                 release_date = release.release_date
-                        release_date = datetime.datetime.strptime(
-                            release_date, '%Y-%m-%d') + datetime.timedelta(days=60)
-                        release_date = release_date.strftime("%Y-%m-%d")
+                        if release_date is not None:
+                            release_date = datetime.datetime.strptime(release_date, '%Y-%m-%d') + datetime.timedelta(days=60)
+                            release_date = release_date.strftime("%Y-%m-%d")
                     # Get trakt 'Latest HD/4k Releases' Lists to accept early releases
                     match = False
                     if trakt.early_releases == "true":
@@ -1023,6 +1025,8 @@ def available(self):
                         ui_print("item: '" + self.query() +
                                  "' seems to be released prior to its official release date and will be downloaded.")
                         return True
+                    if release_date is None:
+                        return False
                     if hasattr(self, "offset_airtime"):
                         for offset in self.offset_airtime:
                             if datetime.datetime.utcnow() > (datetime.datetime.strptime(release_date, '%Y-%m-%d') + datetime.timedelta(hours=float(offset))):
@@ -1040,6 +1044,8 @@ def available(self):
                     return datetime.datetime.utcnow() > datetime.datetime.strptime(release_date, '%Y-%m-%d')
                 elif self.type == 'season':
                     try:
+                        if not hasattr(self, 'first_aired') or self.first_aired is None:
+                            return False
                         if hasattr(self, "offset_airtime") and len(self.offset_airtime) > 0:
                             for offset in self.offset_airtime:
                                 if datetime.datetime.utcnow() > datetime.datetime.strptime(self.first_aired, '%Y-%m-%dT%H:%M:%S.000Z') + datetime.timedelta(hours=float(offset)):
@@ -1049,6 +1055,8 @@ def available(self):
                     except:
                         return True
                 elif self.type == 'episode':
+                    if not hasattr(self, 'first_aired') or self.first_aired is None:
+                        return False
                     if hasattr(self, "offset_airtime"):
                         for offset in self.offset_airtime:
                             if datetime.datetime.utcnow() > datetime.datetime.strptime(self.first_aired, '%Y-%m-%dT%H:%M:%S.000Z') + datetime.timedelta(hours=float(offset)):
@@ -1186,6 +1194,7 @@ def download(self, retries=0, library=[], parentReleases=[]):
         # set anime info before episodes are removed
         self.isanime()
         if self.type == 'movie':
+            ui_print(f"processing movie: {self.title} ({self.year})", debug=ui_settings.debug)
             if (len(self.uncollected(library)) > 0 or self.version_missing()) and len(self.versions()) > 0:
                 if self.released() and not self.watched() and not self.downloading():
                     if not hasattr(self, "year") or self.year == None:
@@ -1227,6 +1236,7 @@ def download(self, retries=0, library=[], parentReleases=[]):
                     if retry:
                         self.watch()
         elif self.type == 'show':
+            ui_print(f"processing show: {self.title} ({self.year})", debug=ui_settings.debug)
             if len(self.versions()) > 0 and self.released() and (not self.collected(library) or self.version_missing()) and not self.watched():
                 self.isanime()
                 self.Seasons = self.uncollected(library)
@@ -1362,6 +1372,7 @@ def download(self, retries=0, library=[], parentReleases=[]):
                     toc = time.perf_counter()
                     ui_print('took ' + str(round(toc - tic, 2)) + 's')
         elif self.type == 'season':
+            ui_print(f"processing: {self.parentTitle} {self.title}", debug=ui_settings.debug)
             debrid_downloaded = False
             for release in parentReleases:
                 if regex.match(self.deviation(), release.title, regex.I):

content/services/plex.py

@@ -5,7 +5,7 @@
 from ui.ui_print import *
 
 name = 'Plex'
-session = requests.Session()
+session = custom_session(get_rate_limit=1.0, post_rate_limit=1.0)  # 1 second between requests = 60 requests/minute
 users = []
 headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
 current_library = []
@@ -28,7 +28,7 @@ def logerror(response):
         else:
             ui_print("plex error: (401 unauthorized): token for user '"+name+"' does not seem to work. check your plex user settings.")
 
-def get(url, timeout=60):
+def get(session: requests.Session, url: str, timeout=60):
     try:
         response = session.get(url, headers=headers, timeout=timeout)
         logerror(response)
@@ -38,7 +38,7 @@ def get(url, timeout=60):
         ui_print("plex error: (json exception): " + str(e), debug=ui_settings.debug)
         return None
 
-def post(url, data):
+def post(session: requests.Session, url: str, data):
     try:
         response = session.post(url, data=data, headers=headers)
         logerror(response)
@@ -346,7 +346,7 @@ def setup(cls, new=False):
             working = False
             while not working:
                 try:
-                    response = get(library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
+                    response = get(session, library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
                     working = True
                     if len(response.MediaContainer.Directory) == 0:
                         print("It looks like this server does not have any libraries set-up! Please open the plex webui, setup at least one library and point it to your mounted debrid service drive.")
@@ -480,7 +480,7 @@ def call(paths):
                             while refreshing:
                                 refreshing = False
                                 url = library.url + '/library/sections/?X-Plex-Token=' + users[0][1]
-                                response = get(url)
+                                response = get(session, url)
                                 for section_ in response.MediaContainer.Directory:
                                     if section_.refreshing:
                                         refreshing = True
@@ -501,7 +501,7 @@ def __new__(cls, element):
                 names = []
                 element_type = ("show" if element.type in ["show","season","episode"] else "movie")
                 url = library.url + '/library/sections/?X-Plex-Token=' + users[0][1]
-                response = get(url)
+                response = get(session, url)
                 paths = []
                 for section_ in response.MediaContainer.Directory:
                     if section_.key in library.refresh.sections and element_type == section_.type:
@@ -547,7 +547,7 @@ def setup(cls, new=False):
             working = False
             while not working:
                 try:
-                    response = get(library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
+                    response = get(session, library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
                     working = True
                     if len(response.MediaContainer.Directory) == 0:
                         print("It looks like this server does not have any libraries set-up! Please open the plex webui, setup at least one library and point it to your mounted debrid service drive.")
@@ -595,7 +595,7 @@ def call(element):
                     url = library.url + '/library/sections/' + str(library_item.librarySectionID) + '/all?type=' + type_string + '&id=' + library_item.ratingKey + '&label.locked=1' + tags_string + '&X-Plex-Token=' + users[0][1]
                     response = session.put(url,headers=headers)
                 url = library.url + '/library/metadata/' + library_item.ratingKey + '?X-Plex-Token=' + users[0][1]
-                response = get(url)
+                response = get(session, url)
                 library_item.__dict__.update(response.MediaContainer.Metadata[0].__dict__)
             except Exception as e:
                 ui_print("[plex] error: couldnt add labels! Turn on debug printing for more info.")
@@ -785,7 +785,7 @@ def __new__(self,silent=False):
         if library.check == [['']]:
             library.check = []
         try:
-            response = get(library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
+            response = get(session, library.url  + '/library/sections/?X-Plex-Token=' + users[0][1])
             for Directory in response.MediaContainer.Directory:
                 if ([Directory.key] in library.check or library.check == []) and Directory.type in ["movie","show"]:
                     types = ['1'] if Directory.type == "movie" else  ['2', '3', '4']
@@ -804,7 +804,7 @@ def __new__(self,silent=False):
             section_title = ''
             for type in types:
                 url = library.url + '/library/sections/' + section + '/all?type=' + type + '&X-Plex-Token=' + users[0][1]
-                response = get(url)
+                response = get(session, url)
                 if hasattr(response, 'MediaContainer'):
                     if hasattr(response.MediaContainer, 'Metadata'):
                         for element in response.MediaContainer.Metadata:
@@ -860,7 +860,7 @@ def __new__(self,silent=False):
                 if not item in current_library:
                     updated = True
                     url = library.url + '/library/metadata/' + item.ratingKey + '?X-Plex-Token=' + users[0][1]
-                    response = get(url)
+                    response = get(session, url)
                     item.__dict__.update(response.MediaContainer.Metadata[0].__dict__)
                 else:
                     match = next((x for x in current_library if item == x), None)
@@ -934,7 +934,7 @@ def match(self):
         service,query = EID.split('://')
         query = '-'.join([service,query])
         url = current_module.library.url + '/library/metadata/' + some_local_media.ratingKey + '/matches?manual=1&title=' + query + '&agent=' + agent + '&language=en-US&X-Plex-Token=' + users[0][1]
-        response = get(url)
+        response = get(session, url)
         try:
             match = response.MediaContainer.SearchResult[0]
             if match.type == 'show':

content/services/trakt.py

@@ -232,9 +232,10 @@ def post(url, data):
 
 def post2(url, data):
     try:
-        response = session.post(url, headers={
-            'Content-type': "application/json"}, data=data)
-        logerror(response)
+        response = session.post(url, headers={'Content-type': "application/json"}, data=data)
+        if response.status_code not in [200, 201]:
+            ui_print(f"[trakt] error {response.status_code}: " + str(response.content), ui_settings.debug)
+            return None
         response = json.loads(response.content, object_hook=lambda d: SimpleNamespace(**d))
         time.sleep(1.1)
     except Exception as e: