markdown-up 1.6.4__tar.gz → 1.7.0__tar.gz

{markdown-up-1.6.4/src/markdown_up.egg-info → markdown-up-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: markdown-up
-Version: 1.6.4
+Version: 1.7.0
 Summary: The MarkdownUp launcher
 Home-page: https://github.com/craigahobbs/markdown-up-py
 Author: Craig A. Hobbs
@@ -20,7 +20,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: chisel>=1.0
-Requires-Dist: gunicorn>=21.0
+Requires-Dist: waitress>=2.1
 
 # markdown-up
 

{markdown-up-1.6.4 → markdown-up-1.7.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = markdown-up
-version = 1.6.4
+version = 1.7.0
 url = https://github.com/craigahobbs/markdown-up-py
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com
@@ -27,7 +27,7 @@ package_dir =
 	= src
 install_requires = 
 	chisel >= 1.0
-	gunicorn >= 21.0
+	waitress >= 2.1
 
 [options.entry_points]
 console_scripts = 

{markdown-up-1.6.4 → markdown-up-1.7.0}/src/markdown_up/app.py

@@ -58,11 +58,11 @@ class MarkdownUpApplication(chisel.Application):
         self.add_request(markdown_up_index)
 
     def __call__(self, environ, start_response):
-        request_method = environ.get('REQUEST_METHOD')
+        request_method = environ['REQUEST_METHOD']
         path_info = environ['PATH_INFO']
 
         # Chisel API request? Otherwise, its a static request...
-        if request_method == 'GET' and path_info in ('/', '/markdown_up_index'):
+        if request_method == 'GET' and path_info in ('/', '/doc', '/doc/', '/doc/doc_index', '/doc/doc_request', '/markdown_up_index'):
             return super().__call__(environ, start_response)
 
         # Compute the static file path
@@ -149,6 +149,7 @@ MARKDOWN_UP_HTML = chisel.StaticRequest(
             'markdownText': `\\
 ~~~ markdown-script
 include 'https://craigahobbs.github.io/markdown-up/launcher/app.mds'
+
 markdownUpIndex()
 ~~~
 `

{markdown-up-1.6.4 → markdown-up-1.7.0}/src/markdown_up/main.py

@@ -10,9 +10,9 @@ import os
 import webbrowser
 
 from schema_markdown import encode_query_string
-import gunicorn.app.base
+import waitress
 
-from .app import MarkdownUpApplication
+from .app import HTML_EXTS, MarkdownUpApplication
 
 
 def main(argv=None):
@@ -28,6 +28,8 @@ def main(argv=None):
                         help='the application port (default is 8080)')
     parser.add_argument('-n', dest='no_browser', action='store_true',
                         help="don't open a web browser")
+    parser.add_argument('-q', dest='quiet', action='store_true',
+                        help="don't display access logging")
     args = parser.parse_args(args=argv)
 
     # Verify the path exists
@@ -46,46 +48,29 @@ def main(argv=None):
     if root == '':
         root = '.'
 
-    # Define the server's when_ready function
+    # Construct the URL
     host = '127.0.0.1'
-    def when_ready(_):
-        # Do nothing?
-        if args.no_browser:
-            return
-
-        # Construct the URL
-        if is_file:
+    if is_file:
+        if args.path.endswith(HTML_EXTS):
+            url = f'http://{host}:{args.port}/{os.path.basename(args.path)}'
+        else:
             hash_args = encode_query_string({'url': os.path.basename(args.path)})
             url = f'http://{host}:{args.port}/#{hash_args}'
-        else:
-            url = f'http://{host}:{args.port}/'
+    else:
+        url = f'http://{host}:{args.port}/'
 
-        # Launch the web browser
+    # Launch the web browser
+    if not args.no_browser:
         webbrowser.open(url)
 
-    # Host the application
-    StandaloneApplication(MarkdownUpApplication(root), {
-        'access_log_format': '%(h)s %(l)s "%(r)s" %(s)s %(b)s',
-        'accesslog': '-',
-        'errorlog': '-',
-        'bind': f'{host}:{args.port}',
-        'workers': 2,
-        'when_ready': when_ready
-    }).run()
+    # Create the WSGI application
+    wsgiapp = MarkdownUpApplication(root)
+    def wsgiapp_wrap(environ, start_response):
+        if not args.quiet:
+            print(f'markdown-up: {environ["REQUEST_METHOD"]} {environ["PATH_INFO"]} {environ["QUERY_STRING"]}')
+        return wsgiapp(environ, start_response)
 
-
-# A stand-alone WSGI server using Gunicorn - see https://docs.gunicorn.org/en/stable/custom.html
-class StandaloneApplication(gunicorn.app.base.BaseApplication):
-    # pylint: disable=abstract-method
-
-    def __init__(self, application, options): # pragma: no cover
-        self.options = options
-        self.application = application
-        super().__init__()
-
-    def load_config(self): # pragma: no cover
-        for key, value in self.options.items():
-            self.cfg.set(key, value)
-
-    def load(self): # pragma: no cover
-        return self.application
+    # Host the application
+    if not args.quiet:
+        print(f'markdown-up: Serving at {url} ...')
+    waitress.serve(wsgiapp_wrap, port=args.port)

{markdown-up-1.6.4 → markdown-up-1.7.0/src/markdown_up.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: markdown-up
-Version: 1.6.4
+Version: 1.7.0
 Summary: The MarkdownUp launcher
 Home-page: https://github.com/craigahobbs/markdown-up-py
 Author: Craig A. Hobbs
@@ -20,7 +20,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: chisel>=1.0
-Requires-Dist: gunicorn>=21.0
+Requires-Dist: waitress>=2.1
 
 # markdown-up
 

markdown-up-1.7.0/src/markdown_up.egg-info/requires.txt

@@ -0,0 +1,2 @@
+chisel>=1.0
+waitress>=2.1

markdown-up-1.6.4/src/markdown_up.egg-info/requires.txt

@@ -1,2 +0,0 @@
-chisel>=1.0
-gunicorn>=21.0