frankieramirez
diff --git a/‎.github/workflows/deploy-docs.yml‎
Lines changed: 12 additions & 0 deletions b/‎.github/workflows/deploy-docs.yml‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Comicarr.py‎
Lines changed: 33 additions & 59 deletions b/‎Comicarr.py‎
Lines changed: 33 additions & 59 deletions
diff --git a/‎comicarr/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎comicarr/__init__.py‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,12 @@
+name: Trigger docs site deploy
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Cloudflare Pages deploy
+        run: curl -s -X POST "${{ secrets.CLOUDFLARE_DOCS_DEPLOY_HOOK }}"
@@ -58,6 +58,7 @@ AGENTS.md
 docs/plans/
 docs/solutions/
 docs/brainstorms/
+docs/ideation/
 
 # Pencil design files
 *.pen
 
@@ -134,10 +134,8 @@ def check_it(self):
     filechecker,
     logger,
     maintenance,
-    maintenance_webstart,
     dependency_check,
     versioncheck,
-    webstart,
 )
 
 import argparse
@@ -476,8 +474,12 @@ def main():
         loggermode = '[MAINTENANCE-MODE]'
         versioncheck.versionload()
 
-        # Try to start the server.
-        maintenance_webstart.initialize(maint_config)
+        # Try to start the maintenance server.
+        try:
+            from comicarr import maintenance_webstart
+            maintenance_webstart.initialize(maint_config)
+        except ImportError:
+            logger.warn('%s maintenance_webstart not available (CherryPy removed)' % loggermode)
 
         restart_method = True  #True will restart, False will shutdown.
 
@@ -541,8 +543,12 @@ def main():
 
         #restart automatically after maintenance has completed...
 
-        maintenance_webstart.shutdown()
-        logger.info('%s Maintenance webserver has been shut down.'% (loggermode))
+        try:
+            from comicarr import maintenance_webstart
+            maintenance_webstart.shutdown()
+            logger.info('%s Maintenance webserver has been shut down.'% (loggermode))
+        except (ImportError, NameError):
+            pass
         comicarr.shutdown(restart=restart_method, maintenance=True)
 
     # Force the http port if neccessary
@@ -552,37 +558,6 @@ def main():
     else:
         http_port = int(comicarr.CONFIG.HTTP_PORT)
 
-    # Check if pyOpenSSL is installed. It is required for certificate generation
-    # and for cherrypy.
-    if comicarr.CONFIG.ENABLE_HTTPS:
-        try:
-            import OpenSSL
-        except ImportError:
-            logger.warn("The pyOpenSSL module is missing. Install this " \
-                "module to enable HTTPS. HTTPS will be disabled.")
-            comicarr.CONFIG.ENABLE_HTTPS = False
-
-    # Try to start the server. Will exit here is address is already in use.
-    web_config = {
-        'http_port': http_port,
-        'http_host': comicarr.CONFIG.HTTP_HOST,
-        'http_root': comicarr.CONFIG.HTTP_ROOT,
-        'enable_https': comicarr.CONFIG.ENABLE_HTTPS,
-        'https_cert': comicarr.CONFIG.HTTPS_CERT,
-        'https_key': comicarr.CONFIG.HTTPS_KEY,
-        'https_chain': comicarr.CONFIG.HTTPS_CHAIN,
-        'http_username': comicarr.CONFIG.HTTP_USERNAME,
-        'http_password': comicarr.CONFIG.HTTP_PASSWORD,
-        'authentication': comicarr.CONFIG.AUTHENTICATION,
-        'login_timeout': comicarr.CONFIG.LOGIN_TIMEOUT,
-        'cherrypy_logging': comicarr.CONFIG.CHERRYPY_LOGGING,
-        'opds_enable': comicarr.CONFIG.OPDS_ENABLE,
-        'opds_authentication': comicarr.CONFIG.OPDS_AUTHENTICATION,
-        'opds_username': comicarr.CONFIG.OPDS_USERNAME,
-        'opds_password': comicarr.CONFIG.OPDS_PASSWORD,
-        'opds_pagesize': comicarr.CONFIG.OPDS_PAGESIZE,
-    }
-
     # Generate setup token if first-run setup is needed
     if not comicarr.CONFIG.HTTP_USERNAME or not comicarr.CONFIG.HTTP_PASSWORD:
         import secrets
@@ -591,9 +566,6 @@ def main():
         logger.info('[SETUP] Setup token: %s' % comicarr.SETUP_TOKEN)
         logger.info('[SETUP] Provide this token when setting up credentials via the web interface.')
 
-    # Try to start the server.
-    webstart.initialize(web_config)
-
     #check for version here after web server initialized so it doesn't try to repeatidly hit github
     #for version info if it's already running
     versioncheck.versionload()
@@ -610,26 +582,28 @@ def main():
 
     signal.signal(signal.SIGTERM, handler_sigterm)
 
-    while True:
-        if not comicarr.SIGNAL:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                comicarr.GLOBAL_MESSAGES = {'status': 'success', 'event': 'shutdown', 'message': 'Now shutting down system.'}
-                time.sleep(1)
-                comicarr.SIGNAL = 'shutdown'
-        else:
-            logger.info('Received signal: ' + comicarr.SIGNAL)
-            if comicarr.SIGNAL == 'shutdown':
-                comicarr.GLOBAL_MESSAGES = {'status': 'success', 'event': 'shutdown', 'message': 'Now shutting down system.'}
-                time.sleep(2)
-                comicarr.shutdown()
-            elif comicarr.SIGNAL == 'restart':
-                comicarr.shutdown(restart=True)
-            else:
-                comicarr.shutdown(restart=True, update=True)
+    import uvicorn
 
-            comicarr.SIGNAL = None
+    ssl_kwargs = {}
+    if comicarr.CONFIG.ENABLE_HTTPS:
+        ssl_kwargs["ssl_certfile"] = comicarr.CONFIG.HTTPS_CERT
+        ssl_kwargs["ssl_keyfile"] = comicarr.CONFIG.HTTPS_KEY
+
+    uvicorn.run(
+        "comicarr.app.main:app",
+        host=comicarr.CONFIG.HTTP_HOST,
+        port=http_port,
+        log_level="info",
+        workers=1,
+        **ssl_kwargs,
+    )
+
+    if comicarr.SIGNAL == 'restart':
+        comicarr.shutdown(restart=True)
+    elif comicarr.SIGNAL == 'update':
+        comicarr.shutdown(restart=True, update=True)
+    else:
+        comicarr.shutdown()
 
     return
 
 
@@ -235,7 +235,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 ISSUE_WATCH_LIST = queue.Queue()
 MASS_REFRESH = None
 REFRESH_QUEUE = queue.Queue()
-DDL_QUEUED = []
+DDL_QUEUED = set()
 DDL_STUCK_NOTIFIED = set()
 DDL_HEALTH_SCHEDULER = None
 PACK_ISSUEIDS_DONT_QUEUE = {}