Rendering completion

src/archive_commands.py

@@ -0,0 +1,44 @@
+import argparse
+
+
+def add_archive_parser(top_level_parsers: argparse._SubParsersAction):
+    parser: argparse.ArgumentParser = top_level_parsers.add_parser("archive")
+    subsub = parser.add_subparsers(dest='archive',
+                                   required=True)
+
+    add = subsub.add_parser("add")
+    add.add_argument("files",
+                     help="files to add to archive",
+                     default=[],
+                     nargs="+")
+    add.add_argument("-a", "--archive",
+                     help="path to archive",
+                     dest="archive_path",
+                     nargs=1,
+                     required=True)
+
+    add.add_argument("-p", "--path",
+                     help="path inside archive where files will be placed",
+                     dest="basepath",
+                     default="")
+    add.set_defaults(func=run_archive_add)
+
+    create = subsub.add_parser("create")
+    create.add_argument("-a", "--archive",
+                        help="path to archive",
+                        dest="archive_path",
+                        nargs=1,
+                        required=True)
+    create.set_defaults(func=run_archive_create)
+
+
+def run_archive_add(args):
+    from pictures.add import add
+    add(archive_path=args.archive_path[0],
+        files_to_add=args.files,
+        basepath=args.basepath)
+
+
+def run_archive_create(args):
+    from pictures.create import create
+    create(args.archive_path[0])

src/main.py

@@ -1,6 +1,8 @@
 #!/bin/python3
 
 import argparse
+from archive_commands import add_archive_parser
+from render_command import add_render_parser
 
 
 def main():
@@ -13,53 +15,13 @@ def main():
     # Archive : Picture Library Management
     add_archive_parser(subparsers)
 
+    # Render : Create static site
+    add_render_parser(subparsers)
+
     # Run
     args = parser.parse_args()
     args.func(args)
 
 
-def add_archive_parser(top_level_parsers: argparse._SubParsersAction):
-    parser: argparse.ArgumentParser = top_level_parsers.add_parser("archive")
-    subsub = parser.add_subparsers(dest='archive',
-                                   required=True)
-
-    add = subsub.add_parser("add")
-    add.add_argument("files",
-                     help="files to add to archive",
-                     default=[],
-                     nargs="+")
-    add.add_argument("-a", "--archive",
-                     help="path to archive",
-                     dest="archive_path",
-                     nargs=1,
-                     required=True)
-
-    add.add_argument("-p", "--path",
-                     help="path inside archive where files will be placed",
-                     dest="basepath",
-                     default="")
-    add.set_defaults(func=run_archive_add)
-
-    create = subsub.add_parser("create")
-    create.add_argument("-a", "--archive",
-                        help="path to archive",
-                        dest="archive_path",
-                        nargs=1,
-                        required=True)
-    create.set_defaults(func=run_archive_create)
-
-
-def run_archive_add(args):
-    from pictures.add import add
-    add(archive_path=args.archive_path[0],
-        files_to_add=args.files,
-        basepath=args.basepath)
-
-
-def run_archive_create(args):
-    from pictures.create import create
-    create(args.archive_path[0])
-
-
 if __name__ == "__main__":
     main()

src/pictures/_util.py

@@ -1,7 +1,7 @@
 # Util functions for picture archive
 
 from zipfile import ZipFile, is_zipfile, ZIP_LZMA
-from os.path import isfile, basename
+from os.path import isfile, basename, splittext
 
 
 ARCHIVE_MARKER_FILE = "PICARCHIVE"
@@ -44,3 +44,11 @@ def get_already_existing_files(path: str, files: [str]) -> [str]:
 
     arg_files_set = {basename(p) for p in files}
     return list(existing_files_set & arg_files_set)
+
+
+def check_ext(path: str, valid: [str]) -> bool:
+    return splittext(path)[1].upper() in [x.upper() for x in valid]
+
+
+def check_jpg(path: str) -> bool:
+    return check_ext(path, [".JPG", ".JPEG"])

src/pictures/add.py

@@ -1,7 +1,7 @@
 # Add function for archive
 from pictures._util import check_valid_archive, get_already_existing_files
 from zipfile import ZipFile
-from os.path import join
+from os.path import join, basename
 
 
 def add(archive_path: str, files_to_add: [str],
@@ -17,10 +17,11 @@ def add(archive_path: str, files_to_add: [str],
     if error_on_duplicate and len(
             e := get_already_existing_files(archive_path, files_to_add)) > 0:
         raise Exception(f"Erroring on duplicate files: {e}")
+    print(basepath)
 
     with ZipFile(archive_path, 'a') as zip:
         for file in files_to_add:
-            basepath_corrected_path = join(basepath, file)
+            basepath_corrected_path = join(basepath, basename(file))
             with (
                 zip.open(basepath_corrected_path, 'w') as zf,
                 open(file, 'rb') as of

src/pictures/make_index.py

@@ -0,0 +1,24 @@
+# Create an index to be used my static_gen
+from zipfile import ZipFile
+from pictures._util import check_valid_archive, check_jpg
+from os.path import dirname
+from structures import Index, Section, Image
+
+
+def make_index(archive_path: str,
+               search_captions: bool = False) -> Index:
+    if not check_valid_archive(archive_path):
+        raise ValueError("Cannot make index from an invalid archive")
+
+    with ZipFile(archive_path, 'r') as zip:
+        names = zip.namelist()
+    section_names = {dirname(x) for x in names}
+    sections = [Section(x, [Image(y)
+                            for y in names
+                            if dirname(y) == x and check_jpg(y)])
+                for x in section_names]
+
+    if search_captions:
+        raise NotImplementedError
+    else:
+        return Index(sections)

src/render_command.py

@@ -0,0 +1,33 @@
+import argparse
+
+
+def add_render_parser(top_level_parsers: argparse._SubParsersAction):
+    parser: argparse.ArgumentParser = top_level_parsers.add_parser("render")
+
+    parser.add_argument("-a", "--archive",
+                        help="path to archive",
+                        dest="archive_path",
+                        nargs=1,
+                        required=True)
+    parser.add_argument("-o", "--output",
+                        help="path to dump html",
+                        dest="output",
+                        required=False,
+                        default=None)
+
+    parser.set_defaults(func=run_render)
+
+
+def run_render(args):
+    from pictures.make_index import make_index
+    from static_gen.render import gen_page
+
+    output = gen_page(make_index(archive_path=args.archive_path[0]))
+    if args.output is not None:
+        try:
+            with open(args.output, 'x') as file:
+                file.write(output)
+        except FileExistsError:
+            print(f"Refusing to clobber output: {args.output} already exists.")
+    else:
+        print(output)

src/static_gen/render.py

@@ -0,0 +1,11 @@
+from jinja2 import Environment, PackageLoader, select_autoescape
+from structures.index import Index
+
+
+def gen_page(index: Index) -> str:
+    env = Environment(
+        loader=PackageLoader("static_gen"),
+        autoescape=select_autoescape()
+    )
+    template = env.get_template('page.html')
+    return template.render(sections=index.sections)

src/static_gen/templates/page.html

@@ -0,0 +1,47 @@
+{% from "section.html" import section_tag %}
+<!DOCTYPE html>
+<html>
+
+<head>
+	<title>Emilia Allison</title>
+	<link rel="stylesheet" href="/css/pictures.css">
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+</head>
+
+<body>
+	<div id="overlay"></div>
+	<main class="offset-grid--top--wide fullsize side-a">
+		<div>
+			<div>
+				<h1>
+					Pictures
+				</h1>
+				<h2>gated because the internet is scary</h2>
+			</div>
+			<div class="gallery">
+				{%- for item in sections -%}
+				{{ section_tag(item) }}
+				{%- endfor -%}
+			</div>
+		</div>
+		<a href="../">
+		</a>
+		<div class="side-a__main-content-cover"></div>
+	</main>
+	<footer class="lock-bottom">
+		<p><a href="../">Return</a></p>
+	</footer>
+	<script>
+		// Convenience to open images when clicked :)
+		// Also deletes images if they don't load
+		// Everything still works without JS ofc
+		const imgs = document.getElementsByTagName('img');
+		for (let img of imgs) {
+			img.onclick = () => window.open(img.src);
+			img.onerror = () => {img.remove();
+				console.error(`Failed to load ${img.src}`);}
+		}
+	</script>
+</body>
+
+</html>

src/static_gen/templates/section.html

@@ -0,0 +1,15 @@
+{% macro section_tag(section) -%}
+<details>
+	<summary>{{ section.name }}</summary>
+	<div class="gallery">
+		{% for image in section.images -%}
+		<figure>
+			<img src="{{image.src}}" />
+			{%- if image.caption is not none -%}
+			<figcaption>{{ image.caption }}</figcaption>
+			{%- endif %}
+		</figure>
+		{%- endfor %}
+	</div>
+</details>
+{% endmacro %}

src/structures/__init__.py

@@ -0,0 +1,5 @@
+__all__ = ["Index", "Section", "Image"]
+
+from .index import Index
+from .section import Section
+from .image import Image

src/structures/image.py

@@ -0,0 +1,7 @@
+from dataclasses import dataclass
+from typing import Optional
+
+@dataclass
+class Image:
+    src: str
+    caption: Optional[str] = None

src/structures/index.py

@@ -0,0 +1,6 @@
+from dataclasses import dataclass
+from structures.section import Section
+
+@dataclass
+class Index:
+    sections: [Section]

src/structures/section.py

@@ -0,0 +1,7 @@
+from dataclasses import dataclass
+from structures.image import Image
+
+@dataclass
+class Section:
+    name: str
+    images: [Image]