markdown-up 3.3.1__tar.gz → 3.3.2__tar.gz

{markdown_up-3.3.1/src/markdown_up.egg-info → markdown_up-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-up
-Version: 3.3.1
+Version: 3.3.2
 Summary: MarkdownUp is a Markdown viewer
 Author-email: "Craig A. Hobbs" <craigahobbs@gmail.com>
 License-Expression: MIT
@@ -84,19 +84,12 @@ The generated `.html` files are HTML stubs for the
 All Markdown parsing and rendering are done on the client.
 
 
-### Configuration File
-
-The
-[MarkdownUp Application Configuration File](https://craigahobbs.github.io/markdown-up-py/config.html#var.vName='MarkdownUpConfig'),
-`markdown-up.json`, allows you to enable release mode, set the number of backend server threads, and more.
-
-
 ### Command-Line Arguments
 
 The `markdown-up` application has the following command-line arguments:
 
 ```
-usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [-c FILE] [path]
+usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [path]
 
 positional arguments:
   path                the file or directory to view (default is ".")
@@ -108,7 +101,6 @@ options:
   -n, --no-browser    don't open a web browser
   -r, --release       release mode (cache statics, remove documentation and index)
   -q, --quiet         hide access logging
-  -c, --config FILE   the application config filename (default is "markdown-up.json")
   ```
 
 
@@ -141,7 +133,7 @@ markdownPrint('Hello, **World**!!')
 
 ### MarkdownUp Backend Applications
 
-MarkdownUp no longer hosts BareScript backend APIs. To write a backend application in BareScript, use the
+To write a backend application in BareScript, use the
 [bare-script](https://pypi.org/project/bare-script/) package's
 [WSGI support](https://craigahobbs.github.io/bare-script-py/wsgi.html).
 

{markdown_up-3.3.1 → markdown_up-3.3.2}/README.md

@@ -59,19 +59,12 @@ The generated `.html` files are HTML stubs for the
 All Markdown parsing and rendering are done on the client.
 
 
-### Configuration File
-
-The
-[MarkdownUp Application Configuration File](https://craigahobbs.github.io/markdown-up-py/config.html#var.vName='MarkdownUpConfig'),
-`markdown-up.json`, allows you to enable release mode, set the number of backend server threads, and more.
-
-
 ### Command-Line Arguments
 
 The `markdown-up` application has the following command-line arguments:
 
 ```
-usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [-c FILE] [path]
+usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [path]
 
 positional arguments:
   path                the file or directory to view (default is ".")
@@ -83,7 +76,6 @@ options:
   -n, --no-browser    don't open a web browser
   -r, --release       release mode (cache statics, remove documentation and index)
   -q, --quiet         hide access logging
-  -c, --config FILE   the application config filename (default is "markdown-up.json")
   ```
 
 
@@ -116,7 +108,7 @@ markdownPrint('Hello, **World**!!')
 
 ### MarkdownUp Backend Applications
 
-MarkdownUp no longer hosts BareScript backend APIs. To write a backend application in BareScript, use the
+To write a backend application in BareScript, use the
 [bare-script](https://pypi.org/project/bare-script/) package's
 [WSGI support](https://craigahobbs.github.io/bare-script-py/wsgi.html).
 

{markdown_up-3.3.1 → markdown_up-3.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "markdown-up"
-version = "3.3.1"
+version = "3.3.2"
 description = "MarkdownUp is a Markdown viewer"
 readme = "README.md"
 license = "MIT"

{markdown_up-3.3.1 → markdown_up-3.3.2}/src/markdown_up/app.py

@@ -22,10 +22,10 @@ class MarkdownUpApplication(chisel.Application):
     __slots__ = ('root', 'release', 'add_request_lock')
 
 
-    def __init__(self, root, config=None):
+    def __init__(self, root, release=False):
         super().__init__()
         self.root = root
-        self.release = config.get('release', False) if config else False
+        self.release = release
         self.add_request_lock = threading.Lock()
 
         # Release mode?

{markdown_up-3.3.1 → markdown_up-3.3.2}/src/markdown_up/main.py

@@ -7,13 +7,11 @@ The MarkdownUp backend command-line application
 
 import argparse
 from functools import partial
-import json
 import os
 import sys
 import threading
 import webbrowser
 
-from schema_markdown import parse_schema_markdown, validate_type
 import waitress
 
 from .app import HTML_EXTS, MARKDOWN_EXTS, MarkdownUpApplication
@@ -33,16 +31,14 @@ def main(argv=None):
                         help='the file or directory to view (default is ".")')
     parser.add_argument('-p', '--port', metavar='N', type=int, default=8080,
                         help='the application port (default is 8080)')
-    parser.add_argument('-t', '--threads', metavar='N', type=int,
+    parser.add_argument('-t', '--threads', metavar='N', type=int, default=8,
                         help='the number of web server threads (default is 8)')
     parser.add_argument('-n', '--no-browser', action='store_true',
                         help="don't open a web browser")
-    parser.add_argument('-r', '--release', action='store_true', default=None,
+    parser.add_argument('-r', '--release', action='store_true',
                         help="release mode (cache statics, remove documentation and index)")
     parser.add_argument('-q', '--quiet', action='store_true',
                         help="hide access logging")
-    parser.add_argument('-c', '--config', metavar='FILE', default='markdown-up.json',
-                        help='the application config filename (default is "markdown-up.json")')
     args = parser.parse_args(args=argv)
 
     # Verify the path exists
@@ -61,18 +57,6 @@ def main(argv=None):
     if root == '':
         root = '.'
 
-    # Load and validate the configuration file
-    config_path = os.path.normpath(os.path.join(root, args.config))
-    if os.path.isfile(config_path):
-        with open(config_path, 'r', encoding='utf-8') as config_file:
-            config = validate_type(CONFIG_TYPES, 'MarkdownUpConfig', json.load(config_file))
-    else:
-        config = {}
-
-    # Add arguments to the config
-    config['release'] = args.release if args.release is not None else config.get('release', False)
-    config['threads'] = max(1, args.threads if args.threads is not None else config.get('threads', 8))
-
     # Construct the URL
     host = '127.0.0.1'
     if is_file:
@@ -86,19 +70,19 @@ def main(argv=None):
         url = f'http://{host}:{args.port}/'
 
     # Launch the web browser on a thread so the WSGI application can startup first
-    if not config['release'] and not args.no_browser:
+    if not args.release and not args.no_browser:
         webbrowser_thread = threading.Thread(target=webbrowser.open, args=(url,))
         webbrowser_thread.daemon = True
         webbrowser_thread.start()
 
     # Create the WSGI application
-    wsgiapp = MarkdownUpApplication(root, config)
+    wsgiapp = MarkdownUpApplication(root, release=args.release)
     wsgiapp_wrap = wsgiapp if args.quiet else partial(_wsgiapp_log_access, wsgiapp)
 
     # Host the application
     if not args.quiet:
         print(f'markdown-up: Serving at {url} ...')
-    waitress.serve(wsgiapp_wrap, port=args.port, threads=config['threads'])
+    waitress.serve(wsgiapp_wrap, port=args.port, threads=max(1, args.threads))
 
 
 # WSGI application wrapper and the start_response function so we can log status and environ
@@ -108,19 +92,3 @@ def _wsgiapp_log_access(wsgiapp, environ, start_response):
         print(f'markdown-up: {status[0:3]} {environ["REQUEST_METHOD"]} {environ["PATH_INFO"]}{query_string}')
         return start_response(status, response_headers)
     return wsgiapp(environ, log_start_response)
-
-
-# The backend configuration schema
-CONFIG_TYPES = parse_schema_markdown('''\
-group "Application Configuration"
-
-
-# The MarkdownUp application configuration (e.g. `markdown-up.json`)
-struct MarkdownUpConfig
-
-    # If true, run in release mode. Default is false.
-    optional bool release
-
-    # The number of backend server threads. Default is 8.
-    optional int threads
-''')

{markdown_up-3.3.1 → markdown_up-3.3.2/src/markdown_up.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-up
-Version: 3.3.1
+Version: 3.3.2
 Summary: MarkdownUp is a Markdown viewer
 Author-email: "Craig A. Hobbs" <craigahobbs@gmail.com>
 License-Expression: MIT
@@ -84,19 +84,12 @@ The generated `.html` files are HTML stubs for the
 All Markdown parsing and rendering are done on the client.
 
 
-### Configuration File
-
-The
-[MarkdownUp Application Configuration File](https://craigahobbs.github.io/markdown-up-py/config.html#var.vName='MarkdownUpConfig'),
-`markdown-up.json`, allows you to enable release mode, set the number of backend server threads, and more.
-
-
 ### Command-Line Arguments
 
 The `markdown-up` application has the following command-line arguments:
 
 ```
-usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [-c FILE] [path]
+usage: markdown-up [-h] [-p N] [-t N] [-n] [-r] [-q] [path]
 
 positional arguments:
   path                the file or directory to view (default is ".")
@@ -108,7 +101,6 @@ options:
   -n, --no-browser    don't open a web browser
   -r, --release       release mode (cache statics, remove documentation and index)
   -q, --quiet         hide access logging
-  -c, --config FILE   the application config filename (default is "markdown-up.json")
   ```
 
 
@@ -141,7 +133,7 @@ markdownPrint('Hello, **World**!!')
 
 ### MarkdownUp Backend Applications
 
-MarkdownUp no longer hosts BareScript backend APIs. To write a backend application in BareScript, use the
+To write a backend application in BareScript, use the
 [bare-script](https://pypi.org/project/bare-script/) package's
 [WSGI support](https://craigahobbs.github.io/bare-script-py/wsgi.html).