Fix tab_zoom borrow and remove unused Ordering import

src-tauri/src/browser/commands.rs

@@ -1,5 +1,3 @@
-use std::sync::atomic::Ordering;
-
 use tauri::webview::{PageLoadEvent, WebviewBuilder};
 use tauri::{AppHandle, LogicalPosition, LogicalSize, Manager, Url, WebviewUrl};
 
@@ -10,8 +8,6 @@ use crate::adblock::engine::AdBlockState;
 use crate::adblock::scripts;
 use crate::state::AppState;
 
-// ═══ COMMANDS ═══
-
 #[tauri::command]
 pub async fn browser_init(app: AppHandle, layout: ViewportLayout) -> Result<BrowserSnapshot, String> {
     let existing = snapshot(&app)?;
@@ -72,14 +68,9 @@ pub async fn tab_close(app: AppHandle, tab_id: String, layout: ViewportLayout) -
         let state = app.state::<AppState>();
         let mut tabs = state.tabs.lock().map_err(|_| "lock")?;
         let label = tabs.tabs.get(&tab_id).map(|t| t.label.clone());
-        // Push to closed stack for restore
-        if let Some(tab) = tabs.tabs.remove(&tab_id) {
-            tabs.push_closed(tab);
-        }
+        if let Some(tab) = tabs.tabs.remove(&tab_id) { tabs.push_closed(tab); }
         tabs.order.retain(|id| id != &tab_id);
-        if tabs.active.as_deref() == Some(&tab_id) {
-            tabs.active = tabs.order.last().cloned();
-        }
+        if tabs.active.as_deref() == Some(&tab_id) { tabs.active = tabs.order.last().cloned(); }
         label
     };
     if let Some(label) = label {
@@ -95,7 +86,6 @@ pub async fn tab_close(app: AppHandle, tab_id: String, layout: ViewportLayout) -
     snapshot(&app)
 }
 
-/// Restore most recently closed tab
 #[tauri::command]
 pub async fn tab_restore(app: AppHandle, layout: ViewportLayout) -> Result<BrowserSnapshot, String> {
     let url = {
@@ -103,9 +93,7 @@ pub async fn tab_restore(app: AppHandle, layout: ViewportLayout) -> Result<Brows
         let mut tabs = state.tabs.lock().map_err(|_| "lock")?;
         tabs.pop_closed().map(|t| t.url)
     };
-    if let Some(url) = url {
-        create_tab_inner(&app, &url, &layout).await?;
-    }
+    if let Some(url) = url { create_tab_inner(&app, &url, &layout).await?; }
     snapshot(&app)
 }
 
@@ -119,7 +107,7 @@ pub async fn tab_navigate(app: AppHandle, tab_id: String, url: String) -> Result
         let tab = tabs.tabs.get_mut(&tab_id).ok_or("tab not found")?;
         tab.url = resolved.clone();
         tab.loading = true;
-        tab.can_go_back = true; // After navigating, back is possible
+        tab.can_go_back = true;
         tab.label.clone()
     };
     let webview = app.get_webview(&label).ok_or("webview not found")?;
@@ -152,17 +140,19 @@ pub async fn tab_forward(app: AppHandle, tab_id: String) -> Result<(), String> {
 #[tauri::command]
 pub async fn tab_zoom(app: AppHandle, tab_id: String, zoom: f64) -> Result<BrowserSnapshot, String> {
     let zoom = zoom.clamp(0.5, 2.0);
-    let (label, domain) = {
+    let label = {
         let state = app.state::<AppState>();
         let mut tabs = state.tabs.lock().map_err(|_| "lock")?;
-        let tab = tabs.tabs.get_mut(&tab_id).ok_or("tab not found")?;
-        tab.zoom = zoom;
-        let domain = extract_domain(&tab.url);
+        let (label, domain) = {
+            let tab = tabs.tabs.get_mut(&tab_id).ok_or("tab not found")?;
+            tab.zoom = zoom;
+            let domain = extract_domain(&tab.url);
+            (tab.label.clone(), domain)
+        };
         tabs.remember_zoom(&domain, zoom);
-        (tab.label.clone(), domain)
+        label
     };
     app.get_webview(&label).ok_or("webview not found")?.set_zoom(zoom).map_err(|e| e.to_string())?;
-    // Persist zoom memory
     let state = app.state::<AppState>();
     if let Ok(tabs) = state.tabs.lock() {
         let _ = crate::persistence::save_json(&app, "zoom_memory.json", &tabs.zoom_memory);
@@ -171,178 +161,81 @@ pub async fn tab_zoom(app: AppHandle, tab_id: String, zoom: f64) -> Result<Brows
 }
 
 #[tauri::command]
-pub async fn tab_resize(app: AppHandle, layout: ViewportLayout) -> Result<(), String> {
-    resize_active(&app, &layout)
-}
+pub async fn tab_resize(app: AppHandle, layout: ViewportLayout) -> Result<(), String> { resize_active(&app, &layout) }
 
 #[tauri::command]
-pub fn tab_get_all(app: AppHandle) -> Result<BrowserSnapshot, String> {
-    snapshot(&app)
-}
+pub fn tab_get_all(app: AppHandle) -> Result<BrowserSnapshot, String> { snapshot(&app) }
 
-/// Toggle pinned state
 #[tauri::command]
 pub fn tab_pin(app: AppHandle, tab_id: String, pinned: bool) -> Result<BrowserSnapshot, String> {
     update_tab_field(&app, &tab_id, |t| { t.pinned = pinned; });
     snapshot(&app)
 }
 
-/// Find in page — inject JS to highlight matches
 #[tauri::command]
 pub async fn tab_find(app: AppHandle, tab_id: String, query: String) -> Result<u32, String> {
-    let js = format!(r#"
-        (function() {{
-            window.__muse_find_cleanup && window.__muse_find_cleanup();
-            if (!{query_json}) return 0;
-            const text = {query_json};
-            const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT);
-            let count = 0;
-            const marks = [];
-            while (walker.nextNode()) {{
-                const node = walker.currentNode;
-                const idx = node.textContent.toLowerCase().indexOf(text.toLowerCase());
-                if (idx >= 0) {{
-                    const range = document.createRange();
-                    range.setStart(node, idx);
-                    range.setEnd(node, idx + text.length);
-                    const mark = document.createElement('mark');
-                    mark.style.cssText = 'background:#C49A3C;color:#100E0B;border-radius:2px;padding:0 1px';
-                    range.surroundContents(mark);
-                    marks.push(mark);
-                    count++;
-                }}
-            }}
-            if (marks.length > 0) marks[0].scrollIntoView({{ block: 'center' }});
-            window.__muse_find_cleanup = () => marks.forEach(m => {{
-                const parent = m.parentNode;
-                if (parent) {{ parent.replaceChild(document.createTextNode(m.textContent || ''), m); parent.normalize(); }}
-            }});
-            return count;
-        }})()
-    "#, query_json = serde_json::to_string(&query).unwrap_or("\"\"".to_string()));
+    let js = format!(r#"(function(){{window.__muse_find_cleanup&&window.__muse_find_cleanup();if(!{q})return 0;const text={q};const walker=document.createTreeWalker(document.body,NodeFilter.SHOW_TEXT);let count=0;const marks=[];while(walker.nextNode()){{const node=walker.currentNode;const idx=node.textContent.toLowerCase().indexOf(text.toLowerCase());if(idx>=0){{const range=document.createRange();range.setStart(node,idx);range.setEnd(node,idx+text.length);const mark=document.createElement('mark');mark.style.cssText='background:#C49A3C;color:#100E0B;border-radius:2px;padding:0 1px';range.surroundContents(mark);marks.push(mark);count++;}}}}if(marks.length>0)marks[0].scrollIntoView({{block:'center'}});window.__muse_find_cleanup=()=>marks.forEach(m=>{{const p=m.parentNode;if(p){{p.replaceChild(document.createTextNode(m.textContent||''),m);p.normalize();}}}});return count;}})()"#, q=serde_json::to_string(&query).unwrap_or("\"\"".to_string()));
     eval_on_tab(&app, &tab_id, &js)?;
-    Ok(0) // Count returned via JS, not directly capturable without eval callback
+    Ok(0)
 }
 
-/// Clear find highlights
 #[tauri::command]
 pub async fn tab_find_clear(app: AppHandle, tab_id: String) -> Result<(), String> {
     eval_on_tab(&app, &tab_id, "window.__muse_find_cleanup && window.__muse_find_cleanup()")
 }
 
-// ═══ INTERNAL ═══
-
 pub(crate) async fn create_tab_inner(app: &AppHandle, url: &str, layout: &ViewportLayout) -> Result<String, String> {
-    let id_num = app.state::<AppState>().next_tab_id.fetch_add(1, Ordering::Relaxed);
+    let id_num = app.state::<AppState>().next_tab_id.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
     let id = format!("tab-{id_num}");
     let label = format!("muse-tab-{id_num}");
     let parsed = Url::parse(url).map_err(|e| e.to_string())?;
-
     let init_script = scripts::build_init_script(&scripts::blocked_domains_json());
-    // Add favicon extraction + navigation state tracking to init script
     let full_init = format!("{init_script}\n{}", FAVICON_AND_NAV_SCRIPT);
-
     let app_for_load = app.clone();
     let id_for_load = id.clone();
     let app_for_title = app.clone();
     let id_for_title = id.clone();
     let app_for_cosmetic = app.clone();
-
     let builder = WebviewBuilder::new(label.clone(), WebviewUrl::External(parsed))
         .initialization_script(&full_init)
         .on_page_load(move |webview, payload| {
             let url = payload.url().to_string();
             let loading = matches!(payload.event(), PageLoadEvent::Started);
-            update_tab_field(&app_for_load, &id_for_load, |t| {
-                t.url = url.clone();
-                t.loading = loading;
-            });
+            update_tab_field(&app_for_load, &id_for_load, |t| { t.url = url.clone(); t.loading = loading; });
             if matches!(payload.event(), PageLoadEvent::Finished) {
                 let css = app_for_cosmetic.state::<AdBlockState>().get_cosmetic_css(&url);
                 if !css.is_empty() {
                     let escaped = css.replace('\\', "\\\\").replace('`', "\\`");
-                    let inject = format!(
-                        "(function(){{const s=document.createElement('style');s.id='__muse_shield';s.textContent=`{escaped}`;document.head.appendChild(s)}})();"
-                    );
+                    let inject = format!("(function(){{const s=document.createElement('style');s.id='__muse_shield';s.textContent=`{escaped}`;document.head.appendChild(s)}})();");
                     let _ = webview.eval(&inject);
                 }
-                // Request favicon from page
                 let _ = webview.eval("window.__muse_report_favicon && window.__muse_report_favicon()");
             }
         })
-        .on_document_title_changed({
-            let app_t = app_for_title;
-            let id_t = id_for_title;
-            move |_webview, title| {
-                update_tab_field(&app_t, &id_t, |t| {
-                    if !title.trim().is_empty() { t.title = title.clone(); }
-                });
-            }
+        .on_document_title_changed(move |_webview, title| {
+            update_tab_field(&app_for_title, &id_for_title, |t| { if !title.trim().is_empty() { t.title = title.clone(); } });
         })
-        .on_navigation({
-            let app_nav = app.clone();
-            move |url| { !navigation_blocked(&app_nav, url.as_str()) }
-        });
-
+        .on_navigation({ let app_nav = app.clone(); move |url| { !navigation_blocked(&app_nav, url.as_str()) } });
     let window = app.get_window("main").ok_or("main window not found")?;
     let (x, y, w, h) = bounds(layout);
-    window.add_child(builder, LogicalPosition::new(x, y), LogicalSize::new(w, h))
-        .map_err(|e| e.to_string())?;
-
-    // Check zoom memory for this domain
+    window.add_child(builder, LogicalPosition::new(x, y), LogicalSize::new(w, h)).map_err(|e| e.to_string())?;
     let domain = extract_domain(url);
-    let saved_zoom = {
-        let state = app.state::<AppState>();
-        let tabs = state.tabs.lock().map_err(|_| "lock")?;
-        tabs.get_zoom_for_domain(&domain)
-    };
-
+    let saved_zoom = { let state = app.state::<AppState>(); let tabs = state.tabs.lock().map_err(|_| "lock")?; tabs.get_zoom_for_domain(&domain) };
     let now = chrono::Utc::now().timestamp();
     let zoom = saved_zoom.unwrap_or(1.0);
-
     let previous = {
         let state = app.state::<AppState>();
         let mut tabs = state.tabs.lock().map_err(|_| "lock")?;
         let previous = tabs.active.clone();
         tabs.active = Some(id.clone());
         tabs.order.push(id.clone());
-        tabs.tabs.insert(id.clone(), BrowserTab {
-            id: id.clone(), label: label.clone(), url: url.to_string(),
-            title: "New Tab".to_string(), favicon: None, loading: true,
-            pinned: false, sleeping: false, zoom, can_go_back: false,
-            can_go_forward: false, last_active: now,
-        });
+        tabs.tabs.insert(id.clone(), BrowserTab { id: id.clone(), label: label.clone(), url: url.to_string(), title: "New Tab".to_string(), favicon: None, loading: true, pinned: false, sleeping: false, zoom, can_go_back: false, can_go_forward: false, last_active: now });
         previous
     };
-
-    // Apply saved zoom
-    if zoom != 1.0 {
-        if let Some(webview) = app.get_webview(&label) {
-            let _ = webview.set_zoom(zoom);
-        }
-    }
-
-    if let Some(prev) = previous {
-        if prev != id { hide_tab(app, &prev)?; }
-    }
+    if zoom != 1.0 { if let Some(webview) = app.get_webview(&label) { let _ = webview.set_zoom(zoom); } }
+    if let Some(prev) = previous { if prev != id { hide_tab(app, &prev)?; } }
     emit_snapshot(app)?;
     Ok(id)
 }
 
-/// JS injected into every tab for favicon extraction and nav state reporting
-const FAVICON_AND_NAV_SCRIPT: &str = r#"
-(function() {
-    window.__muse_report_favicon = function() {
-        const link = document.querySelector('link[rel~="icon"], link[rel="shortcut icon"], link[rel="apple-touch-icon"]');
-        if (link && link.href) {
-            try { window.__TAURI_INTERNALS__.invoke('__tab_favicon', { favicon: link.href }); } catch {}
-        }
-    };
-    // Report on DOMContentLoaded
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', window.__muse_report_favicon);
-    } else {
-        window.__muse_report_favicon();
-    }
-})();
-"#;
+const FAVICON_AND_NAV_SCRIPT: &str = r#"(function(){window.__muse_report_favicon=function(){const link=document.querySelector('link[rel~="icon"],link[rel="shortcut icon"],link[rel="apple-touch-icon"]');if(link&&link.href){try{window.__TAURI_INTERNALS__.invoke('__tab_favicon',{favicon:link.href});}catch{}}};if(document.readyState==='loading'){document.addEventListener('DOMContentLoaded',window.__muse_report_favicon);}else{window.__muse_report_favicon();}})();"#;