Fix webserver and webview starting

Marekkon5 · Jan 9, 2024 · cddf7c8 · cddf7c8
1 parent d7aa47c
commit cddf7c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/crates/onetagger-ui/src/lib.rs b/crates/onetagger-ui/src/lib.rs
@@ -7,7 +7,7 @@ use std::net::SocketAddr;
 use std::time::Duration;
 use anyhow::Error;
 use axum::body::Body;
-use axum::extract::{Query, WebSocketUpgrade, State, Request, Path};
+use axum::extract::{Query, WebSocketUpgrade, State, Request};
 use axum::http::StatusCode;
 use axum::http::header::CONTENT_TYPE;
 use axum::response::IntoResponse;
@@ -38,7 +38,7 @@ pub struct StartContext {
     pub browser: bool,
 }
 
-fn start_async_thread(context: StartContext) -> Result<(), Error> {
+fn start_async_runtime(context: StartContext) -> Result<(), Error> {
     let expose = context.expose;
     Builder::new_multi_thread().enable_all().build()?.block_on(async move {
         // Register routes
@@ -48,6 +48,7 @@ fn start_async_thread(context: StartContext) -> Result<(), Error> {
             .route("/ws", get(get_ws))
             .route("/spotify", get(get_spotify_callback))
             .route("/*path", get(get_static_file))
+            .route("/", get(get_static_file))
             .with_state(context);
 
         // Start http server
@@ -65,7 +66,8 @@ fn start_async_thread(context: StartContext) -> Result<(), Error> {
 }
 
 /// Serve assets file
-async fn get_static_file(Path(mut path): Path<String>) -> impl IntoResponse {
+async fn get_static_file(request: Request<Body>) -> impl IntoResponse {
+    let mut path = request.uri().to_string();
     // Index HTML
     if path == "/" {
         path = "/index.html".to_string();
@@ -155,7 +157,7 @@ pub fn start_all(context: StartContext) -> Result<(), Error> {
         });
     }
 
-    start_async_thread(context.clone())?;
+    start_async_runtime(context.clone())?;
     Ok(())
 }
 
diff --git a/crates/onetagger/src/main.rs b/crates/onetagger/src/main.rs
@@ -38,10 +38,18 @@ fn main() {
         browser: cli.browser
     };
 
-    onetagger_ui::start_all(context).expect("Failed to start servers!");
-    if !cli.server {
-        start_webview().expect("Failed to start webview!");
+    // Server mode
+    if cli.server {
+        onetagger_ui::start_all(context).expect("Failed to start servers!");
+        return;
     }
+
+    // GUI Mode
+    std::thread::spawn(move || {
+        onetagger_ui::start_all(context).expect("Failed to start servers!");
+    });
+    start_webview().expect("Failed to start webview!");
+
 }
 
 #[derive(Parser, Debug, Clone)]
@@ -170,7 +178,7 @@ pub fn start_webview() -> Result<(), Error> {
 
     // Configure
     let mut webview = builder
-        .with_url(&format!("http://127.0.0.1:{PORT}"))?
+        .with_url(&format!("http://127.0.0.1:{PORT}/"))?
         .with_devtools(Settings::load().map(|s| s.devtools()).unwrap_or(false))
         .with_ipc_handler(move |message| {
             let proxy = &p;