Merge branch 'develop'

media/radarr.py

@@ -98,9 +98,8 @@ class Radarr:
             if req.status_code == 201 and req.json()['tmdbId'] == movie_tmdbid:
                 log.debug("Successfully added %s (%d)", movie_title, movie_tmdbid)
                 return True
-            elif req.status_code == 401:
-                log.error("Failed to add %s (%d), reason: %s", movie_title, movie_tmdbid,
-                          req.json()['errorMessage'] if '{' in req.text else "\n{}".format(req.text))
+            elif req.status_code == 409 and 'message' in req.text:
+                log.error("Failed to add %s (%d), reason: %s", movie_title, movie_tmdbid, req.json()['message'])
                 return False
             else:
                 log.error("Failed to add %s (%d), unexpected response:\n%s", movie_title, movie_tmdbid, req.text)

media/sonarr.py

@@ -98,9 +98,8 @@ class Sonarr:
             if req.status_code == 201 and req.json()['tvdbId'] == series_tvdbid:
                 log.debug("Successfully added %s (%d)", series_title, series_tvdbid)
                 return True
-            elif req.status_code == 401:
-                log.error("Failed to add %s (%d), reason: %s", series_title, series_tvdbid,
-                          req.json()['errorMessage'] if '{' in req.text else "\n{}".format(req.text))
+            elif req.status_code == 401 and 'errorMessage' in req.text:
+                log.error("Failed to add %s (%d), reason: %s", series_title, series_tvdbid, req.json()['errorMessage'])
                 return False
             else:
                 log.error("Failed to add %s (%d), unexpected response:\n%s", series_title, series_tvdbid, req.text)