mirror of
https://github.com/evilhero/mylar
synced 2024-12-24 00:32:47 +00:00
FIX: Fix for Mylar usage behind reverse proxy not returning properly on a Recreate Pullist, IMP: Removed some unnecessary logging lines from the weekly pull logging
This commit is contained in:
parent
8f4082c7b8
commit
e02a5d01f6
2 changed files with 9 additions and 10 deletions
|
@ -1779,7 +1779,6 @@ class WebInterface(object):
|
||||||
myDB.action("DELETE FROM weekly WHERE weeknumber=? AND year=?", [weeknumber, year])
|
myDB.action("DELETE FROM weekly WHERE weeknumber=? AND year=?", [weeknumber, year])
|
||||||
logger.info("Deleted existed pull-list data for week %s, %s. Now Recreating the Pull-list..." % (weeknumber, year))
|
logger.info("Deleted existed pull-list data for week %s, %s. Now Recreating the Pull-list..." % (weeknumber, year))
|
||||||
weeklypull.pullit(forcecheck, weeknumber, year)
|
weeklypull.pullit(forcecheck, weeknumber, year)
|
||||||
raise cherrypy.HTTPRedirect("pullist")
|
|
||||||
pullrecreate.exposed = True
|
pullrecreate.exposed = True
|
||||||
|
|
||||||
def upcoming(self):
|
def upcoming(self):
|
||||||
|
|
|
@ -862,15 +862,14 @@ def new_pullcheck(weeknumber, pullyear, comic1off_name=None, comic1off_id=None,
|
||||||
if len(watchlist) > 0:
|
if len(watchlist) > 0:
|
||||||
for watch in watchlist:
|
for watch in watchlist:
|
||||||
listit = [pls for pls in pullist if str(pls) == str(watch['ComicID'])]
|
listit = [pls for pls in pullist if str(pls) == str(watch['ComicID'])]
|
||||||
logger.info('watchCOMICID:%s / listit: %s' % (watch['ComicID'], listit))
|
|
||||||
if 'Present' in watch['ComicPublished'] or (helpers.now()[:4] in watch['ComicPublished']) or watch['ForceContinuing'] == 1 or len(listit) >0:
|
if 'Present' in watch['ComicPublished'] or (helpers.now()[:4] in watch['ComicPublished']) or watch['ForceContinuing'] == 1 or len(listit) >0:
|
||||||
# this gets buggered up when series are named the same, and one ends in the current
|
# this gets buggered up when series are named the same, and one ends in the current
|
||||||
# year, and the new series starts in the same year - ie. Avengers
|
# year, and the new series starts in the same year - ie. Avengers
|
||||||
# lets' grab the latest issue date and see how far it is from current
|
# lets' grab the latest issue date and see how far it is from current
|
||||||
# anything > 45 days we'll assume it's a false match ;)
|
# anything > 45 days we'll assume it's a false match ;)
|
||||||
logger.fdebug("ComicName: " + watch['ComicName'])
|
#logger.fdebug("ComicName: " + watch['ComicName'])
|
||||||
latestdate = watch['LatestDate']
|
latestdate = watch['LatestDate']
|
||||||
logger.fdebug("latestdate: " + str(latestdate))
|
#logger.fdebug("latestdate: " + str(latestdate))
|
||||||
if latestdate[8:] == '':
|
if latestdate[8:] == '':
|
||||||
if '-' in latestdate[:4] and not latestdate.startswith('20'):
|
if '-' in latestdate[:4] and not latestdate.startswith('20'):
|
||||||
#pull-list f'd up the date by putting '15' instead of '2015' causing 500 server errors
|
#pull-list f'd up the date by putting '15' instead of '2015' causing 500 server errors
|
||||||
|
@ -892,15 +891,15 @@ def new_pullcheck(weeknumber, pullyear, comic1off_name=None, comic1off_id=None,
|
||||||
#refresh series here and then continue.
|
#refresh series here and then continue.
|
||||||
|
|
||||||
n_date = datetime.date.today()
|
n_date = datetime.date.today()
|
||||||
logger.fdebug("c_date : " + str(c_date) + " ... n_date : " + str(n_date))
|
#logger.fdebug("c_date : " + str(c_date) + " ... n_date : " + str(n_date))
|
||||||
recentchk = (n_date - c_date).days
|
recentchk = (n_date - c_date).days
|
||||||
logger.fdebug("recentchk: " + str(recentchk) + " days")
|
#logger.fdebug("recentchk: " + str(recentchk) + " days")
|
||||||
chklimit = helpers.checkthepub(watch['ComicID'])
|
chklimit = helpers.checkthepub(watch['ComicID'])
|
||||||
logger.fdebug("Check date limit set to : " + str(chklimit))
|
#logger.fdebug("Check date limit set to : " + str(chklimit))
|
||||||
logger.fdebug(" ----- ")
|
#logger.fdebug(" ----- ")
|
||||||
if recentchk < int(chklimit) or watch['ForceContinuing'] == 1 or len(listit) > 0:
|
if recentchk < int(chklimit) or watch['ForceContinuing'] == 1 or len(listit) > 0:
|
||||||
if watch['ForceContinuing'] == 1:
|
if watch['ForceContinuing'] == 1:
|
||||||
logger.fdebug('Forcing Continuing Series enabled for series...')
|
logger.fdebug('Forcing Continuing Series enabled for %s [%s]' % (watch['ComicName'],watch['ComicID']))
|
||||||
# let's not even bother with comics that are not in the Present.
|
# let's not even bother with comics that are not in the Present.
|
||||||
Altload = helpers.LoadAlternateSearchNames(watch['AlternateSearch'], watch['ComicID'])
|
Altload = helpers.LoadAlternateSearchNames(watch['AlternateSearch'], watch['ComicID'])
|
||||||
if Altload == 'no results' or Altload is None:
|
if Altload == 'no results' or Altload is None:
|
||||||
|
@ -930,7 +929,8 @@ def new_pullcheck(weeknumber, pullyear, comic1off_name=None, comic1off_id=None,
|
||||||
'AlternateNames': altnames,
|
'AlternateNames': altnames,
|
||||||
'AnnualIDs': annual_ids})
|
'AnnualIDs': annual_ids})
|
||||||
else:
|
else:
|
||||||
logger.fdebug("Determined to not be a Continuing series at this time.")
|
pass
|
||||||
|
#logger.fdebug("Determined to not be a Continuing series at this time.")
|
||||||
|
|
||||||
if len(weeklylist) >= 1:
|
if len(weeklylist) >= 1:
|
||||||
kp = []
|
kp = []
|
||||||
|
|
Loading…
Reference in a new issue