structables 0.3.4__tar.gz → 0.3.6__tar.gz

{structables-0.3.4 → structables-0.3.6}/.gitignore

@@ -3,4 +3,5 @@ venv/
 __pycache__/
 .vscode
 privacy.txt
+privacy.md
 /dist/

{structables-0.3.4 → structables-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structables
-Version: 0.3.4
+Version: 0.3.6
 Summary: A simple frontend for Instructables
 Project-URL: Homepage, https://git.private.coffee/privatecoffee/structables
 Project-URL: Bug Tracker, https://git.private.coffee/privatecoffee/structables/issues
@@ -674,6 +674,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Requires-Dist: bs4
 Requires-Dist: flask
+Requires-Dist: markdown2[all]
 Description-Content-Type: text/markdown
 
 <img align="right" src="src/structables/static/img/logo.png">

{structables-0.3.4 → structables-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "structables"
-version = "0.3.4"
+version = "0.3.6"
 authors = [
   { name="Private.coffee Team", email="support@private.coffee" },
 ]
@@ -20,6 +20,7 @@ classifiers = [
 dependencies = [
   "flask",
   "bs4",
+  "markdown2[all]",
 ]
 
 [project.scripts]

{structables-0.3.4 → structables-0.3.6}/src/structables/config.py

@@ -6,7 +6,7 @@ class Config:
     LISTEN_HOST = os.environ.get("STRUCTABLES_LISTEN_HOST", "127.0.0.1")
     INVIDIOUS = os.environ.get("STRUCTABLES_INVIDIOUS")
     UNSAFE = os.environ.get("STRUCTABLES_UNSAFE", False)
-    PRIVACY_FILE = os.environ.get("STRUCTABLES_PRIVACY_FILE", "privacy.txt")
+    PRIVACY_FILE = os.environ.get("STRUCTABLES_PRIVACY_FILE")
 
     @staticmethod
     def init_app(app):

{structables-0.3.4 → structables-0.3.6}/src/structables/routes/main.py

@@ -4,6 +4,7 @@ from urllib.error import HTTPError
 from bs4 import BeautifulSoup
 from urllib.parse import quote
 from werkzeug.exceptions import InternalServerError
+from markdown2 import Markdown
 from traceback import print_exc
 import pathlib
 import json
@@ -333,11 +334,33 @@ def init_main_routes(app):
 
     @app.route("/privacypolicy/")
     def privacypolicy():
+        """Display the privacy policy.
+
+        The privacy policy is loaded from the file specified in the
+        `STRUCTABLES_PRIVACY_FILE` environment variable. If that variable is
+        unset or the file cannot be read, a default message is displayed.
+        """
+
         content = "No privacy policy found."
 
+        path = app.config.get("PRIVACY_FILE")
+
+        if not path:
+            if pathlib.Path("privacy.md").exists():
+                path = "privacy.md"
+
+            elif pathlib.Path("privacy.txt").exists():
+                path = "privacy.txt"
+
         try:
-            with (pathlib.Path(__file__).parent / "privacy.txt").open() as f:
+            with pathlib.Path(path).open() as f:
                 content = f.read()
+
+                print(path, content)
+
+                if path.endswith(".md"):
+                    content = Markdown().convert(content)
+                    
         except OSError:
             pass
 

{structables-0.3.4 → structables-0.3.6}/src/structables/templates/privacypolicy.html

@@ -5,6 +5,6 @@
         <br>
         <h1 style="font-size:2em;line-height:0em;">Privacy Policy</h1>
         <br>
-        <p>{{ content }}</p>
+        <p>{{ content|safe }}</p>
     </center>
 {% endblock %}