mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-01-03 05:24:43 +00:00
Code Issues Releases Wiki Activity

FIX: fix for DDL not performing timestamp comparison properly due to change

Browse source
This commit is contained in:
evilhero 2019-02-19 10:46:55 -05:00
parent 77a2cecbaa
commit 47477eea26
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mylar/search.py
View file

@ -987,7 +987,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
logger.fdebug('date used is : %s' % stdate) logger.fdebug('date used is : %s' % stdate)
postdate_int = None postdate_int = None
if all([nzbprov == '32P', RSS == 'no']) or nzbprov == 'ddl': if all([nzbprov == '32P', RSS == 'no']) or all([nzbprov == 'ddl', len(pubdate) == 10]):
postdate_int = pubdate postdate_int = pubdate
logger.fdebug('[%s] postdate_int: %s' % (nzbprov, postdate_int)) logger.fdebug('[%s] postdate_int: %s' % (nzbprov, postdate_int))
elif any([postdate_int is None, type(postdate_int) != int]) or not all([nzbprov == '32P', RSS == 'no']): elif any([postdate_int is None, type(postdate_int) != int]) or not all([nzbprov == '32P', RSS == 'no']):
@ -1069,11 +1069,11 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
if digitaldate != '0000-00-00' and dateconv2.date() >= digconv2.date(): if digitaldate != '0000-00-00' and dateconv2.date() >= digconv2.date():
logger.fdebug('%s is after DIGITAL store date of %s' % (pubdate, digitaldate)) logger.fdebug('%s is after DIGITAL store date of %s' % (pubdate, digitaldate))
elif dateconv2.date() < issconv2.date(): elif dateconv2.date() < issconv2.date():
logger.fdebug('[CONV]pubdate: %s < storedate: %s' % (dateconv2.date(), issconv2.date())) logger.fdebug('[CONV] pubdate: %s < storedate: %s' % (dateconv2.date(), issconv2.date()))
logger.fdebug('%s is before store date of %s. Ignoring search result as this is not the right issue.' % (pubdate, stdate)) logger.fdebug('%s is before store date of %s. Ignoring search result as this is not the right issue.' % (pubdate, stdate))
continue continue
else: else:
logger.fdebug('%s is after store date of %s' % (pubdate, stdate)) logger.fdebug('[CONV] %s is after store date of %s' % (pubdate, stdate))
except: except:
#if the above fails, drop down to the integer compare method as a failsafe. #if the above fails, drop down to the integer compare method as a failsafe.
if digitaldate != '0000-00-00' and postdate_int >= digitaldate_int: if digitaldate != '0000-00-00' and postdate_int >= digitaldate_int:
@ -1083,9 +1083,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
logger.fdebug('%s is before store date of %s. Ignoring search result as this is not the right issue.' % (pubdate, stdate)) logger.fdebug('%s is before store date of %s. Ignoring search result as this is not the right issue.' % (pubdate, stdate))
continue continue
else: else:
logger.fdebug('%s is after store date of %s' % (pubdate, stdate)) logger.fdebug('[INT] %s is after store date of %s' % (pubdate, stdate))
# -- end size constaints. # -- end size constaints.
if '(digital first)' in ComicTitle.lower(): #entry['title'].lower(): if '(digital first)' in ComicTitle.lower(): #entry['title'].lower():
dig_moving = re.sub('\(digital first\)', '', ComicTitle.lower()).strip() #entry['title'].lower()).strip() dig_moving = re.sub('\(digital first\)', '', ComicTitle.lower()).strip() #entry['title'].lower()).strip()
dig_moving = re.sub('[\s+]', ' ', dig_moving) dig_moving = re.sub('[\s+]', ' ', dig_moving)