Import and fetch specified urls (#49)

* Import urls

* Fetch specified urls

* Update changelog

CHANGELOG.md

@@ -1,5 +1,11 @@
 <!-- markdownlint-disable MD041 MD034 -->
 
+### Unrelease
+
+- added
+  - Implement `bogrep import --urls <URLs>` (import specified URLs)
+  - Implement `bogrep fetch --urls <URLs>` (fetch specified URLs)
+
 ### v0.4.0
 
 - added

src/args.rs

@@ -32,7 +32,7 @@ pub enum Subcommands {
     /// for new bookmarks; delete cache for removed bookmarks.
     Update(UpdateArgs),
     /// Import bookmarks from the configured source files.
-    Import,
+    Import(ImportArgs),
     /// Fetch and cache bookmarks.
     Fetch(FetchArgs),
     /// Clean up cache for removed bookmarks.
@@ -78,6 +78,16 @@ pub struct SetIgnoredUrls {
     pub ignore: Vec<String>,
 }
 
+/// Describes the arguments for the `import` subcommand.
+#[derive(ClapArgs, Debug)]
+pub struct ImportArgs {
+    /// Import specified URLs as bookmark.
+    ///
+    /// Multiple URLs are separated by a whitespace.
+    #[arg(long, num_args = 0.., value_delimiter = ' ')]
+    pub urls: Vec<String>,
+}
+
 /// Describes the arguments for the `fetch` subcommand.
 #[derive(ClapArgs, Debug)]
 pub struct FetchArgs {
@@ -97,6 +107,12 @@ pub struct FetchArgs {
     /// Multiple urls are separated by a whitespace.
     #[arg(short, long, value_name = "URLs", num_args = 0.., value_delimiter = ' ')]
     pub diff: Vec<String>,
+    /// Fetch and cache specified URLs.
+    ///
+    /// Multiple URLs are separated by a whitespace.
+    /// If an URL is missing in the bookmarks, it will be imported.
+    #[arg(long, num_args = 0.., value_delimiter = ' ')]
+    pub urls: Vec<String>,
 }
 
 /// Describes the arguments for the `init` subcommand.

src/bookmarks/target_bookmarks.rs

@@ -93,16 +93,16 @@ impl TargetBookmarks {
     /// the target bookmarks.
     pub fn update(
         &mut self,
-        source_bookmarks: SourceBookmarks,
+        source_bookmarks: &SourceBookmarks,
     ) -> Result<(Vec<TargetBookmark>, Vec<TargetBookmark>), anyhow::Error> {
         if self.bookmarks.is_empty() {
             self.bookmarks = Self::from(source_bookmarks.clone()).bookmarks;
             return Ok((vec![], vec![]));
         }
 
         let now = Utc::now();
-        let urls_to_add = self.filter_to_add(&source_bookmarks);
-        let bookmarks_to_remove = self.filter_to_remove(&source_bookmarks);
+        let urls_to_add = self.filter_to_add(source_bookmarks);
+        let bookmarks_to_remove = self.filter_to_remove(source_bookmarks);
         let mut bookmarks_to_add = vec![];
 
         for url in urls_to_add {
@@ -208,7 +208,7 @@ mod tests {
                 None,
             )],
         };
-        let res = target_bookmarks.update(source_bookmarks);
+        let res = target_bookmarks.update(&source_bookmarks);
         assert!(res.is_ok());
         assert_eq!(
             target_bookmarks

src/cmd/fetch.rs

@@ -6,7 +6,7 @@ use crate::{
 use chrono::Utc;
 use colored::Colorize;
 use futures::{stream, StreamExt};
-use log::{debug, trace, warn};
+use log::{debug, info, trace, warn};
 use similar::{ChangeTag, TextDiff};
 
 /// Fetch and cache bookmarks.
@@ -17,15 +17,26 @@ pub async fn fetch(config: &Config, args: &FetchArgs) -> Result<(), anyhow::Erro
     let mut target_reader = utils::open_file_in_read_mode(&config.target_bookmark_file)?;
     let mut target_writer = utils::open_and_truncate_file(&config.target_bookmark_lock_file)?;
 
-    fetch_and_cache(
-        &client,
-        &cache,
-        &mut target_reader,
-        &mut target_writer,
-        config.settings.max_concurrent_requests,
-        args.all,
-    )
-    .await?;
+    if args.urls.is_empty() {
+        fetch_and_cache(
+            &client,
+            &cache,
+            &mut target_reader,
+            &mut target_writer,
+            config.settings.max_concurrent_requests,
+            args.all,
+        )
+        .await?;
+    } else {
+        fetch_urls(
+            &args.urls,
+            &client,
+            &cache,
+            &mut target_reader,
+            &mut target_writer,
+        )
+        .await?;
+    }
 
     utils::close_and_rename(
         (target_writer, &config.target_bookmark_lock_file),
@@ -35,6 +46,29 @@ pub async fn fetch(config: &Config, args: &FetchArgs) -> Result<(), anyhow::Erro
     Ok(())
 }
 
+pub async fn fetch_urls(
+    urls: &[String],
+    client: &impl Fetch,
+    cache: &impl Caching,
+    target_reader: &mut impl ReadTarget,
+    target_writer: &mut impl WriteTarget,
+) -> Result<(), anyhow::Error> {
+    let now = Utc::now();
+    let mut target_bookmarks = TargetBookmarks::default();
+    target_reader.read(&mut target_bookmarks)?;
+
+    for url in urls {
+        let mut bookmark = TargetBookmark::new(url, now, None);
+        fetch_and_add(client, cache, &mut bookmark, true).await?;
+        info!("Fetched website for {url}");
+        target_bookmarks.add(&bookmark);
+    }
+
+    target_writer.write(&target_bookmarks)?;
+
+    Ok(())
+}
+
 pub async fn fetch_and_cache(
     client: &impl Fetch,
     cache: &impl Caching,