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

Merge branch 'hotfix/0.6.2' into develop

Browse source
This commit is contained in:
adam 2015-01-21 19:44:09 +08:00
commit 4840059694
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -17,6 +17,11 @@
[develop changelog] [develop changelog]
### 0.6.2 (2015-01-21 23:35:00 UTC)
* Fix invalid addition of trailing slash to custom torrent RSS URLs
### 0.6.1 (2015-01-20 14:00:00 UTC) ### 0.6.1 (2015-01-20 14:00:00 UTC)
* Fix snatching from TorrentBytes provider * Fix snatching from TorrentBytes provider

6
sickbeard/config.py
View file

@ -313,7 +313,7 @@ def clean_hosts(hosts, default_port=None):
return cleaned_hosts return cleaned_hosts
def clean_url(url): def clean_url(url, add_slash=True):
""" """
Returns an cleaned url starting with a scheme and folder with trailing / Returns an cleaned url starting with a scheme and folder with trailing /
or an empty string or an empty string
@ -330,7 +330,7 @@ def clean_url(url):
if not path.endswith('/'): if not path.endswith('/'):
basename, ext = ek.ek(os.path.splitext, ek.ek(os.path.basename, path)) # @UnusedVariable basename, ext = ek.ek(os.path.splitext, ek.ek(os.path.basename, path)) # @UnusedVariable
if not ext: if not ext and add_slash:
path = path + '/' path = path + '/'
cleaned_url = urlparse.urlunsplit((scheme, netloc, path, query, fragment)) cleaned_url = urlparse.urlunsplit((scheme, netloc, path, query, fragment))
@ -744,4 +744,4 @@ class ConfigMigrator():
def _migrate_v8(self): def _migrate_v8(self):
# removing settings from gui and making it a hidden debug option # removing settings from gui and making it a hidden debug option
sickbeard.RECENTSEARCH_STARTUP = False sickbeard.RECENTSEARCH_STARTUP = False
sickbeard.BACKLOG_STARTUP = False sickbeard.BACKLOG_STARTUP = False

2
sickbeard/webserve.py
View file

@ -2118,7 +2118,7 @@ class ConfigProviders(MainHandler):
continue continue
curName, curURL, curCookies = curTorrentRssProviderStr.split('|') curName, curURL, curCookies = curTorrentRssProviderStr.split('|')
curURL = config.clean_url(curURL) curURL = config.clean_url(curURL, False)
newProvider = rsstorrent.TorrentRssProvider(curName, curURL, curCookies) newProvider = rsstorrent.TorrentRssProvider(curName, curURL, curCookies)