Merge subtree 'vimhelp' from 'vimhelp/master'

Author: ychin

vimhelp/.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.py]
+max_line_length = 88

vimhelp/.flake8

@@ -2,7 +2,6 @@
 /.gitignore
 /.gcloudignore
 /.venv
-/.flake8
 /.ruff_cache
 /scripts
 /README.md
@@ -11,3 +10,4 @@
 /tasks.py
 /gunicorn.conf.dev.py
 __pycache__/
+html/

vimhelp/.gcloudignore

@@ -1,4 +1,3 @@
 TODO
-/vimhelp/secret.py
 /.venv/
 __pycache__/

vimhelp/.gitignore

@@ -1,4 +1,4 @@
-runtime: python311
+runtime: python312
 
 automatic_scaling:
   max_instances: 2
@@ -10,31 +10,10 @@ automatic_scaling:
 
 entrypoint: gunicorn -b :$PORT -k gevent -w 1 'vimhelp.webapp:create_app()'
 
-default_expiration: "1h"
-
 inbound_services:
 - warmup
 
 handlers:
-- url: /(?:.*\.html)?
-  script: auto
-  secure: always
-- url: /api/.+
-  script: auto
-  secure: always
-- url: /(?:robots|sitemap)\.txt
-  script: auto
-  secure: always
-- url: /favicon\.ico
-  script: auto
-  secure: always
-- url: /(?:enqueue_)?update
+- url: /.*
   script: auto
   secure: always
-- url: /_ah/warmup
-  script: auto
-  secure: always
-- url: /(.+)
-  static_files: static/\1
-  upload: static/(.*)
-  secure: always

vimhelp/app.yaml

@@ -5,3 +5,6 @@ cron:
 - description: fetch and process neovim docs
   url: /enqueue_update?project=neovim
   schedule: every 32 minutes
+- description: clean up old static asset versions
+  url: /enqueue_clean_assets
+  schedule: every 33 minutes

vimhelp/cron.yaml

@@ -3,7 +3,6 @@
 
 loglevel = "debug"
 reload = True
-reload_extra_files = ["static", "templates"]
 timeout = 15
 worker_class = "gevent"
 wsgi_app = "vimhelp.webapp:create_app()"

vimhelp/gunicorn.conf.dev.py

@@ -13,8 +13,11 @@ build-backend = "setuptools.build_meta"
 dependencies = { file = "requirements.txt" }
 
 [tool.ruff]
+extend-exclude = [".pyre"]
+
+[tool.ruff.lint]
 select = ["E", "F", "W", "I002", "N", "UP", "S", "B", "A", "C4", "DTZ", "SIM", "PTH", "PLE", "PLW", "RUF"]
 ignore = ["DTZ003", "PLW0603", "SIM102", "SIM108", "UP007"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "vimhelp/vimh2h.py" = ["E501", "PLW2901"]

vimhelp/pyproject.toml

@@ -83,12 +83,11 @@ def main():
     app = flask.Flask(
         __name__,
         root_path=pathlib.Path(__file__).resolve().parent,
-        static_url_path="",
-        static_folder="../static",
-        template_folder="../templates",
+        template_folder="../vimhelp/templates",
     )
     app.jinja_options["trim_blocks"] = True
     app.jinja_options["lstrip_blocks"] = True
+    app.jinja_env.filters["static_path"] = lambda p: p
 
     with app.app_context():
         if args.profile:
@@ -162,19 +161,17 @@ def run(args):
                 f.write(redirect_html)
 
     if args.out_dir is not None:
-        print("Symlinking static files...")
-        static_dir_rel = os.path.relpath(root_path / "static", args.out_dir)
-        for target in (root_path / "static").iterdir():
+        print("Symlinking/creating static files...")
+        static_dir = root_path / "vimhelp" / "static"
+        static_dir_rel = os.path.relpath(static_dir, args.out_dir)
+        for target in static_dir.iterdir():
             target_name = target.name
-            if target_name.startswith(f"favicon-{args.project}"):
-                src_name = target_name.replace(f"favicon-{args.project}", "favicon")
-            elif target_name.startswith("favicon-"):
-                continue
-            else:
-                src_name = target_name
-            src = pathlib.Path(args.out_dir / src_name)
+            src = args.out_dir / target_name
             src.unlink(missing_ok=True)
             src.symlink_to(f"{static_dir_rel}/{target_name}")
+        for name in "vimhelp.css", "vimhelp.js":
+            content = flask.render_template(name, mode=mode)
+            (args.out_dir / name).write_text(content)
 
     print("Done.")