mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2024-12-25 17:16:51 +00:00
Code Issues Releases Wiki Activity

FIX:(#1018) Invalid URL being passed for download

Browse source
This commit is contained in:
evilhero 2015-05-18 16:28:45 -04:00
parent c7dbd06bde
commit 80cd948ccd
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mylar/search.py
View file

@ -1390,6 +1390,8 @@ def searchforissue(issueid=None, new=False, rsscheck=None):
new = True new = True
#to-do: re-order the results list so it's most recent to least recent.
for result in results: for result in results:
comic = myDB.selectone("SELECT * from comics WHERE ComicID=? AND ComicName != 'None'", [result['ComicID']]).fetchone() comic = myDB.selectone("SELECT * from comics WHERE ComicID=? AND ComicName != 'None'", [result['ComicID']]).fetchone()
if comic is None: if comic is None:
@ -1668,22 +1670,30 @@ def searcher(nzbprov, nzbname, comicinfo, link, IssueID, ComicID, tmpprov, direc
'id': str(nzbid), 'id': str(nzbid),
'apikey': str(apikey)} 'apikey': str(apikey)}
verify = False #unsure if verify should be set to True for nzb.su or not.
logger.info('payload:' + str(payload)) logger.info('payload:' + str(payload))
elif nzbprov == 'dognzb': elif nzbprov == 'dognzb':
#dognzb - need to add back in the dog apikey #dognzb - need to add back in the dog apikey
down_url = urljoin(link, str(mylar.DOGNZB_APIKEY)) down_url = urljoin(link, str(mylar.DOGNZB_APIKEY))
verify = False
else: else:
#experimental - direct link. #experimental - direct link.
down_url = link down_url = link
headers = None headers = None
verify = False
if payload is None:
logger.info('Download URL: ' + str(down_url) + ' [VerifySSL:' + str(verify) + ']')
else:
logger.info('Download URL: ' + down_url + urllib.urlencode(payload) + ' [VerifySSL:' + str(verify) + ']')
logger.info('download url:' + down_url)
import lib.requests as requests import lib.requests as requests
try: try:
r = requests.get(down_url, params=payload, headers=headers) r = requests.get(down_url, params=payload, verify=verify, headers=headers)
except Exception, e: except Exception, e:
logger.warn('Error fetching data from %s: %s' % (tmpprov, e)) logger.warn('Error fetching data from %s: %s' % (tmpprov, e))
@ -1714,7 +1724,11 @@ def searcher(nzbprov, nzbname, comicinfo, link, IssueID, ComicID, tmpprov, direc
pass pass
if filen is None: if filen is None:
logger.error('Unable to download nzb from link: ' + str(link)) if payload is None:
logger.error('Unable to download nzb from link: ' + str(down_url) + ' [' + link + ']')
else:
errorlink = down_url + urllib.urlencode(payload)
logger.error('Unable to download nzb from link: ' + str(errorlink) + ' [' + link + ']')
else: else:
#convert to a generic type of format to help with post-processing. #convert to a generic type of format to help with post-processing.
filen = re.sub("\&", 'and', filen) filen = re.sub("\&", 'and', filen)
@ -2157,9 +2171,7 @@ def generate_id(nzbprov, link):
nzbtempid = path_parts[2] nzbtempid = path_parts[2]
nzbid = re.sub('.torrent', '', nzbtempid).rstrip() nzbid = re.sub('.torrent', '', nzbtempid).rstrip()
elif nzbprov == 'nzb.su': elif nzbprov == 'nzb.su':
url_parts = urlparse.urlparse(link) nzbid = os.path.splitext(link)[0].rsplit('/', 1)[1]
path_parts = url_parts[2].rpartition('/')
nzbid = re.sub('.nzb&amp','', path_parts[2]).strip()
elif nzbprov == 'dognzb': elif nzbprov == 'dognzb':
url_parts = urlparse.urlparse(link) url_parts = urlparse.urlparse(link)
path_parts = url_parts[2].rpartition('/') path_parts = url_parts[2].rpartition('/')