monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-01 08:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for issues with fallback search option.

Browse source 
Fix for issues with passwords.
This commit is contained in:
echel0n 2014-05-17 03:01:09 -07:00
parent f9052ca2b2
commit 0b9b6228ae
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sickbeard/__init__.py
View file

@ -1413,15 +1413,15 @@ def save_config():
if hasattr(curTorrentProvider, 'username'): if hasattr(curTorrentProvider, 'username'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_username'] = curTorrentProvider.username new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_username'] = curTorrentProvider.username
if hasattr(curTorrentProvider, 'password'): if hasattr(curTorrentProvider, 'password'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_password'] = curTorrentProvider.password new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_password'] = helpers.encrypt(curTorrentProvider.password, ENCRYPTION_VERSION)
if hasattr(curTorrentProvider, 'confirmed'): if hasattr(curTorrentProvider, 'confirmed'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_confirmed'] = curTorrentProvider.confirmed new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_confirmed'] = int(curTorrentProvider.confirmed)
if hasattr(curTorrentProvider, 'ratio'): if hasattr(curTorrentProvider, 'ratio'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_ratio'] = float(curTorrentProvider.ratio) new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_ratio'] = float(curTorrentProvider.ratio)
if hasattr(curTorrentProvider, 'options'): if hasattr(curTorrentProvider, 'options'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_options'] = curTorrentProvider.options new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_options'] = curTorrentProvider.options
if hasattr(curTorrentProvider, 'proxy'): if hasattr(curTorrentProvider, 'proxy'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_proxy'] = curTorrentProvider.proxy.enabled new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_proxy'] = int(curTorrentProvider.proxy.enabled)
if hasattr(curTorrentProvider.proxy, 'url'): if hasattr(curTorrentProvider.proxy, 'url'):
new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_proxy_url'] = curTorrentProvider.proxy.url new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_proxy_url'] = curTorrentProvider.proxy.url
if hasattr(curTorrentProvider, 'freeleech'): if hasattr(curTorrentProvider, 'freeleech'):

4
sickbeard/search.py
View file

@ -360,9 +360,11 @@ def searchProviders(queueItem, show, season, episodes, manualSearch=False):
logger.log(traceback.format_exc(), logger.DEBUG) logger.log(traceback.format_exc(), logger.DEBUG)
continue continue
if len(searchResults) and not provider.search_fallback or searchCount == 2: if len(searchResults):
foundResults[provider.name] = filterSearchResults(show, searchResults) foundResults[provider.name] = filterSearchResults(show, searchResults)
break break
elif not provider.search_fallback or searchCount == 2:
break
if search_mode == 'sponly': if search_mode == 'sponly':
logger.log(u"FALLBACK EPISODE SEARCH INITIATED ...") logger.log(u"FALLBACK EPISODE SEARCH INITIATED ...")