From d5c8664dfc28a292af28388e3ad784d8aac2b18e Mon Sep 17 00:00:00 2001
From: miigotu <miigotu@gmail.com>
Date: Fri, 4 Dec 2015 01:46:21 -0800
Subject: [PATCH] Simplify NN API error codes/descriptions and just use the
description given by the provier Fixes
https://github.com/SickRage/sickrage-issues/issues/128
---
sickbeard/providers/newznab.py | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
index 47f89b891..f9aa9d60a 100644
--- a/sickbeard/providers/newznab.py
+++ b/sickbeard/providers/newznab.py
@@ -36,7 +36,7 @@ from sickbeard import tvcache
from sickbeard import db
from sickbeard.common import Quality
from sickbeard.providers import generic
-from sickrage.helper.encoding import ek
+from sickrage.helper.encoding import ek, ss
from sickrage.show.Show import Show
from sickrage.helper.common import try_int
from sickbeard.common import USER_AGENT
@@ -214,23 +214,16 @@ class NewznabProvider(generic.NZBProvider):
return self._checkAuth()
try:
- err_code = int(data.error.attrs['code'])
err_desc = data.error.attrs['description']
- if not (err_code or err_desc):
+ if not err_desc:
raise
except (AssertionError, AttributeError, ValueError):
return self._checkAuth()
- if err_code == 100:
- logger.log(u'Your API key for %s is incorrect, please check your config.' % self.name)
- elif err_code == 101:
- logger.log(u'Your account on %s has been suspended, contact the administrator.' % self.name)
- elif err_code == 102:
- logger.log(u'Your account is not allowed to use the API on %s, contact the administrator' % self.name)
- elif err_code == 500:
- logger.log(u'Your account for %s has reached the api limit' % self.name)
- else:
- logger.log(u'Unknown error: %s' % err_desc, logger.ERROR)
+ # This is all we should really need, the code is irrelevant
+ # Provider name is the thread name, and this should INFO,
+ # DEBUG hides from the user, WARNING nags the user, ERROR spams the tracker
+ logger.log(ss(err_desc))
return False
--
GitLab