Merge pull request #662 from ReagentX/feat/cs/export-path-filename-len

Fix #661

Author: ReagentX

imessage-exporter/src/app/runtime.rs

@@ -140,12 +140,16 @@ impl Config {
     ///
     /// If it does not, first try and make a flat list of its members. Failing that, use the unique `chat_identifier` field.
     pub fn filename(&self, chatroom: &Chat) -> String {
+        // Calculate effective max length accounting for export path
+        let export_path_len = self.options.export_path.as_os_str().len();
+        let max_len = MAX_LENGTH.saturating_sub(export_path_len + 1);
+
         let mut filename = match &chatroom.display_name() {
             // If there is a display name, use that
             Some(name) => {
                 format!(
                     "{} - {}",
-                    &name[..min(MAX_LENGTH, name.len())],
+                    &name[..min(max_len, name.len())],
                     // Get the deduplicated chat ID to ensure the filename is unique, even if the group name is not
                     self.real_chatrooms
                         .get(&chatroom.rowid)
@@ -181,15 +185,19 @@ impl Config {
     /// - Truncated Names
     ///   - Contact 1, Contact 2, ... Contact 13 and 4 others
     fn filename_from_participants(&self, participants: &BTreeSet<i32>) -> String {
+        // Calculate effective max length accounting for export path
+        let export_path_len = self.options.export_path.as_os_str().len();
+        let max_len = MAX_LENGTH.saturating_sub(export_path_len + 1);
+
         let mut added = 0;
-        let mut out_s = String::with_capacity(MAX_LENGTH);
+        let mut out_s = String::with_capacity(max_len);
         for participant_id in participants {
             let participant_details = match self.resolve_participant(*participant_id) {
                 Some(name) => name.details.as_str(),
                 None => UNKNOWN,
             };
 
-            if participant_details.len() + out_s.len() < MAX_LENGTH {
+            if participant_details.len() + out_s.len() < max_len {
                 if !out_s.is_empty() {
                     out_s.push_str(", ");
                 }
@@ -198,10 +206,10 @@ impl Config {
             } else {
                 let extra = format!(", and {} others", participants.len() - added);
                 let space_remaining = extra.len() + out_s.len();
-                if space_remaining >= MAX_LENGTH {
-                    out_s.replace_range((MAX_LENGTH - extra.len()).., &extra);
+                if space_remaining >= max_len {
+                    out_s.replace_range((max_len - extra.len()).., &extra);
                 } else if out_s.is_empty() {
-                    out_s.push_str(&participant_details[..MAX_LENGTH]);
+                    out_s.push_str(&participant_details[..max_len]);
                 } else {
                     out_s.push_str(&extra);
                 }
@@ -712,7 +720,7 @@ mod filename_tests {
 
         // Get filename
         let filename = app.filename_from_participants(&people);
-        assert_eq!(filename, "Person With An Extremely and Excessively Long Name 10, Person With An Extremely and Excessively Long Name 11, Person With An Extremely and Excessively Long Name 12, Person With An Extremely and Excessively Long Name 13, and 4 others".to_string());
+        assert_eq!(filename, "Person With An Extremely and Excessively Long Name 10, Person With An Extremely and Excessively Long Name 11, Person With An Extremely and Excessively Long Name 12, Person With An Extremely and Excessively Long Name , and 4 others".to_string());
         assert!(filename.len() <= MAX_LENGTH);
     }
 
@@ -731,7 +739,7 @@ mod filename_tests {
 
         // Get filename
         let filename = app.filename_from_participants(&people);
-        assert_eq!(filename, "He slipped his key into the lock, and we all very quietly entered the cell. The sleeper half turned, and then settled down once more into a deep slumber. Holmes stooped to the water-jug, moistened his sponge, and then rubbed it twice v".to_string());
+        assert_eq!(filename, "He slipped his key into the lock, and we all very quietly entered the cell. The sleeper half turned, and then settled down once more into a deep slumber. Holmes stooped to the water-jug, moistened his sponge, and then rubbed it tw".to_string());
         assert!(filename.len() <= MAX_LENGTH);
     }
 
@@ -748,7 +756,7 @@ mod filename_tests {
         let filename = app.filename(&chat);
         assert_eq!(
             filename,
-            "Life is infinitely stranger than anything which the mind of man could invent. We would not dare to conceive the things which are really mere commonplaces of existence. If we could fly out of that window hand in hand, hover over this gr - 0.html"
+            "Life is infinitely stranger than anything which the mind of man could invent. We would not dare to conceive the things which are really mere commonplaces of existence. If we could fly out of that window hand in hand, hover over th - 0.html"
         );
     }