diff --git a/CHANGELOG.md b/CHANGELOG.md index a766884..3c29184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## Next +- Fix app not working due to Content Security Policy issue + ## 1.1.3 - 2022 May 17 - Slight design improvements - Richer error message diff --git a/src-tauri/src/cmd.rs b/src-tauri/src/cmd.rs index 529467b..ec29dd4 100644 --- a/src-tauri/src/cmd.rs +++ b/src-tauri/src/cmd.rs @@ -86,7 +86,9 @@ pub async fn load_backup_list( full_disk_access(w).await?; let dir_map = listbackups::listbackups()?; + println!("Listed backups {:#?}", dir_map); state.lock()?.replace(dir_map.clone()); + println!("Replaced state"); Ok(dir_map) } diff --git a/src-tauri/src/compare.rs b/src-tauri/src/compare.rs index 34f0e2c..0635093 100644 --- a/src-tauri/src/compare.rs +++ b/src-tauri/src/compare.rs @@ -125,6 +125,8 @@ fn deserialize_value(value: &Value) -> Result { pub fn compare(old: &str, new: &str) -> Result, String> { let mut anchor = Instant::now(); + println!("tmutil compare -X -s '{}' '{}'", old, new); + let mut cmd = Command::new("tmutil") .arg("compare") .arg("-X") diff --git a/src-tauri/src/listbackups.rs b/src-tauri/src/listbackups.rs index 315ceec..8cf5c22 100644 --- a/src-tauri/src/listbackups.rs +++ b/src-tauri/src/listbackups.rs @@ -9,11 +9,14 @@ pub fn listbackups() -> Result, String> { // .to_string(), // )); + println!("tmutil listbackups"); + let output = Command::new("tmutil") .arg("listbackups") .output() .expect("Error calling command"); check_cmd_success(&output.status, output.stderr.clone())?; + println!("Success listing backups"); let output_str = parse_output(output.stdout)?; diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 6a1523f..cdad3f4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -57,7 +57,7 @@ } }, "security": { - "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'" + "csp": null } } }