diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index aec691e5..df5d8801 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -241,13 +241,13 @@ class Release(Plugin): 'files': {} }), manual = True) - if success: + if success == True: db.expunge_all() rel = db.query(Relea).filter_by(id = id).first() # Get release again @RuudBurger why do we need to get it again?? fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Successfully snatched "%s"' % item['name']) return { - 'success': success + 'success': success == True } def download(self, data, media, manual = False): @@ -260,20 +260,21 @@ class Release(Plugin): # Test to see if any downloaders are enabled for this type downloader_enabled = fireEvent('download.enabled', manual, data, single = True) if not downloader_enabled: - log.info('Tried to download, but none of the "%s" downloaders are enabled or gave an error', (data.get('protocol'))) + log.info('Tried to download, but none of the "%s" downloaders are enabled or gave an error', data.get('protocol')) return False # Download NZB or torrent file filedata = None if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))): filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id')) + log.info('Tried to download, but the "%s" provider gave an error', data.get('protocol')) if filedata == 'try_next': return filedata # Send NZB or torrent file to downloader download_result = fireEvent('download', data = data, media = media, manual = manual, filedata = filedata, single = True) if not download_result: - log.info('Tried to download, but the "%s" downloader gave an error', (data.get('protocol'))) + log.info('Tried to download, but the "%s" downloader gave an error', data.get('protocol')) return False log.debug('Downloader result: %s', download_result) diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/providers/nzb/newznab/main.py index c1eed852..d4f7c914 100644 --- a/couchpotato/core/providers/nzb/newznab/main.py +++ b/couchpotato/core/providers/nzb/newznab/main.py @@ -163,6 +163,7 @@ class Newznab(NZBProvider, RSS): # Get final redirected url log.debug('Checking %s for redirects.', url) req = urllib2.Request(url) + req.add_header('User-Agent', self.user_agent) res = urllib2.urlopen(req) finalurl = res.geturl() if finalurl != url: