structables 0.3.7__tar.gz → 0.3.8__tar.gz

{structables-0.3.7 → structables-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structables
-Version: 0.3.7
+Version: 0.3.8
 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.8/docker-compose-example.yml

@@ -0,0 +1,18 @@
+services:
+  structables:
+    container_name: structables
+    restart: unless-stopped
+    image: privatecoffee/structables:latest
+    ports:
+      - "127.0.0.1:8002:8002"
+    env_file: .env
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    read_only: true
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 300M

{structables-0.3.7 → structables-0.3.8}/pyproject.toml

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

{structables-0.3.7 → structables-0.3.8}/src/structables/routes/member.py

@@ -1,14 +1,32 @@
 from flask import render_template, abort
 from urllib.request import urlopen
 from urllib.error import HTTPError
+from urllib.parse import quote
 from ..utils.helpers import proxy, member_header
 from bs4 import BeautifulSoup
 from urllib.request import Request
 
 
 def init_member_routes(app):
+    """This function initializes all the routes related to Instructables member profiles.
+
+    Args:
+        app (Flask): The Flask app instance.
+    """
+
     @app.route("/member/<member>/instructables/")
     def route_member_instructables(member):
+        """Route to display a member's Instructables.
+
+        Args:
+            member (str): The member's username.
+
+        Returns:
+            Response: The rendered HTML page.
+        """
+
+        member = quote(member)
+
         try:
             data = urlopen(
                 f"https://www.instructables.com/member/{member}/instructables/"
@@ -55,13 +73,18 @@ def init_member_routes(app):
 
     @app.route("/member/<member>/")
     def route_member(member):
-        headers = {
-            "User-Agent": "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0"
-        }
+        """Route to display a member's profile.
 
-        request = Request(
-            f"https://www.instructables.com/member/{member}/", headers=headers
-        )
+        Args:
+            member (str): The member's username.
+
+        Returns:
+            Response: The rendered HTML page.
+        """
+
+        member = quote(member)
+
+        request = Request(f"https://www.instructables.com/member/{member}/")
 
         try:
             data = urlopen(request)
@@ -103,9 +126,9 @@ def init_member_routes(app):
                 "div.achievements-section.main-achievements.contest-achievements div.achievement-item:not(.two-column-filler)"
             ):
                 try:
-                    ach_title = ach.select("div.achievement-info span.achievement-title")[
-                        0
-                    ].text
+                    ach_title = ach.select(
+                        "div.achievement-info span.achievement-title"
+                    )[0].text
                     ach_desc = ach.select(
                         "div.achievement-info span.achievement-description"
                     )[0].text

{structables-0.3.7 → structables-0.3.8}/src/structables/templates/member-instructables.html

@@ -4,7 +4,7 @@
 	<center>
 		<img width=150px height=150px style="display:inline-block;" src="{{ header_content.avatar }}" alt="{{ header_content.title }}">
 		<h1>{{ header_content.title }}</h1>
-		<span>{{ header_content.location }}&nbsp;&nbsp;</span>
+		<span>{% if header_content.location %}{{ header_content.location }}&nbsp;&nbsp;{% endif %}</span>
 		<span>{{ header_content.signup }}</span>
 		<br>
 		<span>{{ header_content.instructables }} Instructables&nbsp;&nbsp;</span>

{structables-0.3.7 → structables-0.3.8}/src/structables/templates/member.html

@@ -4,7 +4,7 @@
 	<center>
 		<img width=150px height=150px style="display:inline-block;" src="{{ header_content.avatar }}" alt="{{ header_content.title }}">
 		<h1>{{ header_content.title }}</h1>
-		<span>{{ header_content.location }}&nbsp;&nbsp;</span>
+		<span>{% if header_content.location %}{{ header_content.location }}&nbsp;&nbsp;{% endif %}</span>
 		<span>{{ header_content.signup }}</span>
 		<br>
 		<span>{{ header_content.instructables }} Instructables&nbsp;&nbsp;</span>