Merge branch 'refs/heads/develop'

This commit is contained in:
Ruud committed 2013-06-03 21:59:26 +02:00
commit 40324ee89f
2 files changed
+6 -5

No files matched your search

+5 -4
View File
@@ -105,13 +105,14 @@ class Plugin(object):
if not params: params = {} if not params: params = {}
# Fill in some headers # Fill in some headers
headers['Referer'] = headers.get('Referer', urlparse(url).hostname) parsed_url = urlparse(url)
headers['Host'] = headers.get('Host', urlparse(url).hostname) host = parsed_url.hostname
headers['Referer'] = headers.get('Referer', '%s://%s' % (parsed_url.scheme, host))
headers['Host'] = headers.get('Host', host)
headers['User-Agent'] = headers.get('User-Agent', self.user_agent) headers['User-Agent'] = headers.get('User-Agent', self.user_agent)
headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip') headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip')
host = urlparse(url).hostname
# Don't try for failed requests # Don't try for failed requests
if self.http_failed_disabled.get(host, 0) > 0: if self.http_failed_disabled.get(host, 0) > 0:
if self.http_failed_disabled[host] > (time.time() - 900): if self.http_failed_disabled[host] > (time.time() - 900):
+1 -1
View File
@@ -180,7 +180,7 @@ class Release(Plugin):
provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True) provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True)
if item['type'] != 'torrent_magnet': if item['type'] != 'torrent_magnet':
item['download'] = provider.download item['download'] = provider.loginDownload if provider.urls.get('login') else provider.download
success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({ success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({
'profile': {'types': {'quality': {}}}, 'profile': {'types': {'quality': {}}},