mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

FIX: fix for some id / nzbhydra2 problems when generating the id for reference, which would cause invalid url's in some cases, FIX: added a cleanup routine for post-processing individual issues via api call

This commit is contained in:
evilhero 2018-02-24 18:02:14 -05:00
parent a1709db0a7
commit 4042b9b053
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mylar/PostProcessor.py
View File

@ -215,6 +215,10 @@ class PostProcessor(object):
else:
tmp_folder = orig_folder
if os.path.split(tmp_folder)[1] == filename and not os.path.isdir(tmp_folder):
logger.fdebug('%s item to be deleted is file, not folder due to direct submission: %s' % (self.module, tmp_folder))
tmp_folder = os.path.split(tmp_folder)[0]
#if all([os.path.isdir(odir), self.nzb_folder != tmp_folder]) or any([odir.startswith('mylar_'),del_nzbdir is True]):
# check to see if the directory is empty or not.

27
mylar/search.py
View File

@ -2316,11 +2316,11 @@ def searcher(nzbprov, nzbname, comicinfo, link, IssueID, ComicID, tmpprov, direc
tmp_url_en = len(tmp_url)
tmp_line += tmp_url[tmp_url_en:]
#tmp_url = helpers.apiremove(down_url.copy(), '&')
logger.info('Download URL: ' + str(tmp_line) + ' [VerifySSL:' + str(verify) + ']')
logger.fdebug('[PAYLOAD-NONE]Download URL: ' + str(tmp_line) + ' [VerifySSL:' + str(verify) + ']')
else:
tmppay = payload.copy()
tmppay['apikey'] = 'YOUDONTNEEDTOKNOWTHIS'
logger.info('Download URL: ' + down_url + '?' + urllib.urlencode(tmppay) + ' [VerifySSL:' + str(verify) + ']')
logger.fdebug('[PAYLOAD] Download URL: ' + down_url + '?' + urllib.urlencode(tmppay) + ' [VerifySSL:' + str(verify) + ']')
if down_url.startswith('https') and verify == False:
try:
@ -2364,10 +2364,10 @@ def searcher(nzbprov, nzbname, comicinfo, link, IssueID, ComicID, tmpprov, direc
if filen is None:
if payload is None:
logger.error('Unable to download nzb from link: ' + str(down_url) + ' [' + link + ']')
logger.error('[PAYLOAD:NONE] 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 + ']')
logger.error('[PAYLOAD:PRESENT] Unable to download nzb from link: ' + str(errorlink) + ' [' + link + ']')
return "sab-fail"
else:
#convert to a generic type of format to help with post-processing.
@ -2978,6 +2978,18 @@ def generate_id(nzbprov, link):
nzbid = os.path.splitext(link)[0].rsplit('searchresultid=',1)[1]
elif tmpid == '' or tmpid is None:
nzbid = os.path.splitext(link)[0].rsplit('/', 1)[1]
elif 'apikey' in tmpid:
#if apikey is passed in as a parameter and the id is in the path
findend = tmpid.find('&')
if findend == -1:
findend = len(tmpid)
nzbid = tmpid[findend+1:].strip()
else:
findend = tmpid.find('apikey=', findend)
nzbid = tmpid[findend+1:].strip()
if '&id' not in tmpid or nzbid == '':
tmpid = urlparse.urlparse(link)[2]
nzbid = tmpid.rsplit('/', 1)[1]
else:
# for the geek in all of us...
st = tmpid.find('&id')
@ -2989,13 +3001,6 @@ def generate_id(nzbprov, link):
end = len(tmpid)
nzbid = re.sub('&id=', '', tmpid[st:end]).strip()
elif nzbprov == 'Torznab':
#if mylar.CONFIG.TORZNAB_HOST.endswith('/'):
# tmphost = mylar.CONFIG.TORZNAB_HOST + 'download/'
#else:
# tmphost = mylar.CONFIG.TORZNAB_HOST + '/download/'
#tmpline = re.sub(tmphost, '', tmphost).strip()
#tmpidend = tmpline.find('/')
#nzbid = tmpline[:tmpidend]
idtmp = urlparse.urlparse(link)[4]
idpos = idtmp.find('&')
nzbid = re.sub('id=', '', idtmp[:idpos]).strip()