structables 0.3.2__tar.gz → 0.3.4__tar.gz

structables-0.3.4/.forgejo/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Python Package CI/CD
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  publish:
+    name: Publish to PyPI
+    container:
+      image: node:20-bookworm
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt update
+          apt install -y python3 python3-venv
+
+      - name: Publish to PyPI
+        run: |
+          python3 -m venv venv
+          . ./venv/bin/activate
+          pip install -U twine build
+          python -m build .
+          python -m twine upload --username __token__ --password ${PYPI_TOKEN} dist/*
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structables
-Version: 0.3.2
+Version: 0.3.4
 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

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "structables"
-version = "0.3.2"
+version = "0.3.4"
 authors = [
   { name="Private.coffee Team", email="support@private.coffee" },
 ]

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

@@ -157,13 +157,13 @@ def init_main_routes(app):
                     for file in step["files"]:
                         if file["image"] and "embedType" not in "file":
                             step_imgs.append(
-                                {"src": proxy(file["downloadUrl"]), "alt": file["name"]}
+                                {"src": proxy(file["downloadUrl"], file["name"]), "alt": file["name"]}
                             )
 
                         elif not file["image"]:
                             step_downloads.append(
                                 {
-                                    "src": proxy(file["downloadUrl"]),
+                                    "src": proxy(file["downloadUrl"], file["name"]),
                                     "name": file["name"],
                                 }
                             )

{structables-0.3.2 → structables-0.3.4}/src/structables/routes/proxy.py

@@ -4,10 +4,13 @@ from urllib.parse import unquote
 from urllib.error import HTTPError
 from urllib.request import urlopen
 
+
 def init_proxy_routes(app):
     @app.route("/proxy/")
     def route_proxy():
         url = request.args.get("url")
+        filename = request.args.get("filename")
+
         if url is not None:
             if url.startswith("https://cdn.instructables.com/") or url.startswith(
                 "https://content.instructables.com/"
@@ -34,7 +37,14 @@ def init_proxy_routes(app):
                 except KeyError:
                     raise InternalServerError()
 
-                return Response(generate(), content_type=content_type)
+                headers = dict()
+
+                if filename is not None:
+                    headers["Content-Disposition"] = (
+                        f'attachment; filename="{filename}"'
+                    )
+
+                return Response(generate(), content_type=content_type, headers=headers)
             else:
                 raise BadRequest()
         else:
@@ -47,4 +57,4 @@ def init_proxy_routes(app):
         if url is not None:
             return render_template("iframe.html", url=url)
         else:
-            raise BadRequest()
+            raise BadRequest()

structables-0.3.4/src/structables/templates/footer.html

@@ -0,0 +1,21 @@
+<footer class="bg-light text-dark py-4">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-6 text-center text-md-left">
+        <p class="mb-1">
+          <a
+            href="https://git.private.coffee/PrivateCoffee/structables"
+            class="text-dark"
+          >
+            Structables Code (AGPLv3)
+          </a>
+        </p>
+      </div>
+      <div class="col-md-6 text-center text-md-right">
+        <p class="mb-1">
+          <a href="/privacypolicy" class="text-dark">View privacy policy</a>
+        </p>
+      </div>
+    </div>
+  </div>
+</footer>

{structables-0.3.2 → structables-0.3.4}/src/structables/templates/index.html

@@ -36,7 +36,9 @@
       </div>
       {% endfor %}
     </div>
+    {% if section != sections[-1] %}
     <hr />
+    {% endif %}
   </section>
   {% endfor %}
 </div>

{structables-0.3.2 → structables-0.3.4}/src/structables/utils/helpers.py

@@ -9,9 +9,9 @@ from flask import request, render_template, abort
 logging.basicConfig(level=logging.DEBUG)
 
 
-def proxy(url):
+def proxy(url, filename=None):
     logging.debug(f"Generating proxy URL for {url}")
-    return f"/proxy/?url={url}"
+    return f"/proxy/?url={url}" + (f"&filename={filename}" if filename else "")
 
 
 def get_typesense_api_key():

structables-0.3.2/src/structables/templates/footer.html

@@ -1,11 +0,0 @@
-<footer class="text-center">
-  <hr />
-  <p>
-    <a href="https://git.private.coffee/PrivateCoffee/structables"
-      >Structables Code (AGPLv3)</a
-    >
-  </p>
-  <p>
-    <a href="/privacypolicy">View privacy policy.</a>
-  </p>
-</footer>