Merge branch 'master' into develop

CHANGES.md

@@ -6,6 +6,12 @@
 
 
 
+### 0.24.9 (2021-07-05 10:25:00 UTC)
+
+* Change add Synology DSM 7 compatibility
+* Fix exception when removing a show
+
+
 ### 0.24.8 (2021-06-30 23:05:00 UTC)
 
 * Fix nameparser unit tests

sickbeard/clients/download_station.py

@@ -56,7 +56,7 @@ class DownloadStationAPI(GenericClient):
         102: 'The requested API does not exist', 103: 'The requested method does not exist',
         104: 'The requested version does not support the functionality',
         105: 'The logged in session does not have permission', 106: 'Session timeout',
-        107: 'Session interrupted by duplicate login',
+        107: 'Session interrupted by duplicate login', 119: 'SID not found', 120: 'Wrong parameter',
     }
 
     def _error(self, msg):
@@ -107,7 +107,7 @@ class DownloadStationAPI(GenericClient):
         return result
 
     def _tinf(self, ids=None, err=False):
-        # type: (Optional[list], bool) -> list
+        # type: (Optional[AnyStr, list], bool) -> list
         """
         Fetch client task information
         :param ids: Optional id(s) to get task info for. None to get all task info
@@ -385,7 +385,8 @@ class DownloadStationAPI(GenericClient):
 
         response = {}
         try:
-            params = dict(method='login', api='SYNO.API.Auth', version=(1, 2)[1 < self._auth_version],
+            params = dict(method='login', api='SYNO.API.Auth',
+                          version=(1, (2, self._auth_version)[7 <= self._auth_version])[1 < self._auth_version],
                           account=self.username, passwd=self.password, session='DownloadStation')
             params.update(({}, dict(format='sid'))[1 < self._auth_version])
 

sickbeard/webserve.py

@@ -2310,7 +2310,7 @@ class Home(MainHandler):
 
         response = {}
         for cur_show_obj in shows:
-            if cur_show_obj.path:
+            if cur_show_obj and cur_show_obj.path:
                 loc_size = helpers.get_size(cur_show_obj.path)
                 num_files, smallest, largest, average_size = get_media_stats(cur_show_obj.path)
                 response[cur_show_obj.tvid_prodid] = {'message': 'No media files'} if not num_files else \