2012-09-13 15:27:34 +00:00
|
|
|
<%inherit file="base.html" />
|
|
|
|
|
|
|
|
<%def name="headerIncludes()">
|
|
|
|
<div id="subhead_container">
|
|
|
|
<div id="subhead_menu">
|
|
|
|
<a href="#" id="menu_link_scan" onclick="doAjaxCall('forceSearch',$(this))" data-success="Checking for wanted issues successful" data-error="Error checking wanted issues">Force Check</a>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</%def>
|
|
|
|
|
|
|
|
|
|
|
|
<%def name="body()">
|
|
|
|
|
|
|
|
<div class="title">
|
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
|
|
|
<h1 class="clearfix"><img src="interfaces/default/images/icon_wanted.png" alt="Wanted Issues"/>Wanted Issues (${wantedcount})</h1>
|
2012-09-13 15:27:34 +00:00
|
|
|
</div>
|
|
|
|
<form action="markissues" method="get" id="markissues">
|
|
|
|
<div id="markissue" style="top:0;">
|
|
|
|
Mark selected issues as
|
|
|
|
<select name="action" onChange="doAjaxCall('markissues',$(this),'table',true);" data-error="You didn't select any issues" data-success="selected issues marked">
|
|
|
|
<option disabled="disabled" selected="selected">Choose...</option>
|
|
|
|
<option value="Skipped">Skipped</option>
|
|
|
|
<option value="Downloaded">Downloaded</option>
|
|
|
|
</select>
|
|
|
|
<input type="hidden" value="Go">
|
|
|
|
</div>
|
|
|
|
<div class="table_wrapper" id="wanted_table_wrapper" >
|
|
|
|
<table class="display" id="wanted_table">
|
|
|
|
<thead>
|
|
|
|
<tr>
|
|
|
|
<th id="select"><input type="checkbox" onClick="toggle(this)" /></th>
|
|
|
|
<th id="comicname">Comic</th>
|
|
|
|
<th id="issuenumber">Issue</th>
|
|
|
|
<th id="reldate">Release Date</th>
|
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
%for issue in issues:
|
|
|
|
<tr class="gradeZ">
|
2013-02-06 19:55:23 +00:00
|
|
|
<td id="select"><input type="checkbox" name="${issue['IssueID']}" class="checkbox" /></td>
|
2013-07-30 04:57:37 +00:00
|
|
|
<td id="comicname"><a href="comicDetails?ComicID=${issue['ComicID']}">
|
|
|
|
<%
|
|
|
|
if any(d['IssueID'] == str(issue['IssueID']) for d in ann_list):
|
|
|
|
adjcomicname = issue['ComicName'] + ' Annual'
|
|
|
|
else:
|
|
|
|
adjcomicname = issue['ComicName']
|
|
|
|
endif
|
|
|
|
%>
|
|
|
|
${adjcomicname}</a></td>
|
|
|
|
<td id="issuenumber">${issue['Issue_Number']}</td>
|
2012-09-13 15:27:34 +00:00
|
|
|
<td id="reldate">${issue['IssueDate']}</td>
|
|
|
|
</tr>
|
|
|
|
%endfor
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
|
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
<div class="title">
|
|
|
|
<h1 class="clearfix"><img src="interfaces/default/images/icon_upcoming.png" alt="Upcoming Issues"/>Upcoming Issues</h1>
|
|
|
|
</div>
|
2014-03-19 19:07:25 +00:00
|
|
|
|
|
|
|
<div id="tabs">
|
|
|
|
<ul>
|
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
|
|
|
<li><a href="#tabs-1">This Week's Upcoming (${upcoming_count})</a></li>
|
2014-03-19 19:07:25 +00:00
|
|
|
<li><a href="#tabs-2">Upcoming nodata</a></li>
|
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
|
|
|
<li><a href="#tabs-3">Future Upcoming (${futureupcoming_count})</a></li>
|
2014-03-19 19:07:25 +00:00
|
|
|
</ul>
|
|
|
|
|
|
|
|
<div id="tabs-1">
|
|
|
|
|
|
|
|
|
2012-09-13 15:27:34 +00:00
|
|
|
<div class="table_wrapper">
|
|
|
|
<table class="display_no_select" id="upcoming_table">
|
2014-03-19 19:07:25 +00:00
|
|
|
%if upcoming:
|
|
|
|
<thead>
|
|
|
|
<tr>
|
|
|
|
<th id="comicname">Comic</th>
|
|
|
|
<th id="issuenumber">Issue</th>
|
|
|
|
<th id="reldate">Release Date</th>
|
|
|
|
<th id="status">Status</th>
|
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
%for upcome in upcoming:
|
|
|
|
<tr class="gradeZ">
|
|
|
|
<td id="comicname"><a href="comicDetails?ComicID=${upcome['ComicID']}">${upcome['DisplayComicName']}</a></td>
|
|
|
|
<td id="issuenumber">${upcome['IssueNumber']}</td>
|
|
|
|
<td id="reldate">${upcome['IssueDate']}</td>
|
|
|
|
<td id="status">${upcome['Status']}</td>
|
|
|
|
</tr>
|
|
|
|
%endfor
|
|
|
|
</tbody>
|
|
|
|
%else:
|
|
|
|
<tr><td align="center" width="100%"> no upcoming data to display</td></tr>
|
|
|
|
%endif
|
2012-09-13 15:27:34 +00:00
|
|
|
</table>
|
|
|
|
</div>
|
2014-03-19 19:07:25 +00:00
|
|
|
</div>
|
|
|
|
<div id="tabs-2">
|
IMP: Ability to now specify search provider order (regardless of torrents or nzb) within the config.ini, IMP: (#667) Changed the db module to try to accomodate db locking errors and lowering the amount of actual write transactions that were committed along with a new scheduler system, IMP: Changed sabnzbd directory to post-processing, and included subdirs for sabnzbd & nzbget ComicRN scripts, IMP: NZBGet Post-Processing ComicRN.py script (updated for use with nzbget v11.0+)added & updated in post-processing/nzbget directory (thnx ministoat), FIX: If Issue Location was None, and status was Downloaded would cause error in GUI and break series, IMP: (#689) Minimum # of seeders added (will work with KAT), IMP: (#680) Added Boxcar 2 IO Notifications, IMP: Added PushBullet Notifications, IMP: Cleaned up some notification messages so it's not so cluttered, IMP: Added Clickable series link in History tab, IMP: Added Post-Processed as a status to History tab to show manually post-processed items, IMP: Removed log level dropdown from Logs page & added 'ThreadName' as a column, IMP: Added Force Check Availability & View Future Pull-list to Upcoming sub-tabs, IMP: Added '--safe' option to startup options which will redirect directly to Manage Comics screen incase things are broken, FIX: Added proper month conversions for manual post-processing when doing comparitive issue analysis for matches, FIX: (#613) Allow for negative issue numbers in post-processing when renaming and issue padding is enabled, FIX: File Permissions on post-processing would stop post-processing if couldn't change, now will just log the error and continue, IMP: Added Scheduler (from sickbeard) to allow for threadnaming and better scheduling, IMP: Filenames in the format of ' () ' will now get scanned in, IMP: During manual post-processing will now stop looking for matches upon a successful match, IMP: A Refresh/Weeklypull series check will now just scan in issue data, instead of series info,etc, IMP: Removed some legacy GCD code that is no longer in use, IMP: Exception/traceback handling will now be logged, FIX: Unable to grab torrents from KAT due to content-encoding detection failing, IMP: Added universal date-time conversion to allow for non-english based dates to be properly compared when checking search results against publication dates, FIX: Annuals will now get proper notification (prior was leaving out the word 'annual' from notification/logs), IMP: Improved future pull-list detection and increased retension (now ~5 months), IMP: Will now mark new issues as Wanted on a Refresh Series if autowant upcoming is enabled (was reverting to a status of None previously), IMP: Cannot change status to Downloaded if current status is Skipped or Wanted, FIX: (#704) UnSkipped will now work (X in options column on comic details page), IMP: future_check will check upcoming future issues (future pull-list) that have no series data yet (ie. #1's) and auto-add them to watchlist when the data is available and auto-want accordingly, IMP: (#706) Downloading issues to local machine (via comicdetails screen) with special characters in filename now will work, IMP: improved comparison checks during weekly pull list and improved speed abit since only refreshing issue data now instead of entire series, Other Referenced issues: (#670)(#690) and some others....
2014-05-25 18:32:11 +00:00
|
|
|
<a id="menu_link_edit" href="force_check">Force Check Availability</a>
|
2014-03-19 19:07:25 +00:00
|
|
|
<div class="table_wrapper">
|
|
|
|
<table class="display_no_select" id="upcoming_table">
|
|
|
|
%if future_nodata_upcoming:
|
|
|
|
<thead>
|
|
|
|
<tr>
|
|
|
|
<th id="comicname">Comic</th>
|
|
|
|
<th id="issuenumber">Issue</th>
|
|
|
|
<th id="reldate">Release Date</th>
|
|
|
|
<th id="status">Status</th>
|
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
%for f_nodata in future_nodata_upcoming:
|
|
|
|
<tr class="gradeZ">
|
|
|
|
<td id="comicname"><a href="comicDetails?ComicID=${f_nodata['ComicID']}">${f_nodata['ComicName']}</a></td>
|
|
|
|
<td id="issuenumber">${f_nodata['IssueNumber']}</td>
|
|
|
|
<td id="reldate">${f_nodata['IssueDate']}</td>
|
|
|
|
<td id="status">${f_nodata['Status']}</td>
|
|
|
|
</tr>
|
|
|
|
%endfor
|
|
|
|
</tbody>
|
|
|
|
%else:
|
|
|
|
<tr><td align='center" width="100%">no upcoming future data to display</td></tr>
|
|
|
|
%endif
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div id="tabs-3">
|
IMP: Ability to now specify search provider order (regardless of torrents or nzb) within the config.ini, IMP: (#667) Changed the db module to try to accomodate db locking errors and lowering the amount of actual write transactions that were committed along with a new scheduler system, IMP: Changed sabnzbd directory to post-processing, and included subdirs for sabnzbd & nzbget ComicRN scripts, IMP: NZBGet Post-Processing ComicRN.py script (updated for use with nzbget v11.0+)added & updated in post-processing/nzbget directory (thnx ministoat), FIX: If Issue Location was None, and status was Downloaded would cause error in GUI and break series, IMP: (#689) Minimum # of seeders added (will work with KAT), IMP: (#680) Added Boxcar 2 IO Notifications, IMP: Added PushBullet Notifications, IMP: Cleaned up some notification messages so it's not so cluttered, IMP: Added Clickable series link in History tab, IMP: Added Post-Processed as a status to History tab to show manually post-processed items, IMP: Removed log level dropdown from Logs page & added 'ThreadName' as a column, IMP: Added Force Check Availability & View Future Pull-list to Upcoming sub-tabs, IMP: Added '--safe' option to startup options which will redirect directly to Manage Comics screen incase things are broken, FIX: Added proper month conversions for manual post-processing when doing comparitive issue analysis for matches, FIX: (#613) Allow for negative issue numbers in post-processing when renaming and issue padding is enabled, FIX: File Permissions on post-processing would stop post-processing if couldn't change, now will just log the error and continue, IMP: Added Scheduler (from sickbeard) to allow for threadnaming and better scheduling, IMP: Filenames in the format of ' () ' will now get scanned in, IMP: During manual post-processing will now stop looking for matches upon a successful match, IMP: A Refresh/Weeklypull series check will now just scan in issue data, instead of series info,etc, IMP: Removed some legacy GCD code that is no longer in use, IMP: Exception/traceback handling will now be logged, FIX: Unable to grab torrents from KAT due to content-encoding detection failing, IMP: Added universal date-time conversion to allow for non-english based dates to be properly compared when checking search results against publication dates, FIX: Annuals will now get proper notification (prior was leaving out the word 'annual' from notification/logs), IMP: Improved future pull-list detection and increased retension (now ~5 months), IMP: Will now mark new issues as Wanted on a Refresh Series if autowant upcoming is enabled (was reverting to a status of None previously), IMP: Cannot change status to Downloaded if current status is Skipped or Wanted, FIX: (#704) UnSkipped will now work (X in options column on comic details page), IMP: future_check will check upcoming future issues (future pull-list) that have no series data yet (ie. #1's) and auto-add them to watchlist when the data is available and auto-want accordingly, IMP: (#706) Downloading issues to local machine (via comicdetails screen) with special characters in filename now will work, IMP: improved comparison checks during weekly pull list and improved speed abit since only refreshing issue data now instead of entire series, Other Referenced issues: (#670)(#690) and some others....
2014-05-25 18:32:11 +00:00
|
|
|
<a id="menu_link_edit" href="futurepulllist">View Future Pull-list</a>
|
2014-03-19 19:07:25 +00:00
|
|
|
<div class="table_wrapper">
|
|
|
|
<table class="display_no_select" id="upcoming_table">
|
|
|
|
%if futureupcoming:
|
|
|
|
<thead>
|
|
|
|
<tr>
|
|
|
|
<th id="comicname">Comic</th>
|
|
|
|
<th id="issuenumber">Issue</th>
|
|
|
|
<th id="reldate">Release Date</th>
|
|
|
|
<th id="status">Status</th>
|
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
%for f_upcome in futureupcoming:
|
|
|
|
<tr class="gradeZ">
|
|
|
|
<td id="comicname">${f_upcome['DisplayComicName']}</td>
|
|
|
|
<td id="issuenumber">${f_upcome['IssueNumber']}</td>
|
|
|
|
<td id="reldate">${f_upcome['IssueDate']}</td>
|
|
|
|
<td id="status">${f_upcome['Status']}</td>
|
|
|
|
</tr>
|
|
|
|
%endfor
|
|
|
|
</tbody>
|
|
|
|
%else:
|
|
|
|
<tr><td align="center" width="100%">no upcoming future data to display</td></tr>
|
|
|
|
%endif
|
|
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</div>
|
FIX:(#663) Weekly pull list would crash on issues with decimal places if series on watchlist, FIX: Error logging when performing search, FIX:(#662) Removed 'Test SABnzbd button' as was causing configuration saving issues. Can still be used by url : /SABtest, IMP: Added more logic checking to weeklypull list when comparing series for matches (to ensure an issue is part of a given series), IMP: Removed dead references to nzbx as a provider, FIX: If issue had no leading 0 in a decimal issue, mylar would crash, FIX: None status would occur when refreshing a series and more than one issue was being pulled in for data, IMP: When using manual post-processing, if issue date was near end/start of year issue comparison would fail. Comparison by month now added, FIX: file checking - if decimal in issue and no year present, would skip issue, FIX: manual post-processing - would fail/skip if no year provided for issue within filename, FIX: Manual Annual Add option will only be available if annuals_on=1 within the config.ini now
2014-04-07 16:20:05 +00:00
|
|
|
</div>
|
2012-09-13 15:27:34 +00:00
|
|
|
</%def>
|
|
|
|
|
|
|
|
<%def name="headIncludes()">
|
|
|
|
<link rel="stylesheet" href="interfaces/default/css/data_table.css">
|
|
|
|
</%def>
|
|
|
|
|
|
|
|
<%def name="javascriptIncludes()">
|
|
|
|
<script src="js/libs/jquery.dataTables.min.js"></script>
|
|
|
|
<script>
|
|
|
|
|
|
|
|
function initThisPage() {
|
2014-03-19 19:07:25 +00:00
|
|
|
$(function() {
|
|
|
|
$( "#tabs" ).tabs();
|
|
|
|
});
|
2012-09-13 15:27:34 +00:00
|
|
|
$('#wanted_table').dataTable({
|
|
|
|
"bDestroy":true,
|
|
|
|
"bFilter": false,
|
|
|
|
"bInfo": false,
|
|
|
|
"bPaginate": false
|
|
|
|
});
|
|
|
|
resetFilters("issues");
|
|
|
|
initActions();
|
|
|
|
}
|
|
|
|
$(document).ready(function() {
|
|
|
|
initThisPage();
|
|
|
|
});
|
|
|
|
</script>
|
|
|
|
</%def>
|