Merge pull request #86 from proshunsuke/v3.0.2

v3.0.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Packaging
 
+# v3.0.2
+
+https://github.com/proshunsuke/colmsg/pull/86
+
+## Fix bugs
+
+* fixed error when files other than message files exist in the download directory
+
 # v3.0.1
 
 https://github.com/proshunsuke/colmsg/pull/80

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "colmsg"
-version = "3.0.1"
+version = "3.0.2"
 authors = ["proshunsuke <[email protected]>"]
 categories = ["command-line-utilities"]
 description="Save the messages of '櫻坂46メッセージ', '日向坂46メッセージ' and '乃木坂46メッセージ' apps to the local."

src/message/saver.rs

@@ -173,17 +173,17 @@ impl<'b, C: SHNClient> Saver<'b, C> {
     }
 
     fn id_dates(&self, dir_buf: &PathBuf) -> Vec<IdDate> {
-        WalkDir::new(dir_buf)
-            .sort_by(move |a, b| {
-                id_by_filename_format(&a).cmp(&id_by_filename_format(&b))
-            })
+        let mut result = WalkDir::new(dir_buf)
             .into_iter()
             .filter(|r| !r.as_ref().unwrap().path().is_dir())
             .map(|r| {
                 let dir_entry = r.unwrap();
-                IdDate { id: id_by_filename_format(&dir_entry), date: date_by_filename_format(&dir_entry) }
+                dir_entry_to_id_date(&dir_entry)
             })
-            .collect::<Vec<_>>()
+            .flatten()
+            .collect::<Vec<_>>();
+        result.sort_by(|a, b| a.id.cmp(&b.id));
+        result
     }
 
     fn latest_date(&self, id_dates: &Vec<IdDate>) -> Result<String> {
@@ -214,14 +214,11 @@ struct IdDate {
     date: String,
 }
 
-fn id_by_filename_format(filename: &DirEntry) -> u32 {
-    let re = Regex::new(r"(?x)(?P<id>\d+)_*").unwrap();
-    let caps = &re.captures(filename.file_name().to_str().unwrap()).unwrap();
-    caps["id"].parse::<u32>().unwrap()
-}
-
-fn date_by_filename_format(filename: &DirEntry) -> String {
-    let re = Regex::new(r"(?x)\d+_\d_(?P<date>\d+)").unwrap();
-    let caps = &re.captures(filename.file_name().to_str().unwrap()).unwrap();
-    caps["date"].to_string()
+fn dir_entry_to_id_date(filename: &DirEntry) -> Option<IdDate> {
+    let re = Regex::new(r"(?x)(?P<id>\d+)_\d_(?P<date>\d+)").unwrap();
+    re.captures(filename.file_name().to_str().unwrap())
+        .and_then(|cap|Some(IdDate {
+            id: cap["id"].parse::<u32>().unwrap(),
+            date: cap["date"].to_string()
+        }))
 }