diff --git a/gui/slick/views/home.mako b/gui/slick/views/home.mako index f508b3b6d1ef85b6323d63dba8a98bc7b5b2f2ee..01290e6694a77e07410f19b9389259184ea14a8c 100644 --- a/gui/slick/views/home.mako +++ b/gui/slick/views/home.mako @@ -615,7 +615,7 @@ $(document).ready(function(){ <tfoot class="hidden-print"> <tr> - <th rowspan="1" colspan="1" align="center"><a href="${sbRoot}/home/addShows/">Add Show</a></th> + <th rowspan="1" colspan="1" align="center"><a href="${sbRoot}/home/addShows/">Add ${('Show', 'Anime')[curListType == 'Anime']}</a></th> <th> </th> <th> </th> <th> </th> diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index e5d4067dfc355f82a3c63096301ae4a5c9671900..b35ebea9f5928b6d374e4623e253b465db0f6bea 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -1347,7 +1347,7 @@ def _setUpSession(session, headers): session.headers.update({'Referer': address}) if 'Content-Type' in session.headers: - session.headers.pop('Content-Type') + session.headers.pop('Content-Type') return session @@ -1358,12 +1358,17 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None, """ session = _setUpSession(session, headers) + + for param in params or {}: + if isinstance(params[param], unicode): + params[param] = params[param].encode('utf-8') + session.params = params try: # decide if we get or post data to server if post_data: - for param in post_data: + for param in post_data: if isinstance(post_data[param], unicode): post_data[param] = post_data[param].encode('utf-8') @@ -1405,7 +1410,7 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None, return attempts = 0 - while(gzip and len(resp.content) > 1 and resp.content[0] == '\x1f' and resp.content[1] == '\x8b' and attempts < 3): + while gzip and len(resp.content) > 1 and resp.content[0] == '\x1f' and resp.content[1] == '\x8b' and attempts < 3: attempts += 1 resp._content = gzip.GzipFile(fileobj=_StringIO(resp.content)).read() diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 79f5cd8b7bbebd7bac3d43ba656c9874eb11313c..e66be74c3925670e71fd9dba5d8d28d597057c13 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -135,10 +135,6 @@ class GenericProvider: for providers with special URL requirements (like cookies) """ - # check for auth - if not self._doLogin(): - return - if self.proxy.isEnabled(): self.headers.update({'Referer': self.proxy.getProxyURL()}) self.proxyGlypeProxySSLwarning = self.proxy.getProxyURL() + 'includes/process.php?action=sslagree&submit=Continue anyway...' diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py index 53f7ff6689d927aab80bd74db9a2f01d609ace4c..f88b71927675dd1826e7588730f2b700f4ed93bb 100644 --- a/sickbeard/providers/iptorrents.py +++ b/sickbeard/providers/iptorrents.py @@ -210,7 +210,7 @@ class IPTorrentsProvider(generic.TorrentProvider): addCacheEntry = False if not (showObj.air_by_date or showObj.sports): - if search_mode == 'sponly': + if search_mode == 'sponly': if len(parse_result.episode_numbers): logger.log( u"This is supposed to be a season pack search but the result " + title + " is not a valid season pack, skipping it",