From 09c683e3a921d84572900156646cb0ad91f97cc7 Mon Sep 17 00:00:00 2001 From: Nic Wolfe <nic@wolfeden.ca> Date: Sat, 24 Mar 2012 11:20:11 -0600 Subject: [PATCH] Allow the old NZBs.org to remain enabled but throw an error saying to switch to the new one. Removed the config for the old one. --- sickbeard/__init__.py | 2 +- sickbeard/providers/__init__.py | 4 ++-- sickbeard/providers/{nzbs_org.py => nzbs_org_old.py} | 2 +- sickbeard/webserve.py | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) rename sickbeard/providers/{nzbs_org.py => nzbs_org_old.py} (95%) diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 4c98ada47..15a7c83a2 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -30,7 +30,7 @@ from threading import Lock # apparently py2exe won't build these unless they're imported somewhere from sickbeard import providers, metadata -from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin +from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin, nzbs_org_old from sickbeard import searchCurrent, searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser from sickbeard import helpers, db, exceptions, show_queue, search_queue, scheduler diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index fb8962d3d..71991a793 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -19,7 +19,7 @@ __all__ = ['ezrss', 'tvtorrents', 'nzbmatrix', -# 'nzbs_org', + 'nzbs_org_old', 'nzbsrus', 'womble', 'newzbin', @@ -106,7 +106,7 @@ def getProviderModule(name): if name in __all__ and prefix+name in sys.modules: return sys.modules[prefix+name] else: - return None + raise Exception("Can't find "+prefix+name+" in "+repr(sys.modules)) def getProviderClass(id): diff --git a/sickbeard/providers/nzbs_org.py b/sickbeard/providers/nzbs_org_old.py similarity index 95% rename from sickbeard/providers/nzbs_org.py rename to sickbeard/providers/nzbs_org_old.py index fecea63c4..d7f5eb10a 100644 --- a/sickbeard/providers/nzbs_org.py +++ b/sickbeard/providers/nzbs_org_old.py @@ -38,7 +38,7 @@ class NZBsProvider(generic.NZBProvider): def __init__(self): - generic.NZBProvider.__init__(self, "NZBs.org") + generic.NZBProvider.__init__(self, "NZBs.org Old") self.supportsBacklog = True diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index adbe8eded..47e640f8a 100755 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -69,9 +69,9 @@ class PageTemplate (Template): self.sbHost = re.match("[^:]+", cherrypy.request.headers['Host'], re.X|re.M|re.S).group(0) self.projectHomePage = "http://code.google.com/p/sickbeard/" - if sickbeard.NZBS and sickbeard.NZBS_UID and sickbeard.NZBS_HASH and not getProviderClass('nzbs_org').key: + if sickbeard.NZBS and sickbeard.NZBS_UID and sickbeard.NZBS_HASH: logger.log(u"NZBs.org has been replaced, please check the config to configure the new provider!", logger.ERROR) - ui.notifications.error("NZBs.org Config Update", "NZBs.org must use the new API key from http://beta.nzbs.org. Please update your config.") + ui.notifications.error("NZBs.org Config Update", "NZBs.org has a new site. Please <a href=\""+sickbeard.WEB_ROOT+"/config/providers\">update your config</a> with the api key from <a href=\"http://beta.nzbs.org\">http://beta.nzbs.org</a> and then disable the old NZBs.org provider.") logPageTitle = 'Logs & Errors' if len(classes.ErrorViewer.errors): @@ -1130,6 +1130,8 @@ class ConfigProviders: if curProvider == 'nzbs_r_us': sickbeard.NZBSRUS = curEnabled + elif curProvider == 'nzbs_org_old': + sickbeard.NZBS = curEnabled elif curProvider == 'nzbmatrix': sickbeard.NZBMATRIX = curEnabled elif curProvider == 'newzbin': -- GitLab