structables 0.3.10__tar.gz → 0.3.12__tar.gz

{structables-0.3.10 → structables-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structables
-Version: 0.3.10
+Version: 0.3.12
 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
@@ -695,7 +695,7 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 | URL                                                               | Provided by                               | Country | Comments |
 | ----------------------------------------------------------------- | ----------------------------------------- | ------- | -------- |
 | [structables.private.coffee](https://structables.private.coffee/) | [Private.coffee](https://private.coffee/) | Austria |          |
-| [structables.bloat.cat](https://structables.bloat.cat/)           | [Bloat.cat](https://bloat.cat)            | Romania |          |
+| [structables.bloat.cat](https://structables.bloat.cat/)           | [Bloat.cat](https://bloat.cat)            | Germany |          |
 
 To add your own instance to this list, please open a pull request or issue.
 
@@ -715,6 +715,7 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 4. Run `uwsgi --plugin python3 --http-socket 0.0.0.0:8002 --module structables.main:app --processes 4 --threads 4`
 5. Point your reverse proxy to http://localhost:8002 and (optionally) serve static files from the `venv/lib/pythonX.XX/site-packages/structables/static` directory
 6. Connect to your instance under your domain
+7. Ensure that `/cron/` is executed at regular intervals so that the app updates its cached data.
 
 ### Production: Docker
 
@@ -728,6 +729,7 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 
 4. Point your reverse proxy to http://127.0.0.1:8002 (or your chosen port, if you modified it) and (optionally) serve static files from `structables/static`
 5. Connect to your instance under your domain
+6. Ensure that `/cron/` is executed at regular intervals so that the app updates its cached data.
 
 ### Development
 

{structables-0.3.10 → structables-0.3.12}/README.md

@@ -16,7 +16,7 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 | URL                                                               | Provided by                               | Country | Comments |
 | ----------------------------------------------------------------- | ----------------------------------------- | ------- | -------- |
 | [structables.private.coffee](https://structables.private.coffee/) | [Private.coffee](https://private.coffee/) | Austria |          |
-| [structables.bloat.cat](https://structables.bloat.cat/)           | [Bloat.cat](https://bloat.cat)            | Romania |          |
+| [structables.bloat.cat](https://structables.bloat.cat/)           | [Bloat.cat](https://bloat.cat)            | Germany |          |
 
 To add your own instance to this list, please open a pull request or issue.
 
@@ -36,6 +36,7 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 4. Run `uwsgi --plugin python3 --http-socket 0.0.0.0:8002 --module structables.main:app --processes 4 --threads 4`
 5. Point your reverse proxy to http://localhost:8002 and (optionally) serve static files from the `venv/lib/pythonX.XX/site-packages/structables/static` directory
 6. Connect to your instance under your domain
+7. Ensure that `/cron/` is executed at regular intervals so that the app updates its cached data.
 
 ### Production: Docker
 
@@ -49,6 +50,7 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 
 4. Point your reverse proxy to http://127.0.0.1:8002 (or your chosen port, if you modified it) and (optionally) serve static files from `structables/static`
 5. Connect to your instance under your domain
+6. Ensure that `/cron/` is executed at regular intervals so that the app updates its cached data.
 
 ### Development
 

{structables-0.3.10 → structables-0.3.12}/pyproject.toml

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

{structables-0.3.10 → structables-0.3.12}/src/structables/main.py

@@ -40,3 +40,6 @@ def main():
 
 if __name__ == "__main__":
     main()
+else:
+    # Even if we're using a wsgi server, we still have to initialize global_ibles
+    update_data(app)

{structables-0.3.10 → structables-0.3.12}/src/structables/routes/main.py

@@ -158,49 +158,54 @@ 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"], file["name"]), "alt": file["name"]}
-                            )
-
-                        elif not file["image"]:
-                            step_downloads.append(
                                 {
                                     "src": proxy(file["downloadUrl"], file["name"]),
-                                    "name": file["name"],
+                                    "alt": file["name"],
                                 }
                             )
 
-                        else:  # Leaves us with embeds
-                            embed_code = file["embedHtmlCode"]
-                            soup = BeautifulSoup(embed_code, "html.parser")
-
-                            iframe = soup.select("iframe")[0]
-
-                            src = iframe.get("src")
-
-                            if src.startswith("https://content.instructables.com"):
-                                src = src.replace(
-                                    "https://content.instructables.com",
-                                    f"/proxy/?url={src}",
+                        elif not file["image"]:
+                            if "downloadUrl" in file.keys():
+                                step_downloads.append(
+                                    {
+                                        "src": proxy(file["downloadUrl"], file["name"]),
+                                        "name": file["name"],
+                                    }
                                 )
 
-                            elif app.config["INVIDIOUS"] and src.startswith(
-                                "https://www.youtube.com"
-                            ):
-                                src = src.replace(
-                                    "https://www.youtube.com", app.config["INVIDIOUS"]
+                            else:  # Leaves us with embeds
+                                embed_code = file["embedHtmlCode"]
+                                soup = BeautifulSoup(embed_code, "html.parser")
+
+                                iframe = soup.select("iframe")[0]
+
+                                src = iframe.get("src")
+
+                                if src.startswith("https://content.instructables.com"):
+                                    src = src.replace(
+                                        "https://content.instructables.com",
+                                        f"/proxy/?url={src}",
+                                    )
+
+                                elif app.config["INVIDIOUS"] and src.startswith(
+                                    "https://www.youtube.com"
+                                ):
+                                    src = src.replace(
+                                        "https://www.youtube.com",
+                                        app.config["INVIDIOUS"],
+                                    )
+
+                                elif not app.config["UNSAFE"]:
+                                    src = "/iframe/?url=" + quote(src)
+
+                                step_iframes.append(
+                                    {
+                                        "src": src,
+                                        "width": file.get("width"),
+                                        "height": file.get("height"),
+                                    }
                                 )
 
-                            elif not app.config["UNSAFE"]:
-                                src = "/iframe/?url=" + quote(src)
-
-                            step_iframes.append(
-                                {
-                                    "src": src,
-                                    "width": file.get("width"),
-                                    "height": file.get("height"),
-                                }
-                            )
-
                     step_text = step["body"]
                     step_text = step_text.replace(
                         "https://content.instructables.com",
@@ -360,7 +365,7 @@ def init_main_routes(app):
 
                 if path.endswith(".md"):
                     content = Markdown().convert(content)
-                    
+
         except OSError:
             pass