Make Init return bool result, clean up a bit

bindings.h

@@ -145,7 +145,7 @@ FFIResult<MerchRecordVec> get_merchandise_list(const char *api_url,
                                                const char *api_key,
                                                int32_t merchandise_list_id);
 
-void init();
+bool init();
 
 bool status_check(const char *api_url);
 

src/lib.rs

@@ -1,6 +1,5 @@
 #![allow(non_snake_case)]
 #![feature(vec_into_raw_parts)]
-#![feature(unwind_attributes)]
 #[macro_use]
 extern crate lazy_static;
 
@@ -247,13 +246,19 @@ unsafe impl Sync for MerchRecord {}
 
 
 #[no_mangle]
-pub extern "C" fn init() {
+pub extern "C" fn init() -> bool {
-    info!("init called");
+    match dirs::document_dir() {
-    let mut log_dir = dirs::document_dir().expect("could not get Documents directory");
+        Some(mut log_dir) => {
             log_dir.push(Path::new(
                 r#"My Games\Skyrim Special Edition\SKSE\BazaarRealmClient.log"#,
             ));
-    simple_logging::log_to_file(log_dir, LevelFilter::Info).unwrap();
+            match simple_logging::log_to_file(log_dir, LevelFilter::Info) {
+                Ok(_) => true,
+                Err(_) => false
+            }
+        },
+        None => false
+    }
 }
 
 #[no_mangle]
@@ -317,23 +322,8 @@ pub extern "C" fn create_owner(
     info!("api_key: {:?}", api_key);
     info!("name: {:?}", name);
     info!("mod_version: {:?}", mod_version);
-    match create_owner_inner(&api_url, &api_key, &name, mod_version) {
-        Ok(owner) => {
-            info!("create_owner successful");
-            if let Some(id) = owner.id {
-                id
-            } else {
-                -1
-            }
-        }
-        Err(err) => {
-            error!("create_owner failed. {}", err);
-            -1
-        }
-    }
-}
 
-fn create_owner_inner(api_url: &str, api_key: &str, name: &str, mod_version: u32) -> Result<Owner> {
+    fn inner(api_url: &str, api_key: &str, name: &str, mod_version: u32) -> Result<Owner> {
         #[cfg(not(test))]
         let url = Url::parse(api_url)?.join("v1/owners")?;
         #[cfg(test)]
@@ -361,6 +351,22 @@ fn create_owner_inner(api_url: &str, api_key: &str, name: &str, mod_version: u32
         }
     }
 
+    match inner(&api_url, &api_key, &name, mod_version) {
+        Ok(owner) => {
+            info!("create_owner successful");
+            if let Some(id) = owner.id {
+                id
+            } else {
+                -1
+            }
+        }
+        Err(err) => {
+            error!("create_owner failed. {}", err);
+            -1
+        }
+    }
+}
+
 // Because C++ does not have Result, -1 means that the request was unsuccessful
 #[no_mangle]
 pub extern "C" fn create_shop(
@@ -382,23 +388,8 @@ pub extern "C" fn create_shop(
     info!("api_key: {:?}", api_key);
     info!("name: {:?}", name);
     info!("description: {:?}", description);
-    match create_shop_inner(&api_url, &api_key, &name, &description) {
-        Ok(shop) => {
-            info!("create_shop successful");
-            if let Some(id) = shop.id {
-                id
-            } else {
-                -1
-            }
-        }
-        Err(err) => {
-            error!("create_shop failed. {}", err);
-            -1
-        }
-    }
-}
 
-fn create_shop_inner(api_url: &str, api_key: &str, name: &str, description: &str) -> Result<Shop> {
+    fn inner(api_url: &str, api_key: &str, name: &str, description: &str) -> Result<Shop> {
         #[cfg(not(test))]
         let url = Url::parse(api_url)?.join("v1/shops")?;
         #[cfg(test)]
@@ -422,6 +413,22 @@ fn create_shop_inner(api_url: &str, api_key: &str, name: &str, description: &str
         Ok(json)
     }
 
+    match inner(&api_url, &api_key, &name, &description) {
+        Ok(shop) => {
+            info!("create_shop successful");
+            if let Some(id) = shop.id {
+                id
+            } else {
+                -1
+            }
+        }
+        Err(err) => {
+            error!("create_shop failed. {}", err);
+            -1
+        }
+    }
+}
+
 // Because C++ does not have Result, -1 means that the request was unsuccessful
 #[no_mangle]
 pub extern "C" fn create_interior_ref_list(
@@ -442,22 +449,8 @@ pub extern "C" fn create_interior_ref_list(
         assert!(!ref_records.is_null());
         slice::from_raw_parts(ref_records, ref_records_len)
     };
-    match create_interior_ref_list_inner(&api_url, &api_key, shop_id, ref_records_slice) {
-        Ok(interior_ref_list) => {
-            if let Some(id) = interior_ref_list.id {
-                id
-            } else {
-                -1
-            }
-        }
-        Err(err) => {
-            error!("interior_ref_list failed. {}", err);
-            -1
-        }
-    }
-}
 
-fn create_interior_ref_list_inner(
+    fn inner(
         api_url: &str,
         api_key: &str,
         shop_id: i32,
@@ -489,6 +482,21 @@ fn create_interior_ref_list_inner(
         Ok(json)
     }
 
+    match inner(&api_url, &api_key, shop_id, ref_records_slice) {
+        Ok(interior_ref_list) => {
+            if let Some(id) = interior_ref_list.id {
+                id
+            } else {
+                -1
+            }
+        }
+        Err(err) => {
+            error!("interior_ref_list failed. {}", err);
+            -1
+        }
+    }
+}
+
 lazy_static! {
     // lazy_static! requires the static values to be thread-safe, so the caches need to be wrapped in a RwLock
     // I'm not sure if multiple C++ threads would be calling into these functions, but at least it should be safe if there are.
@@ -498,7 +506,6 @@ lazy_static! {
 
 // TODO: fetch by shop_id
 #[no_mangle]
-#[unwind(allowed)]
 pub extern "C" fn get_interior_ref_list(
     api_url: *const c_char,
     api_key: *const c_char,
@@ -512,7 +519,6 @@ pub extern "C" fn get_interior_ref_list(
     info!("api_url: {:?}", api_url);
     info!("api_key: {:?}", api_key);
 
-    #[unwind(allowed)]
     fn inner(
         api_url: &str,
         api_key: &str,
@@ -667,7 +673,6 @@ pub extern "C" fn create_merchandise_list(
 
 // TODO: fetch by shop_id
 #[no_mangle]
-#[unwind(allowed)]
 pub extern "C" fn get_merchandise_list(
     api_url: *const c_char,
     api_key: *const c_char,
@@ -681,7 +686,6 @@ pub extern "C" fn get_merchandise_list(
     info!("api_url: {:?}", api_url);
     info!("api_key: {:?}", api_key);
 
-    #[unwind(allowed)]
     fn inner(
         api_url: &str,
         api_key: &str,