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

FIX: fix for throwing error on startup when no user/pass enabled, FIX: Choose specific download option was broken for non-watchlisted items on the weekly pull

This commit is contained in:
evilhero 2018-02-16 16:41:44 -05:00
parent 17f8c8d72b
commit cbb04d523e
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/interfaces/default/weeklypull.html
View File

@ -135,11 +135,14 @@
%endif
<a href="searchit?name=${weekly['COMIC'] | u}&issue=${weekly['ISSUE']}&mode=pullseries" title="Search for this series to add to your watchlist"><img style="margin: 0px 5px" src="interfaces/default/images/search_add.png" height="25" width="25" class="highqual" /></a>
%endif
<% dl = True %>
%else:
<% dl = False %>
%endif
%if weekly['ISSUEID'] is None and weekly['STATUS'] == 'Skipped':
<a href="#" onclick="doAjaxCall('queueit?ComicName=${weekly['COMIC'] | u}&ComicID=${weekly['COMICID']}&IssueID=${weekly['ISSUEID']}&ComicIssue=${weekly['ISSUE']}&mode=pullwant&Publisher=${weekly['PUBLISHER']}&pullinfo=${weekinfo['midweek']}&pullweek=${weekinfo['weeknumber']}&pullyear=${weekinfo['year']}',$(this),'table')" data-success="Successfully submitted search request for ${weekly['COMIC']} #${weekly['ISSUE']}" title="One off download"><img style="margin: 0px 5px" src="interfaces/default/images/search.png" height="25" width="25" class="highqual" /></a>
%endif
<a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${weekly['ISSUEID']}', '${weekly['COMIC']}', '${weekly['COMICID']}', '${weekly['ISSUE']}', 'pullwant', '${weekly['PUBLISHER']}', '${weekinfo['midweek']}', '${weekinfo['weeknumber']}', '${weekinfo['year']}')"><img style="margin: 0px 5px" src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" /></a>
<a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${weekly['ISSUEID']}', '${weekly['COMIC']}', '${weekly['COMICID']}', '${weekly['ISSUE']}', 'pullwant', '${weekly['PUBLISHER']}', '${weekinfo['midweek']}', '${weekinfo['weeknumber']}', '${weekinfo['year']}', '${dl}')"><img style="margin: 0px 5px" src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" /></a>
<div id="choose_specific_download_dialog" title="Search & Choose a specific download for this issue" style="display:none" class="configtable">
<table class="display" id="downloads_table">
<thead>
@ -189,9 +192,9 @@
</script>
<script>
function getAvailableDownloads(issueid, comicname, comicid, issue, mode, publisher, pullinfo, pullweek, pullyear) {
function getAvailableDownloads(issueid, comicname, comicid, issue, mode, publisher, pullinfo, pullweek, pullyear, dl) {
ShowSpinner();
$.getJSON("choose_specific_download", {issueid: issueid, comicname: comicname, comicid: comicid, issue: issue, mode: mode, publisher: publisher, pullinfo: pullinfo, pullweek: pullweek, pullyear: pullyear}, function(data) {
$.getJSON("choose_specific_download", {issueid: issueid, comicname: comicname, comicid: comicid, issue: issue, mode: mode, publisher: publisher, pullinfo: pullinfo, pullweek: pullweek, pullyear: pullyear, action: dl}, function(data) {
loader.remove();
feedback.fadeOut();
search_results = data;

12
mylar/webserve.py
View File

@ -5490,9 +5490,6 @@ class WebInterface(object):
downloadBanner.exposed = True
def manageBanner(self, comicid, action, height=None, width=None):
logger.info('comicid: %s' % comicid)
logger.info('action: %s' % action)
logger.info('height: %s' % height)
rootpath = os.path.join(mylar.CONFIG.CACHE_DIR, 'storyarcs')
if action == 'delete':
delete = False
@ -5526,8 +5523,6 @@ class WebInterface(object):
# if os.path.isfile(loc +x):
# ext = x
# break
logger.info('original path: %s' % filepath)
logger.info('new path: %s' % os.path.join(rootpath, (str(comicid) + '-bannerH' + str(height) + ext)))
if filepath is not None:
os.rename(filepath, os.path.join(rootpath, (str(comicid) + '-bannerH' + str(height) + ext)))
logger.info('successfully saved %s to new dimensions of banner : 960 x %s' % (str(comicid) + '-bannerH' + str(height) + ext, height))
@ -5537,7 +5532,12 @@ class WebInterface(object):
manageBanner.exposed = True
def choose_specific_download(self, **kwargs): #manual=True):
if all([kwargs['issueid'] != 'None', kwargs['issueid'] is not None]):
try:
action = kwargs['action']
except:
action = False
if all([kwargs['issueid'] != 'None', kwargs['issueid'] is not None]) and kwargs['action'] is False:
issueid = kwargs['issueid']
logger.info('checking for: %s' % issueid)
results = search.searchforissue(issueid, manual=True)

4
mylar/webstart.py
View File

@ -106,9 +106,9 @@ def initialize(options):
}
}
userpassdict = dict(zip((options['http_username'].encode('utf-8'),), (options['http_password'].encode('utf-8'),)))
get_ha1= cherrypy.lib.auth_digest.get_ha1_dict_plain(userpassdict)
if options['http_password'] is not None:
#userpassdict = dict(zip((options['http_username'].encode('utf-8'),), (options['http_password'].encode('utf-8'),)))
#get_ha1= cherrypy.lib.auth_digest.get_ha1_dict_plain(userpassdict)
if options['authentication'] == 2:
# Set up a sessions based login page instead of using basic auth,
# using the credentials set for basic auth. Attempting to browse to