Merge branch 'python3-dev'

IMP: changed Toggle Verbose button to (Enable / Disable) Debug Logging depending on logging level enabled IMP: added Clear All Specific Logs to Exceptions/Tracebacks option IMP: search-4-missing option added to series detail IMP: +mark option added for watchlisted series that have issues in a Skipped status on weeklypull IMP: series issues in Skipped status on the weeklypull colour-graded now IMP: allow metatagging to write out reading order sequence when dealing with multiple arcs IMP: option to toggle cherrypy logging via the config.ini (cherrypy_logging) FIX: CDATA element being returned by CV for Issue_Number results in error FIX: remove Add All to ReadingList option from series detail page (due to space) FIX: series issues in Skipped status on the weeklypull color graded now FIX: catch invalid name when deleting series via Delete Series FIX: correct some invalid css FIX: adjust column layouts for better fit on index page FIX: (#869) Unable to clear Failed downloads that have no ID value present FIX: RSS scheduled job was always in a running status, even if it was not FIX: corrected user-agent url FIX: downloading non-watchlisted arc issues would fail to be detected if items were not within a folder (ie. just a file) FIX: remove defunt deferrer usage and replace with inline FIX: unbalanced paranthesis error when using DDL and results include a pack FIX: DDL not being able to properly reference link FIX: newznab test option would incorrectly append api endpoint in some situations FIX: reworked newznab api url in search to better detect url's with api endpoint already included FIX: allow for enclosures URL as opposed to just using link field in provider response FIX: DBUpdater would not run every backfill_timespan interval (default 10 minutes) when updating large backlog queue FIX: Status' not indicated as Running in Activity/Jobs tab FIX: if the db updater was trying to backfill dates that fell within the problem dates array, would fail to compare and not update anything
mylar3 · Sep 5, 2021 · 56a8469 · 56a8469
2 parents ed81262 + f0367cf
commit 56a8469
Show file tree

Hide file tree

Showing 21 changed files with 407 additions and 171 deletions.
diff --git a/Mylar.py b/Mylar.py
@@ -341,6 +341,7 @@ def main():
         'http_password': mylar.CONFIG.HTTP_PASSWORD,
         'authentication': mylar.CONFIG.AUTHENTICATION,
         'login_timeout': mylar.CONFIG.LOGIN_TIMEOUT,
+        'cherrypy_logging': mylar.CONFIG.CHERRYPY_LOGGING,
         'opds_enable': mylar.CONFIG.OPDS_ENABLE,
         'opds_authentication': mylar.CONFIG.OPDS_AUTHENTICATION,
         'opds_username': mylar.CONFIG.OPDS_USERNAME,

diff --git a/data/interfaces/carbon/css/data_table.css b/data/interfaces/carbon/css/data_table.css
@@ -296,11 +296,19 @@ table.display tr.even.gradeC {
 }
 
 table.display tr.even.gradeE {
-	background-color: #F96178;
+	background-color: #444b54;
 }
 
 table.display tr.odd.gradeE {
-	background-color: #F96178;
+	background-color: #444b54;
+}
+
+table.display tr.even.gradeG {
+        background-color: #0A0A0A;
+}
+
+table.display tr.odd.gradeG {
+        background-color: #0A0A0A;
 }
 
 table.display tr.even.gradeH {
@@ -311,6 +319,14 @@ table.display tr.odd.gradeH {
         background-color: #ae3431;
 }
 
+table.display tr.odd.gradeI {
+        background-color: #216f70;
+}
+
+table.display tr.even.gradeI {
+        background-color: #216f70;
+}
+
 table.display tr.even.gradeL {
 	background-color: #1c5188;
 }
@@ -357,6 +373,7 @@ table.display tr.odd.gradeZ {
 table.display tr.even.gradeZ {
 	-background-color: #2e3338;
 }
+
 table.display tr.odd.gradeT {
         background-color: #bd915a;
 }
@@ -394,7 +411,9 @@ table.display tr.gradeA td,
 table.display tr.gradeB td,
 table.display tr.gradeC td,
 table.display tr.gradeE td,
+table.display tr.gradeG td,
 table.display tr.gradeH td,
+table.display tr.gradeI td,
 table.display tr.gradeL td,
 table.display tr.gradeX td,
 table.display tr.gradeU td,
@@ -439,11 +458,19 @@ table.display_no_select tr.even.gradeC {
 }
 
 table.display_no_select tr.even.gradeE {
-        background-color: #F96178;
+        background-color: #444b54;
 }
 
 table.display_no_select tr.odd.gradeE {
-        background-color: #F96178;
+        background-color: #444b54;
+}
+
+table.display_no_select tr.even.gradeG{
+        background-color: #0A0A0A;
+}
+
+table.display_no_select tr.odd.gradeG {
+        background-color: #0A0A0A;
 }
 
 table.display_no_select tr.even.gradeH{
@@ -454,12 +481,12 @@ table.display_no_select tr.odd.gradeH {
         background-color: #ae3431;
 }
 
-table.display_no_select tr.even.gradeL {
-        background-color: #ebf5ff;
+table.display_no_select tr.even.gradeI {
+        background-color: #216f70;
 }
 
-table.display_no_select tr.odd.gradeL {
-        background-color: #ebf5ff;
+table.display_no_select tr.odd.gradeI {
+        background-color: #216f70;
 }
 
 table.display_no_select tr.odd.gradeX {
@@ -542,7 +569,9 @@ table.display_no_select tr.gradeL #status {
 table.display_no_select tr.gradeA td,
 table.display_no_select tr.gradeC td,
 table.display_no_select tr.gradeE td,
+table.display_no_select tr.gradeG td,
 table.display_no_select tr.gradeH td,
+table.display_no_select tr.gradeI td,
 table.display_no_select tr.gradeL td,
 table.display_no_select tr.gradeX td,
 table.display_no_select tr.gradeU td,

diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html
@@ -25,6 +25,7 @@
                             <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), 'table');"  data-success="${comic['ComicName']} is being rescanned">Recheck Files</a>
+                            <a id="menu_link_searchmissing" onclick="doAjaxCall('searchformissing?ComicID=${comic['ComicID']}', $(this), 'table');" href="#" data-success="Now queueing missing items for ${comic['ComicName']}" title="Search for all issues that are in either a Skipped or Wanted status">Search-4-Missing</a>
                         %if mylar.CONFIG.ENABLE_META:
                             <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
@@ -36,8 +37,9 @@
                         %if annuals:
                                 <a id="menu_link_delete" href="annualDelete?comicid=${comic['ComicID']}">Delete Annuals</a>
                         %endif
-
+<!--
                         <a id="menu_link_addalltoRL" href="#" class="menu_link_addalltoRL">Add All to Readinglist</a>
+-->
 		</div>
 	</div>
 </%def>

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
@@ -87,7 +87,11 @@ <h1 class="clearfix"><img src="${icons['icon_gear']}" alt="settings"/>Settings</
                             by buying me a coffee (or several)</strong></label></br></br>
                          </div>
                          <div style="width: 60%; margin: 0px auto;" align="center">
-                            <a id="navDonate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=EWQADB5AMVRFU" rel="noreferrer" onclick="window.open('http://dereferer.org/?' + this.href); return false;"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" alt="[donate]" /></a>
+                            <%
+                                   pline = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=EWQADB5AMVRFU"
+                                   bline = 'data:text/html;charset=utf-8, <html><meta http-equiv="refresh" content="0;URL=&#39;${pline}&#39;"></html>'
+                            %>
+                            <a id="navDonate" rel="noreferrer" onclick="window.open('${pline}');return false" href='${bline}'><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" alt="[donate]" /></a>
                             <a href="#" onclick="javascript:window.prompt('Please copy/paste my Bitcoin address into your Bitcoin client.', '18eCE9wZxnNiZgE4Cc5pwJMnMjEfhdmH4U');"><img src="images/bitcoin.png" alt="Bitcoin" height="20" align="center"></a></div>
                          </div>
                    </fieldset>

diff --git a/data/interfaces/default/css/data_table.css b/data/interfaces/default/css/data_table.css
@@ -280,21 +280,37 @@ table.display tr.even.gradeC {
 }
 
 table.display tr.even.gradeE {
-	background-color: #F96178;
+	background-color: #444b54;
 }
 
 table.display tr.odd.gradeE {
-	background-color: #F96178;
+	background-color: #444b54;
 }
 
 table.display tr.even.gradeH {
         background-color: #FFF5CC;
 }
 
+table.display tr.even.gradeG {
+        background-color: #0A0A0A;
+}
+
+table.display tr.odd.gradeG {
+        background-color: #0A0A0A;
+}
+
 table.display tr.odd.gradeH {
         background-color: #FFF5CC;
 }
 
+table.display tr.odd.gradeI {
+        background-color: #216f70;
+}
+
+table.display tr.even.gradeI {
+        background-color: #216f70;
+}
+
 table.display tr.even.gradeL {
 	background-color: #ebf5ff;
 }
@@ -341,6 +357,7 @@ table.display tr.odd.gradeZ {
 table.display tr.even.gradeZ {
 	background-color: white;
 }
+
 table.display tr.odd.gradeT {
         background-color: #F9CBE6;
 }
@@ -378,7 +395,9 @@ table.display tr.gradeL #status {
 table.display tr.gradeA td,
 table.display tr.gradeC td,
 table.display tr.gradeE td,
+table.display tr.gradeG td,
 table.display tr.gradeH td,
+table.display tr.gradeI td,
 table.display tr.gradeL td,
 table.display tr.gradeX td,
 table.display tr.gradeU td,
@@ -415,11 +434,19 @@ table.display_no_select tr.even.gradeC {
 }
 
 table.display_no_select tr.even.gradeE {
-        background-color: #F96178;
+        background-color: #444b548;
 }
 
 table.display_no_select tr.odd.gradeE {
-        background-color: #F96178;
+        background-color: #444b54;
+}
+
+table.display_no_select tr.even.gradeG{
+        background-color: #0A0A0A;
+}
+
+table.display_no_select tr.odd.gradeG {
+        background-color: #0A0A0A;
 }
 
 table.display_no_select tr.even.gradeH{
@@ -430,6 +457,14 @@ table.display_no_select tr.odd.gradeH {
         background-color: #FFF5CC;
 }
 
+table.display_no_select tr.even.gradeI {
+        background-color: #216f70;
+}
+
+table.display_no_select tr.odd.gradeI {
+        background-color: #216f70;
+}
+
 table.display_no_select tr.even.gradeL {
         background-color: #ebf5ff;
 }
@@ -518,7 +553,9 @@ table.display_no_select tr.gradeL #status {
 table.display_no_select tr.gradeA td,
 table.display_no_select tr.gradeC td,
 table.display_no_select tr.gradeE td,
+table.display_no_select tr.gradeG td,
 table.display_no_select tr.gradeH td,
+table.display_no_select tr.gradeI td,
 table.display_no_select tr.gradeL td,
 table.display_no_select tr.gradeX td,
 table.display_no_select tr.gradeU td,

diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
@@ -38,6 +38,9 @@
         function initThisPage() {
             initActions();
             $('#series_table').dataTable( {
+                "preDrawCallback": function (settings){
+                    pageScrollPos = $('#series_table div.datatables_scrollBody').scrollTop();
+                },
                 "sDom": '<"clear"f><"clear"lp><"clear">rt<"clear"ip>',
                 "processing": true,
                 "serverSide": true,
@@ -50,7 +53,7 @@
                        "render":function (data,type,full) {
                            if (full[0]){
                                if (full[0].length > 20){
-                                   cb = '<span title="' + full[0] + '"></span>'+full[0].slice(0,20)+"...";
+                                   cb = '<span title="' + full[0] + '"></span>'+full[0].slice(0,17)+'...';
                                } else {
                                    cb = '<span title="' + full[0] + '"></span>'+full[0];
                                }
@@ -76,8 +79,8 @@
                             } else {
                                 bt = '';
                             }
-                            if (full[0]){
-                               if (full[0].length > 55){
+                            if (full[1]){
+                               if (full[1].length > 55){
                                  cn = full[1].slice(0,55)+"...";
                                } else {
                                  cn = full[1];
@@ -93,7 +96,16 @@
                        "targets": [ 3 ],
                        "visible": true,
                        "render":function (data,type,full) {
-                            return '# ' + full[3];
+                            if (full[3]){
+                               if (full[3].length == 5){
+                                 cn = full[3];
+                               } else if (full[3].length > 5){
+                                 cn = '<span title="#'+full[3]+'">#</span>';
+                               } else {
+                                 cn = '#' + full[3];
+                               }
+                               return cn;
+                            }
                        }
                     },
                     {
@@ -175,7 +187,7 @@
                  },
                  "drawCallback": function (o) {
                      // Jump to top of page
-                     $('html,body').scrollTop(0);
+                     $('#series_table div.dataTables_scrollBody').scrollTop(pageScrollPos);
                  },
                  "serverData": function ( sSource, aoData, fnCallback ) {
                             /* Add some extra data to the sender */
@@ -191,9 +203,6 @@
         $(document).ready(function(){
             initThisPage();
         });
-	$(window).load(function(){
-	    initFancybox();
-	});
 	</script>
 
 </%def>
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
@@ -8,15 +8,10 @@
     <div id="subhead_container">
         <div id="subhead_menu">
             <a id="menu_link_delete" href="#" onclick="doAjaxCall('clearLogs',$(this),'table')" data-success="All logs cleared">Clear Log</a>
-            <a id="menu_link_edit" href="toggleVerbose">Toggle Debug Logging
-            %if mylar.LOG_LEVEL < 2:
-              ON 
-            %else:
-              OFF
-            %endif
-            </a>
+            <a id="menu_link_searchmissing" href="toggleVerbose"><span id="toggle_check"></span></a>
                         <a id="menu_link_edit" title="Manage Exceptions" href="javascript:void(0)" onclick="manageTheExceptions()">Exceptions / Tracebacks</a>
                         <div id="manage_exceptions_dialog" title="View currently logged tracebacks / exceptions" style="display:none">
+                            <input type="button" id="delete_all_specific" value="Clear ALL Specific Logs" style="padding:5px;float:right;position:relative;" />
                             <input id="listview" value="${icons['listview_icon']}" style="display:none;" />
                             <input id="delete" value="${icons['delete_icon']}" style="display:none;" />
                             <input id="deleteall" value="${icons['deleteall_icon']}" style="display:none;" />
@@ -138,6 +133,24 @@ <h1 class="clearfix"><img src="images/icon_logs.png" alt="Logs"/>Logs</h1>
         }
         </script>
         <script>
+        $('#delete_all_specific').click(function () {
+           var tt = 'all';
+           $.ajax({
+                url: "deleteSpecificLog",
+                data: { allspecific: tt },
+                success: function (data) {
+                   var obj = JSON.parse(data);
+                   if (obj['status'] == 'success'){
+                       $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>"+obj['message']+"</div>");
+                       $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
+                   }
+                }
+           }).done(function() {
+                var ltable = $('table.display_log').DataTable();
+                ltable.ajax.reload(null,false);
+           });
+        });
+
         function delete_log(log_id, all) {
             if (log_id == undefined) {
                 log_id = document.getElementById("log_id").value;
@@ -213,8 +226,18 @@ <h1 class="clearfix"><img src="images/icon_logs.png" alt="Logs"/>Logs</h1>
             $("#deleteConfirm").dialog({modal: true});
         }
 
+        function checkloglevel(){
+            var loglevel = "${log_level}";
+            if (loglevel != 2){
+                document.getElementById("toggle_check").innerHTML = 'Enable Debug Logging';
+            } else {
+                document.getElementById("toggle_check").innerHTML = 'Disable Debug Logging';
+            }
+        }
+
         $(document).ready(function() {
             initActions();
+            checkloglevel();
             $('#log_table').dataTable( {
                     "bProcessing": true,
                     "bServerSide": true,

diff --git a/data/interfaces/default/managefailed.html b/data/interfaces/default/managefailed.html
@@ -42,8 +42,13 @@ <h1 class="clearfix">Manage Failed Downloads</h1>
 		</thead>
 		<tbody>
 		%for f in failed:
+                        <%
+                            f_id = f['ID']
+                            if any([f_id is None, f_id == '']):
+                                f_id = '%s##%s##%s##%s' % (f['IssueID'],f['Provider'],f['FileName'],f['DateFailed'])
+                        %>
 			<tr>
-				<td id="select"><input type="checkbox" name="${f['ID']}" class="checkbox" /></td>
+				<td id="select"><input type="checkbox" name="${f_id}" class="checkbox" /></td>
 				<td id="series"><a href="comicDetails?ComicID=${f['ComicID']}">${f['Series']}</td>
 				<td id="issue">${f['Issue_Number']}</td>
 				<td id="site">${f['Provider']}</td>