add gemtext support, update debug handler, reorganize api to use with file-based multi-feed config, update version to 0.2

.gitignore

@@ -1,2 +1,3 @@
+/public
 /target
 Cargo.lock

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "rssto"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2024"
 license = "MIT"
 readme = "README.md"
-description = "Aggregate RSS feeds into different formats"
-keywords = ["rss", "aggregator", "convertor", "conversion", "static"]
+description = "Convert RSS feeds into multiple formats"
+keywords = ["rss", "aggregator", "conversion", "html", "gemtext"]
 categories = ["command-line-utilities", "parsing", "text-processing", "value-formatting"]
 repository = "https://github.com/YGGverse/rssto"
 
@@ -13,5 +13,10 @@ repository = "https://github.com/YGGverse/rssto"
 anyhow = "1.0"
 chrono = "^0.4.20"
 clap = { version = "4.5", features = ["derive"] }
+log = "0.4"
 reqwest = { version = "0.12", features = ["blocking"] }
 rss = "2.0"
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.9"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+url = "2.5"

README.md

@@ -4,15 +4,14 @@
 [![Dependencies](https://deps.rs/repo/github/YGGverse/rssto/status.svg)](https://deps.rs/repo/github/YGGverse/rssto)
 [![crates.io](https://img.shields.io/crates/v/rssto.svg)](https://crates.io/crates/rssto)
 
-## Aggregate RSS feeds into different formats
-
-A simple multi-source feed aggregator that outputs static files in multiple formats.
+Convert RSS feeds into multiple formats
 
 ## Roadmap
 
 * [x] HTML
+* [x] [Gemtext](https://geminiprotocol.net/docs/gemtext.gmi)
+* [ ] JSON
 * [ ] Markdown
-* [ ] Gemtext
 
 ## Install
 
@@ -23,27 +22,12 @@ cargo install rssto
 ## Launch
 
 ``` bash
-rssto --source https://path/to/source1.rss\
-      --target /path/to/source1dir\
-      --source https://path/to/source2.rss\
-      --target /path/to/source2dir\
-      --format html
-```
-
-### Options
-
-``` bash
--d, --debug <DEBUG>              Show output (`d` - debug, `e` - error, `i` - info) [default: ei]
--f, --format <FORMAT>            Export formats (`html`,`md`,etc.) [default: html]
--l, --limit <LIMIT>              Limit channel items (unlimited by default)
--s, --source <SOURCE>            RSS feed URL(s)
-    --target <TARGET>            Destination directory
-    --template <TEMPLATE>        Path to template directory [default: template]
-    --time-format <TIME_FORMAT>  Use custom time format [default: "%Y/%m/%d %H:%M:%S %z"]
--u, --update <UPDATE>            Update timeout in seconds [default: 60]
--h, --help                       Print help
--V, --version                    Print version
+rssto -c config/example.toml
 ```
+> [!TIP]
+> * prepend `RUST_LOG=DEBUG` to print worker details (supported [levels](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.LevelFilter.html))
+> * append `-u TIME` to run as the daemon with `TIME` interval update
+> * see `rssto --help` to print all available options
 
 ### Autostart
 
@@ -51,32 +35,35 @@ rssto --source https://path/to/source1.rss\
 
 1. Install `rssto` by copy the binary compiled into the native system apps destination:
 
-  * Linux: `sudo cp /home/user/.cargo/bin/rssto /usr/local/bin`
+  * Linux: `sudo install /home/user/.cargo/bin/rssto /usr/local/bin/rssto`
 
-2. Create `systemd` configuration file:
+2. Create `systemd` configuration file at `/etc/systemd/system/rssto.service`:
 
 ``` rssto.service
-# /etc/systemd/system/rssto.service
-
 [Unit]
 After=network-online.target
 Wants=network-online.target
 
 [Service]
 Type=simple
+
 User=rssto
 Group=rssto
-ExecStart=/usr/local/bin/rssto  --source https://path/to/source1.rss\
-                                --target /path/to/source1dir\
-                                --source https://path/to/source2.rss\
-                                --target /path/to/source2dir\
-                                --format html
-                                --time-format %%Y/%%m/%%d %%H:%%M:%%S
+
+# Uncomment for debug
+# Environment="RUST_LOG=debug"
+# Environment="NO_COLOR=1"
+
+ExecStart=/usr/local/bin/rssto  --config /path/to/config1.toml\
+                                --config /path/to/config2.toml
+
+StandardOutput=file:///home/rssto/debug.log
+StandardError=file:///home/rssto/error.log
 
 [Install]
 WantedBy=multi-user.target
 ```
-* on format time, make sure `%` is escaped to `%%`
+* example above requires new system user (`useradd -m rssto`)
 
 3. Run in priority:
 

config/example.toml

@@ -0,0 +1,19 @@
+update = 60
+
+[[feed]]
+url = "https://assets.censor.net/rss/censor.net/rss_uk_news.xml"
+storage = "./public/censor.net/rss_uk_news"
+templates = ["./template/html","./template/gmi"]
+list_items_limit = 20
+pub_date_format = "%Y/%m/%d %H:%M:%S %z"
+last_build_date_format = "%Y/%m/%d %H:%M:%S %z"
+time_generated_format = "%Y/%m/%d %H:%M:%S %z"
+
+[[feed]]
+url = "https://assets.censor.net/rss/censor.net/rss_uk_resonance.xml"
+storage = "./public/censor.net/rss_uk_resonance"
+templates = ["./template/html","./template/gmi"]
+list_items_limit = 20
+pub_date_format = "%Y/%m/%d %H:%M:%S %z"
+last_build_date_format = "%Y/%m/%d %H:%M:%S %z"
+time_generated_format = "%Y/%m/%d %H:%M:%S %z"

src/argument.rs

@@ -1,37 +1,12 @@
 use clap::Parser;
+use std::path::PathBuf;
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 pub struct Argument {
-    /// Show output (`d` - debug, `e` - error, `i` - info)
-    #[arg(short, long, default_value_t = String::from("ei"))]
-    pub debug: String,
-
-    /// Export formats (`html`,`md`,etc.)
-    #[arg(short, long, default_values_t = [String::from("html")])]
-    pub format: Vec<String>,
-
-    /// Limit channel items (unlimited by default)
+    /// Path to config file
+    ///
+    /// * see `config/example.toml`
     #[arg(short, long)]
-    pub limit: Option<usize>,
-
-    /// RSS feed URL(s)
-    #[arg(short, long)]
-    pub source: Vec<String>,
-
-    /// Destination directory
-    #[arg(long)]
-    pub target: Vec<String>,
-
-    /// Path to template directory
-    #[arg(long, default_value_t = String::from("template"))]
-    pub template: String,
-
-    /// Use custom time format
-    #[arg(long, default_value_t = String::from("%Y/%m/%d %H:%M:%S %z"))]
-    pub time_format: String,
-
-    /// Update timeout in seconds
-    #[arg(short, long, default_value_t = 60)]
-    pub update: u64,
+    pub config: PathBuf,
 }

src/config.rs

@@ -0,0 +1,32 @@
+use serde::Deserialize;
+use std::path::PathBuf;
+use url::Url;
+
+#[derive(Debug, Deserialize)]
+pub struct Feed {
+    /// RSS feed source
+    pub url: Url,
+
+    /// Destination directory
+    pub storage: PathBuf,
+
+    /// Path to templates (export formats)
+    pub templates: Vec<PathBuf>,
+
+    /// Limit channel items (unlimited by default)
+    pub list_items_limit: Option<usize>,
+
+    pub pub_date_format: String,
+    pub last_build_date_format: String,
+    pub time_generated_format: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    pub feed: Vec<Feed>,
+
+    /// Update timeout in seconds
+    ///
+    /// * None to generate once
+    pub update: Option<u64>,
+}

src/debug.rs

@@ -1,48 +0,0 @@
-use anyhow::{Result, bail};
-
-#[derive(PartialEq)]
-pub enum Level {
-    //Debug,
-    //Error,
-    Info,
-}
-
-impl Level {
-    fn parse(value: char) -> Result<Self> {
-        match value {
-            //'d' => Ok(Self::Debug),
-            //'e' => Ok(Self::Error),
-            'i' => Ok(Self::Info),
-            _ => bail!("Unsupported debug value `{value}`!"),
-        }
-    }
-}
-
-pub struct Debug(Vec<Level>);
-
-impl Debug {
-    pub fn init(values: &str) -> Result<Self> {
-        let mut l = Vec::with_capacity(values.len());
-        for s in values.to_lowercase().chars() {
-            l.push(Level::parse(s)?);
-        }
-        Ok(Self(l))
-    }
-
-    /* @TODO
-    pub fn error(&self, message: &str) {
-        if self.has(Level::Error) {
-            eprintln!("[{}] [error] {message}", t());
-        }
-    } */
-
-    pub fn info(&self, message: &str) {
-        if self.0.contains(&Level::Info) {
-            println!("[{}] [info] {message}", t());
-        }
-    }
-}
-
-fn t() -> String {
-    crate::time::utc().to_rfc3339()
-}

src/format.rs

@@ -1,57 +0,0 @@
-use anyhow::{Result, bail};
-
-pub struct Template {
-    pub index: String,
-    pub index_item: String,
-}
-
-impl Template {
-    pub fn html(template_path: &str) -> Result<Self> {
-        use std::{fs::read_to_string, path::PathBuf, str::FromStr};
-
-        let mut p = PathBuf::from_str(template_path)?;
-        p.push("html");
-
-        Ok(Self {
-            index: read_to_string(&{
-                let mut p = PathBuf::from(&p);
-                p.push("index.html");
-                p
-            })?,
-            index_item: read_to_string(&{
-                let mut p = PathBuf::from(&p);
-                p.push("index");
-                p.push("item.html");
-                p
-            })?,
-        })
-    }
-}
-
-pub enum Type {
-    Html(Template),
-}
-
-impl Type {
-    fn parse(format: &str, template_path: &str) -> Result<Self> {
-        if matches!(format.to_lowercase().as_str(), "html") {
-            return Ok(Self::Html(Template::html(template_path)?));
-        }
-        bail!("Format `{format}` support yet not implemented!")
-    }
-}
-
-pub struct Format(Vec<Type>);
-
-impl Format {
-    pub fn init(values: &Vec<String>, template: &str) -> Result<Self> {
-        let mut f = Vec::with_capacity(values.len());
-        for s in values {
-            f.push(Type::parse(s, template)?);
-        }
-        Ok(Self(f))
-    }
-    pub fn get(&self) -> &Vec<Type> {
-        &self.0
-    }
-}

src/main.rs

@@ -1,101 +1,130 @@
 mod argument;
-mod debug;
-mod format;
-mod target;
-mod time;
+mod config;
 
-use anyhow::{Result, bail};
+use anyhow::Result;
 use argument::Argument;
-use debug::Debug;
-use format::Format;
-use format::Type;
-use target::Target;
-use time::Time;
+use chrono::{DateTime, Local};
+use clap::Parser;
+use config::{Config, Feed};
+use log::{debug, info};
+use std::{
+    env::var,
+    fs::{File, create_dir_all, read_to_string},
+    io::Write,
+    path::PathBuf,
+};
 
 fn main() -> Result<()> {
-    use clap::Parser;
-    use std::{thread::sleep, time::Duration};
-
-    let argument = Argument::parse();
-
-    // parse argument values once
-    let debug = Debug::init(&argument.debug)?;
-    let format = Format::init(&argument.format, &argument.template)?;
-    let target = Target::init(&argument.target)?;
-    let time = Time::init(argument.time_format);
-
-    // validate some targets
-    if argument.source.len() != argument.target.len() {
-        bail!("Targets quantity does not match sources!")
+    if var("RUST_LOG").is_ok() {
+        use tracing_subscriber::{EnvFilter, fmt::*};
+        struct T;
+        impl time::FormatTime for T {
+            fn format_time(&self, w: &mut format::Writer<'_>) -> std::fmt::Result {
+                write!(w, "{}", Local::now())
+            }
+        }
+        fmt()
+            .with_timer(T)
+            .with_env_filter(EnvFilter::from_default_env())
+            .init()
     }
 
-    debug.info("Crawler started");
+    let argument = Argument::parse();
+    let config: Config = toml::from_str(&read_to_string(argument.config)?)?;
+
+    info!("Crawler started");
 
     loop {
-        debug.info("Begin new crawl queue...");
-        for (i, s) in argument.source.iter().enumerate() {
-            debug.info(&format!("Update {s}..."));
-            crawl((s, i), &format, &target, &time, &argument.limit)?;
+        debug!("Begin new crawl queue...");
+
+        for feed in &config.feed {
+            debug!("Update `{}`...", feed.url);
+            crawl(feed)?
+        }
+
+        debug!("Crawl queue completed");
+
+        if let Some(update) = config.update {
+            debug!("Wait {update} seconds to continue...",);
+            std::thread::sleep(std::time::Duration::from_secs(update))
+        } else {
+            return Ok(());
         }
-        debug.info(&format!(
-            "Crawl queue completed, wait {} seconds to continue...",
-            argument.update
-        ));
-        sleep(Duration::from_secs(argument.update));
     }
 }
 
-fn crawl(
-    source: (&str, usize),
-    format: &Format,
-    target: &Target,
-    time: &Time,
-    limit: &Option<usize>,
-) -> Result<()> {
+fn crawl(feed: &Feed) -> Result<()> {
     use reqwest::blocking::get;
     use rss::Channel;
-    use std::{fs::File, io::Write};
 
-    let c = Channel::read_from(&get(source.0)?.bytes()?[..])?;
-    let i = c.items();
-    let l = limit.unwrap_or(i.len());
+    let channel = Channel::read_from(&get(feed.url.as_str())?.bytes()?[..])?;
+    let channel_items = channel.items();
+    let channel_items_limit = feed.list_items_limit.unwrap_or(channel_items.len());
 
-    for f in format.get() {
-        match f {
-            Type::Html(template) => File::create(target.index(source.1, "html"))?.write_all(
-                template
-                    .index
-                    .replace("{title}", c.title())
-                    .replace("{description}", c.description())
-                    .replace("{link}", c.link())
-                    .replace("{language}", c.language().unwrap_or_default())
-                    .replace("{pub_date}", &time.format(c.pub_date()))
-                    .replace("{last_build_date}", &time.format(c.last_build_date()))
-                    .replace("{time_generated}", &time.now())
-                    .replace("{items}", &{
-                        let mut items = String::with_capacity(l);
-                        for (n, item) in i.iter().enumerate() {
-                            if n > l {
-                                break;
-                            }
-                            items.push_str(
-                                &template
-                                    .index_item
-                                    .replace("{title}", item.title().unwrap_or_default())
-                                    .replace(
-                                        "{description}",
-                                        item.description().unwrap_or_default(),
-                                    )
-                                    .replace("{link}", item.link().unwrap_or_default())
-                                    .replace("{time}", &time.format(item.pub_date())),
-                            )
-                        }
-                        items
-                    })
-                    .as_bytes(),
-            )?,
-        }
+    for template in &feed.templates {
+        let root = PathBuf::from(template);
+        let extension = root.file_name().unwrap().to_string_lossy();
+
+        let index = {
+            let mut p = PathBuf::from(&root);
+            p.push(format!("index.{extension}"));
+            read_to_string(p)?
+        };
+
+        let index_item = {
+            let mut p = PathBuf::from(&root);
+            p.push("index");
+            p.push(format!("item.{extension}"));
+            read_to_string(p)?
+        };
+
+        create_dir_all(&feed.storage)?;
+        File::create({
+            let mut p = PathBuf::from(&feed.storage);
+            p.push(format!("index.{extension}"));
+            p
+        })?
+        .write_all(
+            index
+                .replace("{title}", channel.title())
+                .replace("{description}", channel.description())
+                .replace("{link}", channel.link())
+                .replace("{language}", channel.language().unwrap_or_default())
+                .replace(
+                    "{pub_date}",
+                    &time(channel.pub_date(), &feed.pub_date_format),
+                )
+                .replace(
+                    "{last_build_date}",
+                    &time(channel.last_build_date(), &feed.last_build_date_format),
+                )
+                .replace("{time_generated}", &time(None, &feed.time_generated_format))
+                .replace(
+                    "{items}",
+                    &channel_items
+                        .iter()
+                        .take(channel_items_limit)
+                        .map(|i| {
+                            index_item
+                                .replace("{title}", i.title().unwrap_or_default())
+                                .replace("{description}", i.description().unwrap_or_default())
+                                .replace("{link}", i.link().unwrap_or_default())
+                                .replace("{pub_date}", &time(i.pub_date(), &feed.pub_date_format))
+                        })
+                        .collect::<String>(),
+                )
+                .as_bytes(),
+        )?
     }
 
     Ok(())
 }
+
+fn time(value: Option<&str>, format: &str) -> String {
+    match value {
+        Some(v) => DateTime::parse_from_rfc2822(v).unwrap(),
+        None => Local::now().into(),
+    }
+    .format(format)
+    .to_string()
+}

src/target.rs

@@ -1,25 +0,0 @@
-use anyhow::{Result, bail};
-use std::{fs, path::PathBuf, str::FromStr};
-
-pub struct Target(Vec<PathBuf>);
-
-impl Target {
-    pub fn init(paths: &Vec<String>) -> Result<Self> {
-        let mut t = Vec::with_capacity(paths.len());
-        for path in paths {
-            let p = PathBuf::from_str(path)?;
-            if fs::metadata(&p).is_ok_and(|t| t.is_file()) {
-                bail!("Target destination exists and not directory!")
-            }
-            fs::create_dir_all(&p)?;
-            t.push(p)
-        }
-        Ok(Self(t))
-    }
-
-    pub fn index(&self, index: usize, extension: &str) -> PathBuf {
-        let mut p = PathBuf::from(&self.0[index]);
-        p.push(format!("index.{extension}"));
-        p
-    }
-}

src/time.rs

@@ -1,29 +0,0 @@
-use chrono::{DateTime, Utc};
-
-pub struct Time(String);
-
-impl Time {
-    pub fn init(format: String) -> Self {
-        Self(format)
-    }
-
-    pub fn format(&self, value: Option<&str>) -> String {
-        match value {
-            Some(v) => chrono::DateTime::parse_from_rfc2822(v)
-                .unwrap()
-                .format(&self.0)
-                .to_string(),
-            None => todo!(),
-        }
-    }
-
-    pub fn now(&self) -> String {
-        utc().format(&self.0).to_string()
-    }
-}
-
-pub fn utc() -> DateTime<Utc> {
-    let s = std::time::SystemTime::now();
-    let c: chrono::DateTime<chrono::Utc> = s.into();
-    c
-}

template/gmi/index.gmi

@@ -0,0 +1,7 @@
+# {title}
+
+{description}
+
+## {time_generated}
+
+{items}

template/gmi/index/item.gmi

@@ -0,0 +1,6 @@
+
+### {title}
+
+{description}
+
+=> {link} {pub_date}

template/html/index/item.html

@@ -1,5 +1,5 @@
 <article>
     <h2>{title}</h2>
     <p>{description}</p>
-    <a href="{link}">{time}</a>
+    <a href="{link}">{pub_date}</a>
 </article>