structables 0.2.1__tar.gz → 0.2.2__tar.gz

{structables-0.2.1 → structables-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: structables
-Version: 0.2.1
+Version: 0.2.2
 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
@@ -683,7 +683,7 @@ Description-Content-Type: text/markdown
 An open source alternative front-end to Instructables. This is a fork of <a href="https://codeberg.org/indestructables/indestructables">snowcatridge10's Indestructables</a> to get rid of Selenium. Indestructables itself is a fork of <a href="https://git.vern.cc/cobra/Destructables">Cobra's Destructables</a>.
 
 [![Support Private.coffee!](https://shields.private.coffee/badge/private.coffee-support%20us!-pink?logo=coffeescript)](https://private.coffee)
-[![Matrix](https://shields.private.coffee/badge/Matrix-join%20us!-blue?logo=matrix)](https://matrix.to/#/#structables:private.coffee)
+[![Matrix](https://shields.private.coffee/badge/Matrix-join%20us!-blue?logo=matrix)](https://matrix.pcof.fi/#/#structables:private.coffee)
 [![PyPI](https://shields.private.coffee/pypi/v/structables)](https://pypi.org/project/structables/)
 [![PyPI - Python Version](https://shields.private.coffee/pypi/pyversions/structables)](https://pypi.org/project/structables/)
 [![PyPI - License](https://shields.private.coffee/pypi/l/structables)](https://pypi.org/project/structables/)
@@ -697,6 +697,12 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 
 To add your own instance to this list, please open a pull request or issue.
 
+## Opening Issues
+
+If you're having problems using Structables, or if you have ideas or feedback for us, feel free to open an issue in the [Private.coffee Git](https://git.private.coffee/PrivateCoffee/structables/issues) or on [Github](https://github.com/PrivateCoffee/structables/issues).
+
+Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structables:private.coffee) to discuss your ideas with us.
+
 ## Run your own instance
 
 ### Production

{structables-0.2.1 → structables-0.2.2}/README.md

@@ -5,7 +5,7 @@
 An open source alternative front-end to Instructables. This is a fork of <a href="https://codeberg.org/indestructables/indestructables">snowcatridge10's Indestructables</a> to get rid of Selenium. Indestructables itself is a fork of <a href="https://git.vern.cc/cobra/Destructables">Cobra's Destructables</a>.
 
 [![Support Private.coffee!](https://shields.private.coffee/badge/private.coffee-support%20us!-pink?logo=coffeescript)](https://private.coffee)
-[![Matrix](https://shields.private.coffee/badge/Matrix-join%20us!-blue?logo=matrix)](https://matrix.to/#/#structables:private.coffee)
+[![Matrix](https://shields.private.coffee/badge/Matrix-join%20us!-blue?logo=matrix)](https://matrix.pcof.fi/#/#structables:private.coffee)
 [![PyPI](https://shields.private.coffee/pypi/v/structables)](https://pypi.org/project/structables/)
 [![PyPI - Python Version](https://shields.private.coffee/pypi/pyversions/structables)](https://pypi.org/project/structables/)
 [![PyPI - License](https://shields.private.coffee/pypi/l/structables)](https://pypi.org/project/structables/)
@@ -19,6 +19,12 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 
 To add your own instance to this list, please open a pull request or issue.
 
+## Opening Issues
+
+If you're having problems using Structables, or if you have ideas or feedback for us, feel free to open an issue in the [Private.coffee Git](https://git.private.coffee/PrivateCoffee/structables/issues) or on [Github](https://github.com/PrivateCoffee/structables/issues).
+
+Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structables:private.coffee) to discuss your ideas with us.
+
 ## Run your own instance
 
 ### Production

{structables-0.2.1 → structables-0.2.2}/pyproject.toml

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

{structables-0.2.1 → structables-0.2.2}/src/structables/main.py

@@ -14,6 +14,7 @@ from urllib.error import HTTPError
 from traceback import print_exc
 from urllib.parse import urlparse
 from argparse import ArgumentParser
+from typing import List
 
 from werkzeug.exceptions import BadRequest, abort, InternalServerError, NotFound
 from bs4 import BeautifulSoup
@@ -59,6 +60,26 @@ invidious = None
 unsafe = False
 
 
+def unslugify(slug: str) -> List[str]:
+    """Return a list of possible original titles for a slug.
+
+    Args:
+        slug (str): The slug to unslugify.
+
+    Returns:
+        List[str]: A list of possible original titles for the slug.
+    """
+
+    results = []
+
+    results.append(slug.replace("-", " ").title())
+
+    if "and" in slug:
+        results.append(results[0].replace("And", "&").title())
+
+    return results
+
+
 def projects_search(
     query="*",
     category="",
@@ -402,9 +423,18 @@ def project_list(head, sort="", per_page=20):
             category = parts[1]
             channel = "" if parts[2] == "projects" else parts[2]
 
-            project_ibles, total = projects_search(
-                category=category, channel=channel, per_page=per_page, page=page
-            )
+            channel_names = unslugify(channel)
+
+            for channel_name in channel_names:
+                project_ibles, total = projects_search(
+                    category=category,
+                    channel=channel_name,
+                    per_page=per_page,
+                    page=page,
+                )
+
+                if project_ibles:
+                    break
 
         elif "search" in path.split("/"):
             ibles = []
@@ -492,6 +522,10 @@ def route_sitemap(path=""):
         for li in main.select("ul.sitemap-listing li"):
             channel = li.a.text
             channel_link = li.a["href"]
+
+            if channel_link.startswith("https://"):
+                channel_link = f'/{"/".join(channel_link.split("/")[3:])}'
+
             channels.append([channel, channel_link])
         groups.append(["", "", channels])
 
@@ -1191,22 +1225,22 @@ def privacypolicy():
 
 @app.errorhandler(404)
 def not_found(e):
-    return render_template("404.html")
+    return render_template("404.html"), 404
 
 
 @app.errorhandler(400)
 def bad_request(e):
-    return render_template("400.html")
+    return render_template("400.html"), 400
 
 
 @app.errorhandler(429)
 def too_many_requests(e):
-    return render_template("429.html")
+    return render_template("429.html"), 429
 
 
 @app.errorhandler(500)
 def internal_server_error(e):
-    return render_template("500.html")
+    return render_template("500.html"), 500
 
 
 def main():
@@ -1266,12 +1300,6 @@ def main():
     if args.unsafe:
         unsafe = True
 
-    print("Loading initial data...")
-
-    update_data()
-
-    print("Started!")
-
     if debugmode:
         app.logger.setLevel(logging.DEBUG)
 
@@ -1280,3 +1308,6 @@ def main():
 
 if __name__ == "__main__":
     main()
+
+# Initialize data when the server starts
+update_data()

{structables-0.2.1 → structables-0.2.2}/src/structables/static/css/style.css

@@ -320,4 +320,35 @@ iframe {
 
 .text-muted {
   color: #6c757d !important;
+}
+
+
+
+.sitemap-group .card {
+  background-color: var(--primary-bg);
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  box-shadow: 0 2px 4px var(--shadow-color);
+  overflow: hidden;
+}
+
+.sitemap-group .card-title {
+  font-size: 1.5em;
+  margin-bottom: 0.5em;
+}
+
+.sitemap-group .list-unstyled {
+  padding-left: 0;
+}
+
+.sitemap-group .list-unstyled li {
+  margin-bottom: 0.5em;
+}
+
+.sitemap-group .list-unstyled li a {
+  color: var(--link-color);
+}
+
+.sitemap-group .list-unstyled li a:hover {
+  text-decoration: underline;
 }

structables-0.2.2/src/structables/templates/sitemap.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container my-5">
+    <div class="text-center mb-5">
+        <h1>Sitemap</h1>
+    </div>
+    <div class="row">
+        {% for group in groups %}
+        <div class="sitemap-group col-xs-12 col-sm-6 col-lg-4 mb-4">
+            <div class="card h-100">
+                <div class="card-body">
+                    <h2 class="card-title">
+                        <a href="{{ group[1] }}" class="text-decoration-none">{{ group[0] }}</a>
+                    </h2>
+                    <ul class="list-unstyled">
+                        {% for channel in group[2] %}
+                        <li><a href="{{ channel[1] }}" class="text-decoration-none">{{ channel[0] }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+{% endblock %}

structables-0.2.1/src/structables/templates/sitemap.html

@@ -1,23 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-	<center>
-		<h1>Sitemap</h1>
-		<div class="container">
-			<div class="row sitemap-groups"></div>
-			{% for group in groups %}
-			<div class="sitemap-group col-xs-12 col-sm-6 col-lg-4">
-				<a href="{{ group[1] }}">
-					<h2>{{ group[0] }}</h2>
-				</a>
-				<ul>
-					{% for channel in group[2] %}
-					<li><a href="{{ channel[1] }}">{{ channel[0] }}</a></li>
-					{% endfor %}
-				</ul>
-			</div>
-			{% endfor %}
-		</div>
-		</div>
-	</center>
-{% endblock %}