structables 0.4.3__tar.gz → 0.4.4__tar.gz

{structables-0.4.3 → structables-0.4.4}/.forgejo/workflows/docker.yml

@@ -11,8 +11,14 @@ jobs:
     name: Docker Build and Push to Docker Hub
     runs-on: docker-privileged
     container:
-      image: catthehacker/ubuntu:act-latest
+      image: node:22-bookworm
+      options: >-
+        --privileged
     steps:
+      - name: Install dependencies
+        run: |
+          apt update
+          apt install -y docker.io
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx

{structables-0.4.3 → structables-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structables
-Version: 0.4.3
+Version: 0.4.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.4.3 → structables-0.4.4}/pyproject.toml

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

{structables-0.4.3 → structables-0.4.4}/src/structables/routes/main.py

@@ -23,60 +23,109 @@ def init_main_routes(app):
     @app.route("/")
     def route_explore():
         logger.debug("Rendering explore page")
-
-        # Check if data needs to be updated
         maybe_update_data(app)
 
         try:
-            logger.debug("Fetching data from instructables.com")
+            # Extract API endpoints from the JSON context data
+            logger.debug("Fetching data from instructables.com API")
             data = urlopen("https://www.instructables.com/")
-        except HTTPError as e:
-            logger.error(f"HTTP error fetching explore page: {e.code}")
-            abort(e.code)
+            soup = BeautifulSoup(data.read().decode(), "html.parser")
+
+            # Try to extract JSON data from script tag
+            page_context = None
+            script_tag = soup.select("#js-page-context")
+            if script_tag:
+                try:
+                    page_context = json.loads(script_tag[0].string)
+                    logger.debug("Successfully extracted page context JSON")
+                except Exception as e:
+                    logger.error(f"Error parsing page context JSON: {str(e)}")
+
+            # Use the API endpoints to fetch category data
+            categories = [
+                "circuits",
+                "workshop",
+                "design",
+                "craft",
+                "cooking",
+                "living",
+                "outside",
+                "teachers",
+            ]
+            sections = []
+
+            for category in categories:
+                try:
+                    # Use the appropriate API endpoint for each category
+                    api_url = f"https://www.instructables.com/json-api/getHomepageFeatured?limit=5&category={category}"
+                    logger.debug(
+                        f"Fetching data for category {category} from {api_url}"
+                    )
 
-        soup = BeautifulSoup(data.read().decode(), "html.parser")
+                    category_data = urlopen(api_url)
+                    category_json = json.loads(category_data.read().decode())
+
+                    # Process category items
+                    category_items = []
+                    for item in category_json["items"]:
+                        category_items.append(
+                            {
+                                "title": item["title"],
+                                "link": item["url"],
+                                "img": (
+                                    proxy(item["downloadUrl"])
+                                    if "downloadUrl" in item
+                                    else ""
+                                ),
+                                "author": item["author"] if "author" in item else "",
+                                "channel": (
+                                    item["classifications"][0]["channels"][0]["title"]
+                                    if "classifications" in item
+                                    and item["classifications"]
+                                    else ""
+                                ),
+                                "channel_link": (
+                                    f"/{item['classifications'][0]['name']}/{item['classifications'][0]['channels'][0]['name']}/"
+                                    if "classifications" in item
+                                    and item["classifications"]
+                                    else ""
+                                ),
+                            }
+                        )
+
+                    sections.append(
+                        (category.capitalize(), f"/{category}", category_items)
+                    )
+                    logger.debug(
+                        f"Processed {len(category_items)} items for category {category}"
+                    )
 
-        explore = soup.select(".home-content-explore-wrap")[0]
+                except Exception as e:
+                    logger.error(f"Error processing category {category}: {str(e)}")
+                    raise
+                    sections.append((category.capitalize(), f"/{category}", []))
 
-        title = explore.select("h2")[0].text
-        logger.debug(f"Explore page title: {title}")
+            return render_template("index.html", title="Explore", sections=sections)
 
-        logger.debug("Parsing category sections")
-        circuits = explore_lists(
-            explore.select(".home-content-explore-category-circuits")[0]
-        )
-        workshop = explore_lists(
-            explore.select(".home-content-explore-category-workshop")[0]
-        )
-        craft = explore_lists(explore.select(".home-content-explore-category-craft")[0])
-        cooking = explore_lists(
-            explore.select(".home-content-explore-category-cooking")[0]
-        )
-        living = explore_lists(
-            explore.select(".home-content-explore-category-living")[0]
-        )
-        outside = explore_lists(
-            explore.select(".home-content-explore-category-outside")[0]
-        )
-        teachers = explore_lists(
-            explore.select(".home-content-explore-category-teachers")[0]
-        )
-
-        logger.debug("Rendering explore page template")
+        except Exception as e:
+            logger.error(f"Error rendering explore page: {str(e)}")
+            print_exc()
 
-        return render_template(
-            "index.html",
-            title=title,
-            sections=[
-                ("Circuits", "/circuits", circuits),
-                ("Workshop", "/workshop", workshop),
-                ("Craft", "/craft", craft),
-                ("Cooking", "/cooking", cooking),
-                ("Living", "/living", living),
-                ("Outside", "/outside", outside),
-                ("Teachers", "/teachers", teachers),
-            ],
-        )
+            # Fallback to a static version if API fails
+            return render_template(
+                "index.html",
+                title="Explore",
+                sections=[
+                    ("Circuits", "/circuits", []),
+                    ("Workshop", "/workshop", []),
+                    ("Craft", "/craft", []),
+                    ("Cooking", "/cooking", []),
+                    ("Living", "/living", []),
+                    ("Outside", "/outside", []),
+                    ("Teachers", "/teachers", []),
+                ],
+                message="Instructables.com recently redesigned their site. We're experiencing issues with our scraper.",
+            )
 
     @app.route("/sitemap/")
     @app.route("/sitemap/<path:path>")
@@ -341,7 +390,7 @@ def init_main_routes(app):
                     enumerate=enumerate,
                 )
             else:
-                ## Collections
+                # Collections
                 logger.debug("Article is a collection")
                 thumbnails = []
                 for thumbnail in data["instructables"]: