starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-18 07:24:07 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Show import errors

Browse Source
This commit is contained in:
Gregory Schier
2023-11-09 20:00:19 -08:00
parent bf8aad04c7
commit bb2d3dd5b1
4 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src-tauri/src/main.rs
View File

@@ -269,26 +269,23 @@ async fn import_data(
file_paths: Vec<&str>,
) -> Result<ImportResources, String> {
let pool = &*db_instance.lock().await;
let mut resources = plugin::run_plugin_import(
&window.app_handle(),
"insomnia-importer",
file_paths.first().unwrap(),
)
.await;
println!("Resources: {:?}", resources);
if resources.is_none() {
resources = plugin::run_plugin_import(
let mut resources: Option<ImportResources> = None;
let plugins = vec!["yaak-importer", "insomnia-importer"];
for plugin_name in plugins {
if let Some(r) = plugin::run_plugin_import(
&window.app_handle(),
"yaak-importer",
plugin_name,
file_paths.first().unwrap(),
)
.await;
.await
{
resources = Some(r);
break;
}
}
println!("Resources: {:?}", resources);
match resources {
None => Err("Failed to import data".to_string()),
None => Err("No importers found for the chosen file".to_string()),
Some(r) => {
let mut imported_resources = ImportResources::default();