Merge pull request #262 from ReagentX/feat/cs/improve-windows-compati…

…blity Feat/cs/improve windows compatiblity
ReagentX · May 22, 2024 · 915cd1a · 915cd1a
2 parents 59906be + ab549e6
commit 915cd1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/imessage-database/src/util/dirs.rs b/imessage-database/src/util/dirs.rs
@@ -7,9 +7,9 @@ use std::{env::var, path::PathBuf};
 use crate::tables::table::DEFAULT_PATH_MACOS;
 
 /// Get the user's home directory (macOS only)
-/// 
+///
 /// # Panics
-/// 
+///
 /// Will panic if the environment variable `$HOME` is missing.
 ///
 /// # Example:
@@ -21,10 +21,7 @@ use crate::tables::table::DEFAULT_PATH_MACOS;
 /// println!("{path}");
 /// ```
 pub fn home() -> String {
-    match var("HOME") {
-        Ok(path) => path,
-        Err(why) => panic!("Unable to resolve user home directory: {why}"),
-    }
+    var("HOME").unwrap_or_default()
 }
 
 /// Get the default path the macOS iMessage database is located at (macOS only)

diff --git a/imessage-exporter/README.md b/imessage-exporter/README.md
@@ -82,6 +82,11 @@ The [releases page](https://github.com/ReagentX/imessage-exporter/releases) prov
         
 -m, --custom-name <custom-name>
         Specify an optional custom name for the database owner's messages in exports
+        Conflicts with --use-caller-id
+        
+-i, --use-caller-id
+        Use the database owner's caller ID in exports instead of "Me"
+        Conflicts with --custom-name
         
 -b, --ignore-disk-warning
         Bypass the disk space check when exporting data

diff --git a/imessage-exporter/src/exporters/resources/example.html b/imessage-exporter/src/exporters/resources/example.html
@@ -1,6 +1,6 @@
 <html>
 <meta charset="UTF-8">
-<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
+<meta name="viewport" content="width=device-width, initial-scale=1">
 
 <link rel="stylesheet" type="text/css" href="style.css">