Merge branch 'python3-dev'

IMP: Add Queues section to Activity/Jobs tab (@OddBloke)
IMP: Support fetching all search results using pagination when using DDL (@OddBloke)
IMP: Handle literal-HTML descriptions which occasionally occur - DDL (@OddBloke)
IMP: Clean up dead code, unused variables/imports, large commented blocks of code (@OddBloke)
IMP: Remove unused ALLOW_PACKS configuration options (@OddBloke)
IMP: Update README to include domain name for documentation instead of wiki
FIX:(mylar3#1403) Fix call of sfs.checker when using DDL RSS search  (@OddBloke)
FIX:(mylar3#1396)(mylar3#1398) Align custom non-English logger functions with stdlib (@OddBloke)
FIX: Stop searching when first matching issue is found with DDL (@OddBloke)

README.md

@@ -1,17 +1,20 @@
 ## ![Mylar Logo](https://github.com/mylar3/mylar3/blob/master/data/images/mylarlogo.png) Mylar3
 
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/mylar3/mylar3?color=blue&label=current%20release&sort=semver)](https://github.com/mylar3/mylar3/releases)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/mylar3)](https://hub.docker.com/r/linuxserver/mylar3)
+
+[![Discord](https://img.shields.io/discord/826493118106697758?label=Discord&color=blue)](https://discord.gg/6UG94R7E8T)
+
 Mylar is an automated Comic Book (cbr/cbz) downloader program for use with NZB and torrents.
 
 Mylar allows you to create a watchlist of series that it monitors for various things (new issues, updated information, etc). It will grab, sort, and rename downloaded issues.
 It will also allow you to monitor weekly pull-lists for items belonging to said watchlisted series to download, as well as being able to monitor and maintain story-arcs.
 
-## Getting Started
-- [Installation](https://github.com/mylar3/mylar3/wiki/Installation-Instructions)
-- [Upgrading from evilhero/mylar](https://github.com/mylar3/mylar3/wiki/Upgrading-from-the-evilhero-version)
-- [IMPORTANT INFORMATION ABOUT ComicVine Data](https://github.com/mylar3/mylar3/wiki/Where-Mylar-gets-the-metadata-from)
-- [Wiki](https://github.com/mylar3/mylar3/wiki)
-- [FAQ](https://github.com/mylar3/mylar3/wiki/FAQ)
-- [API Documentation](https://github.com/mylar3/mylar3/wiki/API-Documentation)
+## Installation
+Install it via git clone or via [Docker](https://hub.docker.com/r/linuxserver/mylar3)
+
+## Documentation
+Check out our [website](https://mylarcomics.com) for documentation!
 
 ## Support & Discussion
 Please try to limit Github issues to bugs & enhancement requests ONLY
@@ -42,7 +45,7 @@ Please try to limit Github issues to bugs & enhancement requests ONLY
 AND SO MUCH MORE!
 
 ## Contributing
-If you wish to help out, please see the wiki: [contributing](https://github.com/mylar3/mylar3/wiki/Contributing)
+If you wish to help out, please see our website: [contributing](https://mylarcomics.com/docs/contributing)
 
 <p align="center">This project exists thanks to all the people who contribute - whether by code, assisting others or financial donations.</br> 
 To all those who have contributed, we thank you for your support.</p>

data/interfaces/default/manage.html

@@ -274,6 +274,39 @@ <h1 class="clearfix">Manage</h1>
                         </tbody>
            </table>
            </br><small><center>There could be up to a 60s delay in a given scheduler running due to other processes currently running</center></small>
+           <br/>
+           <table summary="Queue Status" width="100%" cellpadding="6px" cellspacing="2px">
+                      <legend><center><h1>Queues<h1><center></legend>
+                      <br />
+                        <thead>
+                           <tr border="1">
+                                <th style="width: 50px;text-align: center;">Queue Name</th>
+                                <th style="width: 50px;text-align: center;">Queue Length</th>
+                                <th style="width: 50px;text-align: center;">Worker Up/Down</th>
+                           </tr>
+                        </thead>
+                        <tbody>
+                           %for q_name, (is_up, length) in queues.items():
+                              <%
+                                    if is_up:
+                                        text = "Up"
+                                        grade = '#7AEE52'
+                                    elif is_up is not None:
+                                        text = "Down"
+                                        grade = '#EC7564'
+                                    else:
+                                        text = "Never Started"
+                                        grade = '#52A9EE'
+                               %>
+                              <tr>
+                                <td style="width: 50px;text-align: center;">${q_name}</td>
+                                <td style="width: 50px;text-align: center;">${length}</td>
+                                <td style="width: 50px;text-align: center;color:${grade}">${text}</td>
+                              </tr>
+                           %endfor
+                        </tbody>
+           </table>
+           </br><small><center>Workers are only started if your config requires them. The DDL worker can be restarted <a href="/queueManage">here</a>: other workers require a restart of Mylar to repair.</center></small>
         </div>
 
 

mylar/config.py

@@ -353,13 +353,11 @@
     'ENABLE_TORRENTS': (bool, 'Torrents', False),
     'ENABLE_TORRENT_SEARCH': (bool, 'Torrents', False),
     'MINSEEDS': (int, 'Torrents', 0),
-    'ALLOW_PACKS': (bool, 'Torrents', False),
     'ENABLE_PUBLIC': (bool, 'Torrents', False),
     'PUBLIC_VERIFY': (bool, 'Torrents', True),
 
     'ENABLE_DDL': (bool, 'DDL', False),
     'ENABLE_GETCOMICS': (bool, 'DDL', False),
-    'ALLOW_PACKS': (bool, 'DDL', False),
     'PACK_PRIORITY': (bool, 'DDL', False),
     'DDL_QUERY_DELAY': (int, 'DDL', 15),
     'DDL_LOCATION': (str, 'DDL', None),