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

FIX: When updating series covers using alternate_latest_series_covers option, will now update the image on screen immediately after a Refresh, FIX: Removed unnecessary logging lines from serach results showing full results

This commit is contained in:
evilhero 2018-02-17 23:23:07 -05:00
parent d12e4d779d
commit cfdacb4501
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
<%def name="headerIncludes()">
<div id="subhead_container">
<div id="subhead_menu">
<a id="menu_link_refresh" onclick="doAjaxCall('refreshSeries?ComicID=${comic['ComicID']}', $(this),'table')" href="#" data-success="${comic['ComicName']} is being refreshed">Refresh Comic</a>
<a id="menu_link_refresh" onclick="doAjaxCall('refreshSeries?ComicID=${comic['ComicID']}', $(this), 'tabs');" href="#" data-success="${comic['ComicName']} is being refreshed">Refresh Comic</a>
<a id="menu_link_delete" href="#">Delete Comic</a>
<div id="dialog" title="Delete Series Confirmation" style="display:none" class="configtable">
<form action="deleteSeries" method="GET" style="vertical-align: middle; text-align: center">
@ -24,9 +24,9 @@
%if mylar.CONFIG.RENAME_FILES:
<a id="menu_link_refresh" onclick="doAjaxCall('manualRename?comicid=${comic['ComicID']}', $(this),'table')" data-success="Renaming files.">Rename Files</a>
%endif
<a id="menu_link_refresh" onclick="doAjaxCall('forceRescan?ComicID=${comic['ComicID']}', $(this),true);return true;" data-success="${comic['ComicName']} is being rescanned">Recheck Files</a>
<a id="menu_link_refresh" onclick="doAjaxCall('forceRescan?ComicID=${comic['ComicID']}', $(this));refreshLoadSeries();" data-success="${comic['ComicName']} is being rescanned">Recheck Files</a>
%if mylar.CONFIG.ENABLE_META:
<a id="menu_link_refresh" onclick="doAjaxCall('group_metatag?ComicID=${comic['ComicID']}&dirName=${comic['ComicLocation'] |u}', $(this),'table')" data-success="(re)tagging every issue present for '${comic['ComicName']}'">Manual MetaTagging</a>
<a id="menu_link_refresh" onclick="doAjaxCall('group_metatag?ComicID=${comic['ComicID']}&dirName=${comic['ComicLocation'] |u}', $(this),'table');refreshLoadSeries();" data-success="(re)tagging every issue present for '${comic['ComicName']}'">Manual MetaTagging</a>
%endif
%if comic['Status'] == 'Paused':
<a id="menu_link_resume" href="#" onclick="doAjaxCall('resumeSeries?ComicID=${comic['ComicID']}',$(this),true)" data-success="${comic['ComicName']} resumed">Resume Comic</a>
@ -432,7 +432,7 @@
%endif
%if mylar.CONFIG.ENABLE_META:
<a href="#" title="Manually meta-tag issue" onclick="doAjaxCall('manual_metatag?dirName=${comic['ComicLocation'] |u}&issueid=${issue['IssueID']}&filename=${linky |u}&comicid=${issue['ComicID']}&comversion=${comic['ComicVersion']}&seriesyear=${comic['ComicYear']}',$(this),'table')" data-success="${comic['ComicName']} #${issue['Issue_Number']} successfully tagged."><img src="interfaces/default/images/comictagger.png" height="25" width="25" class="highqual" /></a>
<a href="#" title="Manually meta-tag issue" onclick="doAjaxCall('manual_metatag?dirName=${comic['ComicLocation'] |u}&issueid=${issue['IssueID']}&filename=${linky |u}&comicid=${issue['ComicID']}&comversion=${comic['ComicVersion']}&seriesyear=${comic['ComicYear']}',$(this));refreshLoadSeries();" data-success="${comic['ComicName']} #${issue['Issue_Number']} successfully tagged."><img src="interfaces/default/images/comictagger.png" height="25" width="25" class="highqual" /></a>
%endif
%endif
<a href="#" title="Add to Reading List" onclick="doAjaxCall('addtoreadlist?IssueID=${issue['IssueID']}',$(this),'table')" data-success="${comic['ComicName']} #${issue['Issue_Number']} added to Reading List"><img src="interfaces/default/images/glasses-icon.png" height="25" width="25" class="highqual" /></a>

12
data/interfaces/default/js/script.js
View File

@ -178,7 +178,7 @@ function refreshTab() {
initThisPage();
});
}
function refreshLoadArtist() {
function refreshLoadSeries() {
if ( $(".gradeL").length > 0 ) {
var url = $(location).attr('href');
var loadingRow = $("table.display tr.gradeL")
@ -193,7 +193,7 @@ function refreshLoadArtist() {
} else {
// Still loading
setTimeout(function(){
refreshLoadArtist();
refreshLoadSeries();
},3000);
}
});
@ -201,14 +201,6 @@ function refreshLoadArtist() {
}
}
function refreshTab() {
var url = $(location).attr('href');
var tabId = $('.ui-tabs-panel:visible').attr("id");
$('.ui-tabs-panel:visible').load(url + " #"+ tabId, function() {
initThisPage();
});
}
function showMsg(msg,loader,timeout,ms) {
var feedback = $("#ajaxMsg");
update = $("#updatebar");

6
mylar/search.py
View File

@ -711,7 +711,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
log2file = ""
if not bb == "no results":
for entry in bb['entries']:
logger.info('entry: %s' % entry) #<--- uncomment this to see what the search result(s) are
#logger.fdebug('entry: %s' % entry) #<--- uncomment this to see what the search result(s) are
#brief match here against 32p since it returns the direct issue number
if nzbprov == '32P' and RSS == 'no':
if entry['pack'] == '0':
@ -1298,9 +1298,9 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
if nowrite is False:
if any([nzbprov == 'dognzb', nzbprov == 'nzb.su', nzbprov == 'experimental', 'newznab' in nzbprov]):
tprov = nzbprov
kind = 'usenet'
if newznab_host is not None:
tprov = newznab_host[0]
kind = 'usenet'
else:
kind = 'torrent'
tprov = nzbprov
@ -2938,7 +2938,7 @@ def IssueTitleCheck(issuetitle, watchcomic_split, splitit, splitst, issue_firstw
return
def generate_id(nzbprov, link):
logger.info('[%s] generate_id - link: %s' % (nzbprov, link))
#logger.fdebug('[%s] generate_id - link: %s' % (nzbprov, link))
if nzbprov == 'experimental':
#id is located after the /download/ portion
url_parts = urlparse.urlparse(link)

5
mylar/webserve.py
View File

@ -902,7 +902,10 @@ class WebInterface(object):
def refreshSeries(self, ComicID):
comicsToAdd = [ComicID]
logger.fdebug("Refreshing comic: %s" % comicsToAdd)
threading.Thread(target=updater.dbUpdate, args=[comicsToAdd,'refresh']).start()
#myDB = db.DBConnection()
#myDB.upsert('comics', {'Status': 'Loading'}, {'ComicID': ComicID})
#threading.Thread(target=updater.dbUpdate, args=[comicsToAdd,'refresh']).start()
updater.dbUpdate(comicsToAdd, 'refresh')
refreshSeries.exposed = True
def issue_edit(self, id, value):