feat: adding feed and fixing website module

Author: crocidb

src/main.rs

@@ -1,9 +1,9 @@
-mod website;
+mod site;
 
 use std::path::Path;
 
 use clap::{Parser, Subcommand};
-use website::{MediaLibrary, Website};
+use site::{MediaLibrary, Website};
 
 #[derive(Parser)]
 #[command(author, version, about)]

src/website/media_library.rs src/site/media_library.rssrc/website/media_library.rs renamed to src/site/media_library.rs

@@ -4,4 +4,4 @@ mod website_info;
 mod website_item;
 
 pub use media_library::MediaLibrary;
-pub use website::{BuildReport, Website};
+pub use website::Website;

src/website/mod.rs src/site/mod.rssrc/website/mod.rs renamed to src/site/mod.rs

@@ -6,17 +6,20 @@ use std::time::{Duration, Instant};
 use rayon::prelude::*;
 
 use super::media_library::{MediaLibrary, MediaLibraryError};
-use super::website_info::{SITE_TOML, WebsiteInfo, WebsiteInfoError};
+use super::website_info::{WebsiteInfo, WebsiteInfoError, SITE_TOML};
 use super::website_item::{GenerationResult, WebsiteItem};
 
 const DEFAULT_BUILD_DIR: &str = "build";
 const DEFAULT_MEDIA_DIR: &str = "media";
 const DEFAULT_PUBLIC_DIR: &str = "public";
 
+const DEFAULT_FEED_FILE: &str = "feed.xml";
+
 const TEMPLATE_INDEX: &str = include_str!("../../template/index.html");
 const TEMPLATE_STYLE: &str = include_str!("../../template/public/style.css");
 const TEMPLATE_JS: &str = include_str!("../../template/public/clutterlog.js");
 const TEMPLATE_GITHUB_ACTION: &str = include_str!("../../template/github_action.yaml");
+const TEMPLATE_RSS: &str = include_str!("../../template/rss.xml");
 
 pub struct BuildReport {
     pub items_processed: usize,
@@ -171,7 +174,7 @@ impl Website {
         library.update_metadata(&source_media_path)?;
 
         // Scan source media directory, copy files, generate thumbnails, and collect data entries
-        let (clutterlog_data, generation_results) =
+        let (clutterlog_data, rss_items, generation_results) =
             self.scan_and_copy_media(&source_media_path, &build_media_path, &library)?;
 
         // Render index.html from template
@@ -184,6 +187,23 @@ impl Website {
         let index_path = build_path.join("index.html");
         fs::write(&index_path, &rendered).map_err(|e| WebsiteError::Io(index_path, e))?;
 
+        // Render and write feed.xml
+        let rss_items_str = if rss_items.is_empty() {
+            String::new()
+        } else {
+            format!("{}\n", rss_items.join("\n"))
+        };
+        let base_url = self.info.url.trim_end_matches('/');
+        let feed_url = format!("{}/", base_url);
+        let rss_rendered = TEMPLATE_RSS
+            .replace("{{title}}", &escape_html(&self.info.title))
+            .replace("{{url}}", &escape_html(&feed_url))
+            .replace("{{description}}", &escape_html(&self.info.description))
+            .replace("{{items}}", &rss_items_str);
+
+        let rss_path = build_path.join(DEFAULT_FEED_FILE);
+        fs::write(&rss_path, &rss_rendered).map_err(|e| WebsiteError::Io(rss_path, e))?;
+
         // Write static assets
         let style_path = public_path.join("style.css");
         fs::write(&style_path, TEMPLATE_STYLE).map_err(|e| WebsiteError::Io(style_path, e))?;
@@ -202,11 +222,11 @@ impl Website {
         source_path: &Path,
         dest_path: &Path,
         library: &MediaLibrary,
-    ) -> Result<(String, Vec<GenerationResult>), WebsiteError> {
+    ) -> Result<(String, Vec<String>, Vec<GenerationResult>), WebsiteError> {
         let base_url = self.info.url.trim_end_matches('/');
 
         if !source_path.exists() {
-            return Ok(("[]".to_string(), Vec::new()));
+            return Ok(("[]".to_string(), Vec::new(), Vec::new()));
         }
 
         let dir_entries = fs::read_dir(source_path)
@@ -224,23 +244,30 @@ impl Website {
             .collect();
 
         // Process items in parallel: copy files and generate thumbnails
-        let processed: Vec<Result<(GenerationResult, String), WebsiteError>> = items
+        let processed: Vec<Result<(GenerationResult, String, String), WebsiteError>> = items
             .par_iter()
             .filter_map(|(path, datetime)| {
                 let item = WebsiteItem::from_path(path, datetime.as_deref())?;
                 let result = item.copy_and_generate_thumb(dest_path);
                 let entry = item.to_json_entry(base_url, DEFAULT_MEDIA_DIR);
-                Some(result.map(|r| (r, entry)))
+                let rss_item = item.to_rss_item(base_url, DEFAULT_MEDIA_DIR);
+                let image_url = item.image_url(base_url, DEFAULT_MEDIA_DIR);
+                Some(result.map(|mut r| {
+                    r.image_url = image_url;
+                    (r, entry, rss_item)
+                }))
             })
             .collect();
 
         // Collect results, propagating any errors
         let mut results: Vec<GenerationResult> = Vec::new();
         let mut entries: Vec<String> = Vec::new();
+        let mut rss_items: Vec<String> = Vec::new();
         for item_result in processed {
-            let (gen_result, entry) = item_result?;
+            let (gen_result, entry, rss_item) = item_result?;
             results.push(gen_result);
             entries.push(entry);
+            rss_items.push(rss_item);
         }
 
         let json = if entries.is_empty() {
@@ -249,7 +276,7 @@ impl Website {
             format!("[\n{}\n        ]", entries.join(",\n"))
         };
 
-        Ok((json, results))
+        Ok((json, rss_items, results))
     }
 }
 

src/website/website.rs src/site/website.rssrc/website/website.rs renamed to src/site/website.rs

@@ -15,9 +15,9 @@ pub const SUPPORTED_EXTENSIONS: &[&str] = &["png", "jpg", "jpeg", "webp", "gif",
 const THUMB_SIZE: u32 = 350;
 
 pub struct GenerationResult {
-    pub filename: String,
     pub media_size: u64,
     pub thumb_size: u64,
+    pub image_url: String,
 }
 
 pub struct WebsiteItem {
@@ -106,9 +106,9 @@ impl WebsiteItem {
             .len();
 
         Ok(GenerationResult {
-            filename: self.filename.clone(),
             media_size,
             thumb_size,
+            image_url: String::new(), // filled in by scan_and_copy_media
         })
     }
 
@@ -195,6 +195,58 @@ impl WebsiteItem {
             escape_js(&self.datetime),
         )
     }
+
+    pub fn image_url(&self, base_url: &str, media_dir: &str) -> String {
+        format!("{}/{}/{}", base_url, media_dir, self.filename)
+    }
+
+    pub fn to_rss_item(&self, base_url: &str, media_dir: &str) -> String {
+        let base_url = base_url.trim_end_matches('/');
+        let image_url = self.image_url(base_url, media_dir);
+        let item_link = format!("{}/#media={}", base_url, self.filename);
+        let pub_date = datetime_to_rfc2822(&self.datetime);
+        let mime = mime_type(&self.extension);
+
+        format!(
+            "        <item>\n            <title>{}</title>\n            <link>{}</link>\n            <guid>{}</guid>\n            <pubDate>{}</pubDate>\n            <enclosure url=\"{}\" type=\"{}\" length=\"0\"/>\n        </item>",
+            escape_xml(&self.title),
+            escape_xml(&item_link),
+            escape_xml(&image_url),
+            pub_date,
+            escape_xml(&image_url),
+            mime,
+        )
+    }
+}
+
+fn mime_type(extension: &str) -> &'static str {
+    match extension {
+        "jpg" | "jpeg" => "image/jpeg",
+        "png" => "image/png",
+        "webp" => "image/webp",
+        "gif" => "image/gif",
+        "webm" => "video/webm",
+        "mp4" => "video/mp4",
+        _ => "application/octet-stream",
+    }
+}
+
+fn datetime_to_rfc2822(datetime: &str) -> String {
+    use chrono::NaiveDateTime;
+    NaiveDateTime::parse_from_str(datetime, "%Y-%m-%dT%H:%M:%S")
+        .map(|ndt| {
+            let dt = ndt.and_utc();
+            dt.format("%a, %d %b %Y %H:%M:%S +0000").to_string()
+        })
+        .unwrap_or_else(|_| datetime.to_string())
+}
+
+fn escape_xml(s: &str) -> String {
+    s.replace('&', "&amp;")
+        .replace('<', "&lt;")
+        .replace('>', "&gt;")
+        .replace('"', "&quot;")
+        .replace('\'', "&apos;")
 }
 
 fn center_crop_resize(img: &image::DynamicImage, size: u32) -> image::DynamicImage {

src/website/website_info.rs src/site/website_info.rssrc/website/website_info.rs renamed to src/site/website_info.rs

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{title}}</title>
     <link rel="stylesheet" href="public/style.css">
+    <link rel="alternate" type="application/rss+xml" title="{{title}}" href="feed.xml">
 </head>
 <body>
     <main>

src/website/website_item.rs src/site/website_item.rssrc/website/website_item.rs renamed to src/site/website_item.rs

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+    <channel>
+        <title>{{title}}</title>
+        <link>{{url}}</link>
+        <description>{{description}}</description>
+        <atom:link href="{{url}}feed.xml" rel="self" type="application/rss+xml"/>
+{{items}}    </channel>
+</rss>