Ver código fonte

Galleries and page adjusted

Lars 1 ano atrás
pai
commit
00f3b821cc
5 arquivos alterados com 59 adições e 50 exclusões
  1. 2 2
      content/_index.md
  2. 6 4
      content/about.md
  3. 41 35
      galleries.yaml
  4. 5 4
      hugo.toml
  5. 5 5
      make_galleries.py

+ 2 - 2
content/_index.md

@@ -1,7 +1,7 @@
 ---
 #lastmod: 2023-07-05
-title: Lars's Photography Endeavors
-description: Welcome to my photography portfolio
+title: Lars's Electric Endeavors
+description: Welcome to the photography section
 menus:
   main:
     name: Home

+ 6 - 4
content/about.md

@@ -9,12 +9,14 @@ menus:
 
 All photos were captured with a Nikon Z5 and processed with [Rawtherapee](https://www.rawtherapee.com/). 
 
-You can purchase digital downloads of the pictures without watermarks, as well as the raw files and Rawtherapee settings I used for processing, in the [store](https://ko-fi.com/larsp)
+I bring the camera on hikes and trips to take images of whatever interesting sight I stumble on.
 
-I like to bring the camera on hikes and trips to capture punchy and artistic images of whatever interesting sight I stumble on.
+I like tinkering with old and weird lenses. Fixing them, cleaning them, finding their strong and weak points and using it all for artistic gain. A mirrorless camera is great for this as the short flange distance allows adapters to be made for all sorts of mounts. And if the camera sports sensor shift stabilization, you get optical image stabilization for any old lens.
 
-I like tinkering with old and weird lenses. Fixing them, cleaning them, finding their strong and weak points and using it all for artistic gain. A mirrorless camera is great for this as the short flange distance allows adapters to be made for all sorts of mounts. And with a camera that sports sensor shift stabilization, you get optical image stabilization for any old lens.
+---
+
+This page was made with [Hugo](https://gohugo.io/) and the [hugo-theme-gallery](https://github.com/nicokaiser/hugo-theme-gallery)
 
-Watermark imprinting and rescaling was done automatically by the masterimg python script. The page was made with [Hugo](https://gohugo.io/) and the [hugo-theme-gallery](https://github.com/nicokaiser/hugo-theme-gallery)
+You can purchase digital downloads of the pictures without watermarks, including the raw files and Rawtherapee settings used for processing, in the [shop](https://ko-fi.com/larsp/shop).
 
 Contact: contact@larsee.com

+ 41 - 35
galleries.yaml

@@ -10,55 +10,61 @@
 picture_root: "/home/lars/Nasbox/Media/BestBest"
 
 galleries:
-  - folder_name: cold-out-here
-    title: So cold out here
-    description: Snowy foggy landscapes have a special charm
-    cover_photo: "2024-Q1/DSC_2744"
+  - folder_name: nice-view
+    title: Nice View
     photos:
-      - "2024-Q1/DSC_2743"
-      - "2024-Q1/DSC_2744"
-      - "2024-Q1/DSC_2757"
+      - "2024-batch1/DSC_2395"
+      - "2024-batch2/DSC_3240"
+      - "2024-batch1/DSC_2661"
+      - "2024-batch1/DSC_2705"
+      - "2024-batch2/DSC_3299"
+      - "2024-batch1/DSC_2619"
+      - "2024-batch2/DSC_3304"
 
   - folder_name: nature
     title: Nature
-    cover_photo: "2024-Q1/DSC_2300"
+    cover_photo: "2024-batch1/DSC_2273"
     photos:
-      - "2024-Q1/DSC_2273"
-      - "2024-Q1/DSC_2297"
-      - "2024-Q1/DSC_2300"
-      - "2024-Q1/DSC_2911"
+      - "2024-batch1/DSC_2273"
+      - "2024-batch1/DSC_2297"
+      - "2024-batch1/DSC_2300"
+      - "2024-batch2/DSC_1081"
+      - "2024-batch1/DSC_2911"
 
-  - folder_name: nice-view
-    title: Nice view
+  - folder_name: cold-out-there
+    title: It's cold out there
+    description: Snowy foggy landscapes have a special charm
+    cover_photo: "2024-batch1/DSC_2744"
     photos:
-      - "2024-Q1/DSC_2395"
-      - "2024-Q1/DSC_2617"
-      - "2024-Q1/DSC_2619"
-      - "2024-Q1/DSC_2661"
-      - "2024-Q1/DSC_2705"
+      - "2024-batch1/DSC_2744"
+      - "2024-batch1/DSC_2757"
+      - "2024-batch2/DSC_3035"
+      - "2024-batch1/DSC_2743"
   
   - folder_name: various
     title: "Various"
-    cover_photo: "2024-Q1/DSC_0263"
+    cover_photo: "2024-batch1/DSC_0263"
     photos:
-      - "2024-Q1/DSC_0263"
-      - "2024-Q1/DSC_2341"
-      - "2024-Q1/DSC_3079"
-      - "2024-Q1/DSC_2323"
-      - "2024-Q1/DSC_3073"
-      - "2024-Q1/DSC_0897"
-      - "2024-Q1/DSC_2769"
+      - "2024-batch1/DSC_0263"
+      - "2024-batch2/DSC_1120"
+      - "2024-batch1/DSC_2323"
+      - "2024-batch1/DSC_0897"
+      - "2024-batch1/DSC_3073"
+      - "2024-batch1/DSC_2769"
+      - "2024-batch1/DSC_3079"
+      - "2024-batch2/DSC_3139"
+      - "2024-batch2/DSC_0971"
 
   - folder_name: texture-like
     title: Texture Like
     description: Images with a texture like quality
-    cover_photo: "2024-Q1/DSC_3124"
+    cover_photo: "2024-batch1/DSC_3124"
     photos:
-      - "2024-Q1/DSC_2932"
-      - "2024-Q1/DSC_2948"
-      - "2024-Q1/DSC_3124"
-      - "2024-Q1/DSC_3161"
-      - "2024-Q1/DSC_3212"
-      - "2024-Q1/DSC_3485"
-      - "2024-Q1/DSC_3487"
+      - "2024-batch1/DSC_3124"
+      - "2024-batch1/DSC_3212"
+      - "2024-batch1/DSC_2932"
+      - "2024-batch1/DSC_2948"
+      - "2024-batch1/DSC_3161"
+      - "2024-batch1/DSC_3485"
+      - "2024-batch1/DSC_3487"
 

+ 5 - 4
hugo.toml

@@ -1,4 +1,5 @@
-baseURL = 'https://example.org/'
+
+baseURL = 'https://larsee.com/photography/'
 
 copyright = "© 2024 by Lars Ole Pontoppidan"
 defaultContentLanguage = "en"
@@ -22,7 +23,7 @@ theme = "gallery"
   section = ["HTML"]
 
 [imaging]
-  quality = 75
+  quality = 93
   resampleFilter = "CatmullRom"
   [imaging.exif]
     disableDate = false
@@ -36,8 +37,8 @@ theme = "gallery"
     weight = 4
 
   [[menu.footer]]
-    name = "Store"
-    url = "https://ko-fi.com/larsp"
+    name = "Shop"
+    url = "https://ko-fi.com/larsp/shop"
     weight = 3
 
 

+ 5 - 5
make_galleries.py

@@ -20,9 +20,9 @@ zip_dir = "./downloads"
 def makeThankYou(gallery:str, date_generated:str):
     return """Thank you for purchasing the "%s" gallery from larsee.com/photography!
 
-You have the rights to use the material in this download for any purpose.
+By purchasing this product you are granted a license to use the images for any purpose.
 
-This archive was generated: %s. Note that the gallery contents might change in the future.
+This archive was generated: %s. In the future the gallery contents might change.
 
 Don't hesitate to contact me if you have questions or other inquiries. This is my private email: lars@f-w.dk
 
@@ -96,11 +96,11 @@ class PhotosInGallery():
                 self.cover_photo = p
     
 
-def makeIndexFile(weight:int, gallery:Gallery, photos:PhotosInGallery):
+def makeIndexFile(weight:int, weight_rev:int, gallery:Gallery, photos:PhotosInGallery):
     values = {
         "title" : gallery.title,
         "weight" : weight,
-        "menus" : {"main" : {"weight" : weight}},
+        "menus" : {"main" : {"weight" : weight_rev}},
     }
     if gallery.description is not None:
         values["description"] = gallery.description
@@ -127,7 +127,7 @@ def makeGalleries(yaml_root:Galleries):
 
         photos = PhotosInGallery(yaml_root.picture_root, gallery)
 
-        index = makeIndexFile(weight, gallery, photos)
+        index = makeIndexFile(weight, idx + 1, gallery, photos)
         with open(os.path.join(path, "index.md"), "w") as f:
             f.write(index)