Refactor unwrap

quambene · Jan 22, 2024 · dd14fd1 · dd14fd1
1 parent d131f3e
commit dd14fd1
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/bookmarks/target_bookmarks.rs b/src/bookmarks/target_bookmarks.rs
@@ -1,7 +1,10 @@
 use super::{Action, JsonBookmark};
-use crate::{cache::CacheMode, SourceBookmark, SourceBookmarks, SourceType, UnderlyingType};
+use crate::{
+    cache::CacheMode, errors::BogrepError, SourceBookmark, SourceBookmarks, SourceType,
+    UnderlyingType,
+};
 use chrono::{DateTime, Utc};
-use log::{debug, trace};
+use log::{debug, trace, warn};
 use std::collections::{
     hash_map::{Entry, IntoIter, IntoValues, Iter, IterMut, Keys, Values, ValuesMut},
     HashMap, HashSet,
@@ -212,11 +215,21 @@ impl TargetBookmarks {
         &self,
         source_bookmarks: &'a SourceBookmarks,
     ) -> Vec<&'a SourceBookmark> {
-        // TODO: refactor unwrap
         source_bookmarks
             .iter()
-            .filter(|(url, _)| !self.0.contains_key(&Url::parse(url).unwrap()))
-            .map(|(_, bookmark)| bookmark)
+            .filter_map(|(url, bookmark)| match Url::parse(url) {
+                Ok(url) => {
+                    if !self.0.contains_key(&url) {
+                        Some(bookmark)
+                    } else {
+                        None
+                    }
+                }
+                Err(err) => {
+                    warn!("{}", BogrepError::ParseUrl(err));
+                    None
+                }
+            })
             .collect()
     }