diff --git a/data/interfaces/default/config_providers.tmpl b/data/interfaces/default/config_providers.tmpl index 7ec47f65c61476cc0a837c2e33749ec620ddb17c..50b810a661bbf2f6cf71a2f077968bc3b28043c3 100755 --- a/data/interfaces/default/config_providers.tmpl +++ b/data/interfaces/default/config_providers.tmpl @@ -77,7 +77,7 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; <span class="component-title jumbo">Configure Provider:</span> <span class="component-desc"> #set $provider_config_list = [] - #for $cur_provider in ("nzbs_org", "nzbs_r_us", "newzbin", "nzbmatrix", "tvtorrents", "btn"): + #for $cur_provider in ("nzbs_r_us", "newzbin", "nzbmatrix", "tvtorrents", "btn"): #set $cur_provider_obj = $sickbeard.providers.getProviderClass($cur_provider) #if $cur_provider_obj.providerType == $GenericProvider.NZB and not $sickbeard.USE_NZBS: #continue @@ -119,7 +119,7 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; </div> #end for - +<!-- <div class="providerDiv" id="nzbs_orgDiv"> <div class="field-pair"> <label class="clearfix"> @@ -134,7 +134,7 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; </label> </div> </div> - +--> <div class="providerDiv" id="nzbmatrixDiv"> <div class="field-pair"> <label class="clearfix"> diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index ce061acc28c63f6b0314fe2ea23444bea08e5149..4c98ada476411207da59538291b276fabab69632 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, nzbs_org, nzbmatrix, nzbsrus, newznab, womble, newzbin +from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin from sickbeard import searchCurrent, searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser from sickbeard import helpers, db, exceptions, show_queue, search_queue, scheduler @@ -553,7 +553,7 @@ def initialize(consoleLogging=True): NZBS = bool(check_setting_int(CFG, 'NZBs', 'nzbs', 0)) NZBS_UID = check_setting_str(CFG, 'NZBs', 'nzbs_uid', '') NZBS_HASH = check_setting_str(CFG, 'NZBs', 'nzbs_hash', '') - + NZBSRUS = bool(check_setting_int(CFG, 'NZBsRUS', 'nzbsrus', 0)) NZBSRUS_UID = check_setting_str(CFG, 'NZBsRUS', 'nzbsrus_uid', '') NZBSRUS_HASH = check_setting_str(CFG, 'NZBsRUS', 'nzbsrus_hash', '') diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 9538ab5c4ccc1c5ae59db60af2aac81255240e3c..fb8962d3d9710479ce943e4eef385d0cc9f9b5d3 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -19,7 +19,7 @@ __all__ = ['ezrss', 'tvtorrents', 'nzbmatrix', - 'nzbs_org', +# 'nzbs_org', 'nzbsrus', 'womble', 'newzbin', @@ -97,7 +97,7 @@ def makeNewznabProvider(configString): return newProvider def getDefaultNewznabProviders(): - return 'Sick Beard Index|http://momo.sickbeard.com/|0|0' + return 'Sick Beard Index|http://momo.sickbeard.com/|0|0!!!NZBs.org|http://beta.nzbs.org/||0' def getProviderModule(name): diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 6e79d7604ad19b6739b153e3c57dfd0366d55f6d..3c982b39f6409678f1554a48567453dcf0963a6a 100755 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -40,7 +40,7 @@ from sickbeard import encodingKludge as ek from sickbeard import search_queue from sickbeard import image_cache -from sickbeard.providers import newznab +from sickbeard.providers import newznab, getProviderClass from sickbeard.common import Quality, Overview, statusStrings from sickbeard.common import SNATCHED, DOWNLOADED, SKIPPED, UNAIRED, IGNORED, ARCHIVED, WANTED from sickbeard.exceptions import ex @@ -69,6 +69,10 @@ 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_UID and sickbeard.NZBS_HASH and not getProviderClass('nzbs_org').key: + 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", "Please check the config to configure the new NZBs.org provider!") + logPageTitle = 'Logs & Errors' if len(classes.ErrorViewer.errors): logPageTitle += ' ('+str(len(classes.ErrorViewer.errors))+')'