2013-02-06 19:55:23 +00:00
< %inherit file="base.html" />
< %!
2013-01-28 20:31:43 +00:00
import mylar
2013-02-06 19:55:23 +00:00
from mylar import db
2013-01-28 20:31:43 +00:00
from mylar.helpers import checked
%>
< %def name="headerIncludes()">
< div id = "subhead_container" >
< div id = "subhead_menu" >
2013-05-19 05:21:32 +00:00
< a id = "menu_link_refresh" onclick = "doAjaxCall('flushImports', $(this),'table')" data-success = "Import Results Flushed" > Flush all Imports< / a >
2013-01-28 20:31:43 +00:00
< / div >
< / div >
< /%def>
< %def name="body()">
2013-02-13 01:27:24 +00:00
2013-01-28 20:31:43 +00:00
< div id = "paddingheader" >
IMP: Added ForceRSS Check and Test SABnzbd Connection buttons in Config, FIX: If Annuals not enabled, would error on home screen, IMP: updated mylar.init.d (thnx Kalinon), FIX: Manual Post-Processing fix for Manual Run (thnx Kalinon), IMP: Library Monitor working (check folder every X minutes and Post-Process), IMP: Future Upcoming introduction, IMP: Experimental search better handling of year inclusions, FIX: Filechecker will now pick up series with years in the series title accordingly, FIX: Torrent seedbox sending would lockup occassionally when attempting to send torrent file, FIX: malformed image url on some series, IMP: Moved issue updating to a seperate function, IMP: When series was refreshed, would download the last issue (or few issues depending on date), regardless of status, IMP: When series is volume 1 or volume label doesn't exist, either assume V1 or remove volume requirements to improve matching hits, IMP: StoryArcs will now check in StoryArc folder for existing issues and change status in StoryArc accordingly...
2013-11-28 15:48:59 +00:00
< h1 class = "clearfix" > Ultron Import Results< / h1 >
2013-01-28 20:31:43 +00:00
< / div >
< div id = "tabs" >
< ul >
< li > < a href = "#tabs-1" > Import Results< / a > < / li >
< / ul >
< div id = "tabs-1" class = "configtable" >
< table >
< tr >
IMP: Added ForceRSS Check and Test SABnzbd Connection buttons in Config, FIX: If Annuals not enabled, would error on home screen, IMP: updated mylar.init.d (thnx Kalinon), FIX: Manual Post-Processing fix for Manual Run (thnx Kalinon), IMP: Library Monitor working (check folder every X minutes and Post-Process), IMP: Future Upcoming introduction, IMP: Experimental search better handling of year inclusions, FIX: Filechecker will now pick up series with years in the series title accordingly, FIX: Torrent seedbox sending would lockup occassionally when attempting to send torrent file, FIX: malformed image url on some series, IMP: Moved issue updating to a seperate function, IMP: When series was refreshed, would download the last issue (or few issues depending on date), regardless of status, IMP: When series is volume 1 or volume label doesn't exist, either assume V1 or remove volume requirements to improve matching hits, IMP: StoryArcs will now check in StoryArc folder for existing issues and change status in StoryArc accordingly...
2013-11-28 15:48:59 +00:00
< span style = "position:right" >
< img src = "interfaces/default/images/ultron.png" style = "float:right" height = "125" width = "125" / >
< fieldset >
2013-02-06 19:55:23 +00:00
< div class = "row checkbox" >
< input type = "checkbox" name = "autoadd" style = "vertical-align: middle; margin: 3px; margin-top: -1px;" id = "autoadd" value = "1" $ { checked ( mylar . ADD_COMICS ) } > < label > Auto-add new series< / label >
< / div >
< div class = "row checkbox" >
< input type = "checkbox" style = "vertical-align: middle; margin: 3px; margin-top: -1px;" name = "imp_move" id = "imp_move" value = "1" $ { checked ( mylar . IMP_MOVE ) } > < label > Move files< / label >
< / div >
2015-01-16 19:40:08 +00:00
%if mylar.RENAME_FILES:
< div class = "row checkbox" >
< input type = "checkbox" style = "vertical-align: middle; margin: 3px; margin-top: -1px;" name = "imp_rename" id = "imp_rename" value = "1" $ { checked ( mylar . IMP_RENAME ) } > < label > Rename Files < / label >
< small > (After importing, Rename the files to configuration settings)< / small >
< label > ${mylar.FOLDER_FORMAT}/${mylar.FILE_FORMAT}< / label >
< / div >
%endif
2013-02-06 19:55:23 +00:00
< div class = "row checkbox" >
< input type = "checkbox" style = "vertical-align: middle; margin: 3px; margin-top: -1px;" name = "imp_metadata" id = "imp_metadata" value = "1" $ { checked ( mylar . IMP_METADATA ) } > < label > Use Existing Metadata< / label >
< small > (Use existing Metadata to better locate series for import)< / small >
< / div >
< / fieldset >
IMP: Added ForceRSS Check and Test SABnzbd Connection buttons in Config, FIX: If Annuals not enabled, would error on home screen, IMP: updated mylar.init.d (thnx Kalinon), FIX: Manual Post-Processing fix for Manual Run (thnx Kalinon), IMP: Library Monitor working (check folder every X minutes and Post-Process), IMP: Future Upcoming introduction, IMP: Experimental search better handling of year inclusions, FIX: Filechecker will now pick up series with years in the series title accordingly, FIX: Torrent seedbox sending would lockup occassionally when attempting to send torrent file, FIX: malformed image url on some series, IMP: Moved issue updating to a seperate function, IMP: When series was refreshed, would download the last issue (or few issues depending on date), regardless of status, IMP: When series is volume 1 or volume label doesn't exist, either assume V1 or remove volume requirements to improve matching hits, IMP: StoryArcs will now check in StoryArc folder for existing issues and change status in StoryArc accordingly...
2013-11-28 15:48:59 +00:00
< / span >
2013-01-28 20:31:43 +00:00
< / tr >
< / table >
2013-02-06 19:55:23 +00:00
< / div >
2013-05-19 05:21:32 +00:00
< form action = "markImports" method = "get" id = "markImports" >
2013-02-06 19:55:23 +00:00
< div id = "markcomic" >
2013-05-19 05:21:32 +00:00
< select name = "action" onChange = "doAjaxCall('markImports',$(this),'table',true);" data-error = "You didn't select any comics" >
2013-02-06 19:55:23 +00:00
< option disabled = "disabled" selected = "selected" > Choose...< / option >
2013-05-19 05:21:32 +00:00
< option value = "massimport" > Start Import< / option >
< option value = "removeimport" > Remove< / option >
2013-02-06 19:55:23 +00:00
< / select >
< input type = "hidden" value = "Go" >
< / div >
< table class = "display" id = "impresults_table" >
IMP: Cleaned up interface for StoryArcs / Story Arc Details, IMP: Cleaned up interface for Reading list Management, IMP: Added better reading list management - new status (added, downloaded, read), IMP: Added sync option for use with another device for reading list transfer (ie. tablet) Android only, IMP: Autopopulate new weekly pull releases to reading list, IMP: 'Watch' option in weekly pull list now fully functional. Will watch CV for series' that do not have any series data yet as they are new starting series. Will auto-add once available, IMP: Auto-watch check is run after every refresh/recreate of the weeklypull list, IMP: Improved the Add a Series option where it will now look for issues that are 'new' or 'wanted' during add sequence, IMP: Main page interface now has coloured have/total bars to denote series completion, IMP: New scheduler / threading locks in place in an attempt to avoid database locks, FIX: Removed some erroneous locking that was going on when importing a directory was being run, IMP: Stat counter now present when post-processing multiple issues in sequence, FIX: for issue number error when post-processing and issue number was a non-alphanumeric, FIX: for metatagging: when original file was .cbz, would try to convert and fail, FIX: for issues that were negative and were preceeded by a # in the filename (filechecker), FIX: for publisher having non-alphanumeric character in name when attempting to determine publisher, FIX: if annuals enabled, would incorrectly show as being 'already in library' when viewing search results if results constained annuals, FIX:(#944) for incorrect nzbname being used when post-processing was being performed from an nzb client (experimental mainly), IMP: Turned off logging for ComicVine API counter, FIX: Added retry attempts when connecting to ComicVine in order to avoid errors when adding a series, IMP:(#963) Added ability to add snatched to filter when viewing Wanted issues on Wanted tab, FIX: When importing and then selecting a series to import via the select screen, will now flip back to the importresults and add the selected series in the background, IMP:(#952) Main page is now sorted in ascending order by Continuing/Ended status (and subbed by whether is Active/Paused).Custom sorting is still available, FIX: Dupecheck will now automatically assume existing 0-byte files are to be overwritten when performing post-processing, FIX: If publication date for series contained a '?' (usually with brand new series) will force to 'Present' to allow for pull-list comparisons to take place, FIX: Mylar will now disallow search results which have 'covers only' or 'variant' in the filename, IMP: Better nzbname generation/retrieval (will check inside nzb for possible names) to be used when post-processing, IMP: DB Update will now perform update to all active comics in descending order by Latest Date (instead of random order), FIX: Enforce the 5hr limit rule when running DB update (will only update series that haven't been updated in >5 hours), FIX: Annuals will now have/retain the proper status upon doing DB Update, FIX: Have totals will now be updated when doing a recheck files (sometimes wouldn't get updated depending on various states of status'), FIX:(#966) Added urllib2.URLError exeception trap when attempting to check Git for updates, IMP: Removed the individual sqlite calls for weeklypull, and brought them into line with using the db module (which will minimize concurrent access, which seemed to be causing db locks), IMP: Cleaned up some code and shuffled some functions so they are in more appropriate locations
2015-03-27 17:27:59 +00:00
< tr / > < tr / >
2015-01-16 19:40:08 +00:00
< tr > < center > < h3 > To be Imported< / h3 > < / center > < / tr >
2013-01-28 20:31:43 +00:00
< thead >
< tr >
2013-02-06 19:55:23 +00:00
< th id = "select" > < / th >
2013-01-28 20:31:43 +00:00
< th id = "comicname" > Comic Name< / th >
2013-02-06 19:55:23 +00:00
< th id = "comicyear" > Year< / th >
2013-02-25 15:36:43 +00:00
< th id = "issues" > Issues< / th >
2013-02-06 19:55:23 +00:00
< th id = "status" > Status< / th >
2013-01-28 20:31:43 +00:00
< th id = "importdate" > Import Date< / th >
< th id = "addcomic" > Options< / th >
< / tr >
< / thead >
< tbody >
2015-01-16 19:40:08 +00:00
%if results:
%for result in results:
IMP: Removed unneeded code from several modules, IMP:(#659) Subdirectories now will be scanned in properly when in series directories, FIX:(#635)(#658) Moved code from html into module to allow for better integration and further templating needs, IMP: Added ability for mylar to auto-grab SABnzbd API when provided with user/pass, IMP: Test SABnzbd button works again - will auto-rollback to NZBKey usage, IMP: Added counts to Upcoming page, IMP: Added some more detailed parsing to the ImportResults, IMP: ImportResults will now show proper series title, IMP: Improved some logic when determining if a new weekly issue is on a watchlist if a rebooted series, IMP: A bunch of smaller fixes, and some various code tweaks...
2014-04-02 19:08:59 +00:00
< %
if result['DisplayName'] is None:
displayname = result['ComicName']
else:
displayname = result['DisplayName']
endif
%>
2015-01-16 19:40:08 +00:00
< tr >
< td id = "select" > < input type = "checkbox" style = "vertical-align: middle; margin: 3px; margin-top: -1px;" name = "${result['ComicName']}" value = "${result['ComicName']}" class = "checkbox" / >
< td id = "comicname" > ${displayname}< / td >
< td id = "comicyear" > < title = " $ { result [ ' ComicYear ' ] } " > ${result['ComicYear']}< / td >
< td id = "comicissues" > < title = " $ { result [ ' IssueCount ' ] } " > ${result['IssueCount']}< / td >
< td id = "status" >
%if result['ComicID']:
< a href = "comicDetails?ComicID=${result['ComicID']}" > ${result['Status']}< / a >
%else:
${result['Status']}
%endif
%if result['WatchMatch'] is not None:
< img src = "interfaces/default/images/green-circle.png" height = "10" width = "10" / >
%endif
< / td >
< td id = "importdate" > ${result['ImportDate']}< / td >
< td id = "addcomic" >
%if result['Status'] == 'Not Imported':
[< a href = "#" title = "Import ${result['ComicName']} into your watchlist" onclick = "doAjaxCall('preSearchit?ComicName=${result['ComicName']| u}&displaycomic=${displayname}| u}',$(this),'table')" data-success = "Imported ${result['ComicName']}" > Import< / a > ]
%endif
[< a href = "deleteimport?ComicName=${result['ComicName']}" > Remove< / a > ]
%if result['implog'] is not None:
[< a class = "showlog" title = "Display the Import log for ${result['ComicName']}" href = "importLog?ComicName=${result['ComicName'] |u}&SRID=${result['SRID']}" > Log< / a > ]
%endif
%if result['SRID'] is not None and result['Status'] != 'Imported':
[< a title = "Manual intervention is required - more than one result when attempting to import" href = "importresults_popup?SRID=${result['SRID']}&ComicName=${result['ComicName'] |u}&imported=yes&ogcname=${result['ComicName'] |u}" > Select< / a > ]
%endif
< / td >
< / tr >
%endfor
%else:
< tr >
< td colspan = "6" >
< center > < legend > There are no results to display< / legend > < / center >
2013-02-13 01:27:24 +00:00
< / td >
2015-01-16 19:40:08 +00:00
< / tr >
%endif
< / tbody >
< / table >
2013-05-19 05:21:32 +00:00
< / form >
2013-02-13 01:27:24 +00:00
2013-01-28 20:31:43 +00:00
< / div >
< /%def>
< %def name="javascriptIncludes()">
2013-02-13 01:27:24 +00:00
2013-05-25 06:18:00 +00:00
< script type = "text/javascript" >
$('.showlog').click(function (event) {
var width = 575,
height = 400,
left = ($(window).width() - width) / 2,
top = ($(window).height() - height) / 2,
url = this.href,
opts = 'status=1' +
',width=' + width +
',height=' + height +
',top=' + top +
',left=' + left;
window.open(url, 'twitte', opts);
return false;
});
< / script >
2013-02-13 01:27:24 +00:00
< script >
function initThisPage() {
jQuery( "#tabs" ).tabs();
initActions();
};
$(document).ready(function() {
initThisPage();
});
< / script >
2013-01-28 20:31:43 +00:00
< /%def>