update lock using parking_lot

Author: zsqw123

Cargo.lock

@@ -33,6 +33,7 @@ egui_extras = "0.31.1"
 egui_flex = "0.3.0"
 
 tokio = { version = "1.44.2", features = ["full"] }
+parking_lot = "0.12.3"
 
 #iced = "0.13.1"
 #cosmic-text = "0.12.1"

Cargo.toml

@@ -66,7 +66,7 @@ impl EguiApp {
             .show(ctx, |ui| {
             ui.collapsing("Log / 日志", |ui| {
                 ScrollArea::vertical().show(ui, |ui| {
-                    let current_records = self.log_holder.records.lock().unwrap();
+                    let current_records = self.log_holder.records.lock();
                     let current_records = current_records.iter();
                     for log in current_records {
                         ui.label(format!("{}: {}", log.level, log.message));
@@ -78,8 +78,7 @@ impl EguiApp {
 
     fn central_panel(&mut self, ctx: &Context) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            let server_app = self.server_app.app();
-            let mut server_content = server_app.content.lock().unwrap();
+            let mut server_content = self.server_app.content().lock();
             let Content { current, opened_tabs } = server_content.deref_mut();
 
             let mut deleted_tab = None;

asm_egui/src/app.rs

@@ -7,11 +7,11 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
-    let server_app = app.server_app.app();
-    let mut server_app_left = server_app.left.lock().unwrap();
-    let mut server_app_content = server_app.content.lock().unwrap();
+    let server_app = &app.server_app;
+    let mut server_app_left = server_app.left().lock();
+    let mut server_app_content = server_app.content().lock();
     let entries = &mut server_app_left.root_node.visible_items();
-    let server = app.server.lock().unwrap();
+    let server = app.server.lock();
     if let Some(server) = server.deref() {
         let content = &mut server_app_content;
         let row_height = ui.spacing().interact_size.y;

asm_egui/src/file_tree.rs

@@ -21,3 +21,4 @@ rfd = { workspace = true }
 enum_dispatch = { workspace = true }
 
 tokio = { workspace = true }
+parking_lot = { workspace = true }

asm_server/Cargo.toml

@@ -2,7 +2,8 @@ use crate::impls::apk_load::ApkAccessor;
 use enum_dispatch::enum_dispatch;
 use java_asm::smali::SmaliNode;
 use java_asm::{DescriptorRef, StrRef};
-use std::sync::{Arc, Mutex};
+use parking_lot::Mutex;
+use std::sync::Arc;
 
 pub mod server;
 
@@ -17,13 +18,15 @@ pub struct AsmServer {
 }
 
 pub type ServerMut = Arc<Mutex<Option<AsmServer>>>;
-type AccessorMut = Arc<Mutex<Option<Arc<AccessorEnum>>>>;
+type AccessorMut = Arc<Mutex<Option<AccessorEnum>>>;
 
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct LoadingState {
     pub in_loading: bool,
     // file loading progress, 0.0 ~ 1.0
     pub loading_progress: f32,
+    // when loading failed, the error will be set.
+    pub err: Option<String>,
 }
 
 #[enum_dispatch]

asm_server/src/lib.rs

@@ -17,7 +17,11 @@ use zip::ZipArchive;
 impl AsmServer {
     pub fn new() -> Self {
         Self {
-            loading_state: LoadingState { in_loading: true, loading_progress: 0.0 },
+            loading_state: LoadingState {
+                in_loading: true,
+                loading_progress: 0.0,
+                err: None,
+            },
             accessor: Default::default(),
         }
     }
@@ -48,7 +52,7 @@ impl AsmServer {
                 } else {
                     error!("unsupported file type: {:?}", path);
                 };
-                *server.lock().unwrap() = Some(new_server.clone());
+                *server.lock() = Some(new_server.clone());
                 new_server.on_file_opened(&context, render_target);
             })
         });
@@ -72,7 +76,7 @@ impl AsmServer {
             .map_err(OpenFileError::LoadZip)?;
         let apk_accessor = read_apk(zip)?;
         // safe unwrap, no other places in current thread will access it.
-        *accessor.try_lock().unwrap() = Some(Arc::new(AccessorEnum::Apk(apk_accessor)));
+        *accessor.lock() = Some(AccessorEnum::Apk(apk_accessor));
         Ok(())
     }
 
@@ -104,7 +108,7 @@ impl AsmServer {
         let start = Instant::now();
         let dir_info = DirInfo::from_classes(Arc::from("Root"), &classes);
         info!("resolve dir info cost: {:?}", start.elapsed());
-        app.app().deref_mut().left = Arc::new(Mutex::new(Left { root_node: dir_info }));
+        app.set_left(Left { root_node: dir_info });
     }
 }
 
@@ -125,7 +129,8 @@ impl AsmServer {
     // read the input content (apk/dex/jar/class...)
     // return all class's internal names inside of this input.
     pub fn read_classes(&self) -> Vec<StrRef> {
-        let accessor = self.accessor_or_none();
+        let accessor_locked = self.accessor.lock();
+        let accessor = accessor_locked.deref();
         match accessor {
             None => Vec::new(),
             Some(accessor) => {
@@ -138,19 +143,21 @@ impl AsmServer {
     }
 
     pub fn find_class(&self, class_key: &str) -> bool {
-        let accessor = self.accessor_or_none();
+        let accessor_locked = self.accessor.lock();
+        let accessor = accessor_locked.deref();
         match accessor {
             None => false,
             Some(accessor) => accessor.exist_class(class_key),
         }
     }
 
     pub fn read_content(&self, class_key: &str) -> Option<SmaliNode> {
-        self.accessor_or_none()?.read_content(class_key)
-    }
-
-    fn accessor_or_none(&self) -> Option<Arc<AccessorEnum>> {
-        self.accessor.try_lock().ok()?.deref().clone()
+        let accessor_locked = self.accessor.lock();
+        let accessor = accessor_locked.deref();
+        match accessor {
+            None => None,
+            Some(accessor) => accessor.read_content(class_key),
+        }
     }
 }
 

asm_server/src/server.rs

@@ -1,6 +1,7 @@
 use log::{Level, Metadata, Record};
+use parking_lot::Mutex;
 use std::collections::VecDeque;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
 pub struct LogHolder {
     pub min_level: Level,
@@ -32,7 +33,7 @@ impl log::Log for LogHolder {
         if !self.enabled(record.metadata()) {
             return;
         }
-        let deque = &mut self.records.lock().unwrap();
+        let deque = &mut self.records.lock();
         if deque.len() >= self.max_len {
             deque.pop_front();
         }

asm_server/src/ui/log.rs

@@ -7,10 +7,11 @@ use crate::ui::AbsFile::{Dir, File};
 use java_asm::smali::SmaliNode;
 use java_asm::StrRef;
 use ::log::Level;
+use parking_lot::Mutex;
 use std::collections::BTreeMap;
 use std::iter::{Enumerate, Peekable};
 use std::str::Split;
-use std::sync::{Arc, Mutex, MutexGuard};
+use std::sync::Arc;
 
 #[derive(Default, Clone, Debug)]
 pub struct App {
@@ -19,26 +20,22 @@ pub struct App {
 }
 
 #[derive(Default, Clone, Debug)]
-pub struct AppContainer(Arc<Mutex<App>>);
+pub struct AppContainer(Arc<App>);
 
 impl AppContainer {
-    pub fn content(&self) -> Arc<Mutex<Content>> {
-        self.0.lock().unwrap().content.clone()
+    pub fn content(&self) -> &Arc<Mutex<Content>> {
+        &self.0.content
     }
 
-    pub fn left(&self) -> Arc<Mutex<Left>> {
-        self.0.lock().unwrap().left.clone()
+    pub fn left(&self) -> &Arc<Mutex<Left>> {
+        &self.0.left
     }
 
-    pub fn app(&self) -> MutexGuard<'_, App> {
-        self.0.lock().unwrap()
+    pub fn set_left(&self, left: Left) {
+        *self.0.left.lock() = left;
     }
 }
 
-impl AppContainer {
-    
-}
-
 #[derive(Default, Clone, Debug)]
 pub struct Left {
     pub root_node: DirInfo,