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

FIX: (#1779) Download button from weekly pull would return a 500 error, FIX: When editing the Alternate Search Name field on the series detail page, would drag and drop the text box instead of highlighting the text within, FIX: Fix for filechecker/post-processor erroring out on an 'alt_series' message and/or creating .BAD files during post-processing, IMP: Removed some more unneeded logging lines

This commit is contained in:
evilhero 2017-11-26 02:30:40 -05:00
parent 6a3c2a1610
commit c02c946f35
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/interfaces/default/comicdetails.html
View File

@ -216,11 +216,11 @@
%endif
<form action="comic_config" method="GET">
<input type="hidden" name="ComicID" value=${comic['ComicID']}>
<input type="hidden" name="ComicID" value=${comic['ComicID']}>
<fieldset>
<br/><br/>
<div class="row checkbox left clearfix">
<input type="checkbox" style="vertical-align: middle; margin: 3px; margin-top: -1px;" name="force_continuing" value="2" ${comicConfig['force_continuing']} /></a><label>Forcibly Mark as Continuing Series<a href="#" title="Will forcibly mark this series as 'Continuing' regardless of actual status"><img src="interfaces/default/images/info32.png" height="16" alt="" /></label>
<input type="checkbox" style="vertical-align: middle; margin: 3px; margin-top: -1px;" name="force_continuing" value="2" ${comicConfig['force_continuing']} /><label>Forcibly Mark as Continuing Series<a href="#" title="Will forcibly mark this series as 'Continuing' regardless of actual status"><img src="interfaces/default/images/info32.png" height="16" alt="" /></label></a>
</div>
%if any([comic['ComicYear'] == '2099',comic['ComicYear'] == '0000', comic['ComicYear'] == '', comic['Corrected_SeriesYear']]):
<div class="row">
@ -241,7 +241,7 @@
<div class="row">
<label>Alternate Search Names</label>
<input type="text" name="alt_search" value="${comic['AlternateSearch']}" size="90">
<input type="text" name="alt_search" value="${comic['AlternateSearch']}" size="90" />
<a href="#" title="Seperate multiple entries with ##"><img src="interfaces/default/images/info32.png" height="16" alt="" /></a>
<small>Alternate comic names to be searched in case naming is different (ie. Hack/Slash = hack-slash)</small>
</div>
@ -267,8 +267,8 @@
</div>
%endif
<input type="submit" value="Update"/>
</fieldset>
</fieldset>
<input type="submit" value="Update"/>
</form>
</td>
</tr>

16
mylar/filechecker.py
View File

@ -905,7 +905,7 @@ class FileChecker(object):
series_name_decoded= unicodedata.normalize('NFKD', helpers.conversion(series_name)).encode('ASCII', 'ignore')
#check for annual in title(s) here.
if mylar.CONFIG.ANNUALS_ON:
if mylar.CONFIG.ANNUALS_ON and 'annual' not in self.watchcomic.lower():
if 'annual' in series_name.lower():
issue_number = 'Annual ' + str(issue_number)
series_name = re.sub('annual', '', series_name, flags=re.I).strip()
@ -998,11 +998,11 @@ class FileChecker(object):
justthedigits = series_info['issue_number']
if mylar.CONFIG.ANNUALS_ON:
if 'annual' in series_name.lower():
justthedigits = 'Annual ' + series_info['issue_number']
nspace_seriesname = re.sub('annual', '', nspace_seriesname.lower()).strip()
nspace_seriesname_decoded = re.sub('annual', '', nspace_seriesname_decoded.lower()).strip()
#if mylar.CONFIG.ANNUALS_ON and 'annual' not in nspace_watchcomic.lower():
# if 'annual' in series_name.lower():
# justthedigits = 'Annual ' + series_info['issue_number']
# nspace_seriesname = re.sub('annual', '', nspace_seriesname.lower()).strip()
# nspace_seriesname_decoded = re.sub('annual', '', nspace_seriesname_decoded.lower()).strip()
seriesalt = False
if nspace_altseriesname is not None:
@ -1087,6 +1087,8 @@ class FileChecker(object):
'comiclocation': series_info['comiclocation'],
'series_name': series_info['series_name'],
'series_volume': series_info['series_volume'],
'alt_series': series_info['alt_series'],
'alt_issue': series_info['alt_issue'],
'issue_year': series_info['issue_year'],
'justthedigits': justthedigits,
'annual_comicid': annual_comicid,
@ -1099,6 +1101,8 @@ class FileChecker(object):
'sub': series_info['sub'],
'comiclocation': series_info['comiclocation'],
'series_name': series_info['series_name'],
'alt_series': series_info['alt_series'],
'alt_issue': series_info['alt_issue'],
'issue_number': series_info['issue_number'],
'series_volume': series_info['series_volume'],
'issue_year': series_info['issue_year'],

4
mylar/rsscheck.py
View File

@ -1039,8 +1039,6 @@ def torsend2client(seriesname, issue, seriesyear, linkit, site, pubhash=None):
logger.warn('[EPIC FAILURE] Cannot load the requests module')
return "fail"
try:
logger.info('url: %s' % url)
logger.info('payload: %s' % payload)
scraper = cfscrape.create_scraper()
if cf_cookievalue:
r = scraper.get(url, params=payload, cookies=cf_cookievalue, verify=verify, stream=True, headers=headers)
@ -1065,8 +1063,6 @@ def torsend2client(seriesname, issue, seriesyear, linkit, site, pubhash=None):
logger.debug('[TOR2CLIENT-32P] Creating CF Scraper')
scraper = cfscrape.create_scraper()
logger.debug('[TOR2CLIENT-32P] payload: %s \n verify %s \n headers %s \n', payload, verify, headers)
try:
r = scraper.get(url, params=payload, verify=verify, allow_redirects=True)
except Exception, e:

5
mylar/webserve.py
View File

@ -3488,15 +3488,14 @@ class WebInterface(object):
def MassWeeklyDownload(self, weeknumber=None, year=None, midweek=None, weekfolder=0, filename=None):
if filename is None:
mylar.WEEKFOLDER = int(weekfolder)
#mylar.config_write()
mylar.CONFIG.WEEKFOLDER = bool(weekfolder)
raise cherrypy.HTTPRedirect("pullist")
# this will download all downloaded comics from the weekly pull list and throw them
# into a 'weekly' pull folder for those wanting to transfer directly to a 3rd party device.
myDB = db.DBConnection()
if mylar.WEEKFOLDER:
if mylar.CONFIG.WEEKFOLDER:
if mylar.CONFIG.WEEKFOLDER_LOC:
dstdir = mylar.CONFIG.WEEKFOLDER_LOC
else: