+
+
+
+
@@ -99,6 +107,108 @@ fn ExecuteButton() -> impl IntoView {
}
}
+#[component]
+fn LoadButton(input_ref: NodeRef) -> impl IntoView {
+ let state = expect_context::>();
+
+ let (file, set_file) = signal::>>(None);
+
+ Effect::new(move || {
+ if let Some(file) = &*file.read() {
+ let filename = file.name();
+
+ if let Ok(reader) = FileReader::new() {
+ let on_progress = FragileComfirmed::new(Closure::wrap(Box::new(
+ move |ev: web_sys::ProgressEvent| {
+ if ev.length_computable() {
+ state.import_progress().set(Some(ImportProgress {
+ filename: filename.clone(),
+ loaded: ev.loaded(),
+ total: ev.total(),
+ }));
+ }
+ },
+ )
+ as Box));
+
+ let on_error = FragileComfirmed::new(Closure::wrap(Box::new(
+ move |ev: web_sys::ProgressEvent| {
+ if let Some(target) = ev.target() {
+ let reader = target.unchecked_into::();
+ if let Some(dom_error) = reader.error() {
+ state.last_error().set(Some(FragileComfirmed::new(
+ SQLightError::ImportDb(dom_error.message().to_string()),
+ )));
+ }
+ }
+ },
+ )
+ as Box));
+
+ let on_load =
+ FragileComfirmed::new(Closure::wrap(Box::new(move |ev: web_sys::Event| {
+ if let Some(target) = ev.target() {
+ let reader = target.unchecked_into::();
+ if let Ok(result) = reader.result() {
+ let array_buffer = result.unchecked_into::();
+ let data = js_sys::Uint8Array::new(&array_buffer);
+ let persist = state.vfs().get() != Vfs::Memory;
+ if let Some(worker) = &*state.worker().read() {
+ worker.send_task(WorkerRequest::LoadDb(LoadDbOptions {
+ // FIXME: multi db
+ id: String::new(),
+ persist,
+ data,
+ }));
+ }
+ }
+ }
+ })
+ as Box));
+
+ reader.set_onprogress(Some(on_progress.as_ref().unchecked_ref()));
+ reader.set_onerror(Some(on_error.as_ref().unchecked_ref()));
+ reader.set_onload(Some(on_load.as_ref().unchecked_ref()));
+ reader.read_as_array_buffer(file).unwrap();
+
+ on_cleanup(move || {
+ drop(on_progress);
+ drop(on_error);
+ drop(on_load);
+ });
+ }
+ }
+ });
+
+ let on_change = move |ev: Event| {
+ if let Some(target) = ev.target() {
+ let input = target.unchecked_into::();
+ if let Some(files) = input.files() {
+ if files.length() > 0 {
+ let file = FragileComfirmed::new(files.get(0).unwrap());
+ set_file.set(Some(file));
+ } else {
+ set_file.set(None);
+ }
+ }
+ }
+ };
+
+ let on_click = move |_| {
+ if let Some(input) = &*input_ref.read() {
+ if input.onchange().is_none() {
+ let callback = Closure::wrap(Box::new(on_change) as Box);
+ input.set_onchange(Some(callback.as_ref().unchecked_ref::()));
+ callback.forget();
+ }
+ input.set_value("");
+ input.click();
+ }
+ };
+
+ view! { }
+}
+
#[component]
fn VfsMenuButton(menu_container: NodeRef) -> impl IntoView {
let state = expect_context::>();
diff --git a/src/app/output/section.rs b/src/app/output/section.rs
index c9ef169..dd91469 100644
--- a/src/app/output/section.rs
+++ b/src/app/output/section.rs
@@ -13,7 +13,7 @@ pub fn Section(label: String, children: Children) -> impl IntoView {
view! {
- {children()}
+
{children()}
}
}
diff --git a/src/app/output/status.rs b/src/app/output/status.rs
index b081811..ca6de6d 100644
--- a/src/app/output/status.rs
+++ b/src/app/output/status.rs
@@ -20,7 +20,7 @@ Please close other tabs and refresh, or switch to Memory VFS.";
pub fn Status() -> impl IntoView {
let state = expect_context::>();
- let show = move || match &*state.last_error().read() {
+ let last_error = move || match &*state.last_error().read() {
Some(error) => {
let summary = format!("{}", error.deref());
let details = match error.deref() {
@@ -42,12 +42,15 @@ pub fn Status() -> impl IntoView {
"An unsupported type was encountered, please create an issue on github."
}
},
- WorkerError::NotFound | WorkerError::OpfsSAHError => {
+ WorkerError::NotFound | WorkerError::Unexpected => {
"This shouldn't happen, please create an issue on github."
}
WorkerError::InvaildState => {
"SQLite is in an abnormal state when executing SQLite."
}
+ WorkerError::LoadDb(_) => {
+ "Please check whether the imported DB is a SQLite3 file"
+ }
WorkerError::OpfsSAHPoolOpened => OPFS_SAH_POOL_OPENED_DETAILS,
},
SQLightError::AceEditor(ace_editor) => match ace_editor {
@@ -59,6 +62,9 @@ pub fn Status() -> impl IntoView {
"This shouldn't happen, please create an issue on github."
}
},
+ SQLightError::ImportDb(_) => {
+ "Maybe the db was not found, could not be read, or was too large."
+ }
};
view! {
@@ -72,9 +78,28 @@ pub fn Status() -> impl IntoView {
None => view! { "No Error" }.into_any(),
};
+ let import_progress = move || {
+ if let Some(progress) = &*state.import_progress().read() {
+ let filename = format!("Filename: {}", progress.filename);
+ let status = format!("Loading: {} of {} bytes.", progress.loaded, progress.total);
+ view! {
+
{filename}
+
{status}
+ }
+ .into_any()
+ } else {
+ view! { "No files are being imported." }.into_any()
+ }
+ };
+
view! {
- {show}
+
+