Build UI

Co-authored-by: Kartik Sharma <[email protected]>
crazystylus · Apr 27, 2024 · db2149b · db2149b
1 parent 9bc81c0
commit db2149b
Show file tree

Hide file tree

Showing 13 changed files with 586 additions and 204 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/dist/.gitkeep b/dist/.gitkeep
diff --git a/index.html b/index.html
@@ -1,18 +1,20 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" style="min-height: -webkit-fill-available">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>otadump</title>
-    <script>
+
+    <!-- <script>
       document.addEventListener("contextmenu", (event) =>
         event.preventDefault()
       );
-    </script>
+    </script> -->
   </head>
 
   <body
     style="
+      height: 100vh;
       user-select: none;
       -webkit-user-select: none;
       -moz-user-select: none;

diff --git a/package.json b/package.json
@@ -14,7 +14,8 @@
     "@fluentui/react-components": "^9.47.3",
     "@tauri-apps/api": "^1",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "reset-css": "^5.0.2"
   },
   "devDependencies": {
     "@types/react": "^18.2.15",

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -39,7 +39,7 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 sha2 = "0.10.6"
 sync-unsafe-cell = "0.1.0"
-tauri = { version = "1.6.1", features = ["dialog-open", "shell-open"] }
+tauri = { version = "1.6.1", features = [ "shell-open", "process-exit", "dialog-open"] }
 tempfile = "3.6.0"
 zip = { version = "0.6.6", features = [
     "deflate",

diff --git a/src-tauri/src/core/extract.rs b/src-tauri/src/core/extract.rs
diff --git a/src-tauri/src/core/payload.rs b/src-tauri/src/core/payload.rs
@@ -41,7 +41,7 @@ impl<'a> Payload<'a> {
         // TODO: this outputs the entire bytes of the file in the event of a
         // parser error. Use nom's VerboseError here.
         let (_, payload): (_, Payload) = Parse::parse(bytes)
-            .map_err(|e| anyhow!(e.to_string()).context("failed to parse payload"))?;
+            .map_err(|e| anyhow!(e.to_string()).context("Failed to parse payload"))?;
         Ok(payload)
     }
 }
diff --git a/src-tauri/src/gui.rs b/src-tauri/src/gui.rs
@@ -41,8 +41,8 @@ impl crate::core::Reporter for Reporter {
     }
 
     fn report_error(&self, error: Box<dyn Error>) {
-        let error = format!("{}", error);
-        let message = Message::Error { error };
+        let error = format!("{:?}", error);
+        let message = Message::Error { message: error };
         self.emit_all(message);
     }
 }
@@ -52,5 +52,5 @@ impl crate::core::Reporter for Reporter {
 enum Message {
     Progress { value: f64 },
     Completed,
-    Error { error: String },
+    Error { message: String },
 }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -4,7 +4,7 @@
 use std::path::PathBuf;
 use std::thread;
 
-use anyhow::{Context as _, Result};
+use anyhow::{Context, Result};
 use otadump::core::ExtractOptions;
 use otadump::gui;
 use tauri::AppHandle;
@@ -18,8 +18,17 @@ fn extract(app: AppHandle, payload_file: PathBuf, output_dir: PathBuf) {
 }
 
 fn main() -> Result<()> {
+    // let options = ExtractOptions {
+    //     payload_file:
+    // "/home/ajeet/ws/otadump-payloads/bluejay-ota-sd2a.220601.001.a1-bacd4108.zip"
+    //         .into(),
+    //     output_dir: "/tmp/asdf".into(),
+    // };
+    // otadump::tui::extract(options);
+    // Ok(())
+
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![extract])
         .run(tauri::generate_context!())
-        .context("error running application")
+        .context("Error running application")
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -15,9 +15,13 @@
       "dialog": {
         "open": true
       },
+      "process": {
+        "all": false,
+        "exit": true
+      },
       "shell": {
         "all": false,
-        "open": true
+        "open": ".*"
       }
     },
     "windows": [