Merge pull request #79 from HanaDigital/master

v3.0.8

Author: dr-nyt

README.md

@@ -38,7 +38,7 @@ List of supported sites:
 
 Author: [@dr-nyt](https://github.com/dr-nyt)  
 Contributors: [@webdagger](https://github.com/webdagger), [@jiskim](https://github.com/jiskim)
-Version: 3.0.7
+Version: 3.0.8
 
 ## FEATURES
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "novelscraper",
 	"private": true,
-	"version": "3.0.7",
+	"version": "3.0.8",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

src-tauri/Cargo.lock

@@ -33,6 +33,7 @@ regex = "1.11.1"
 reqwest = "0.12.12"
 tauri-plugin-opener = "2.2.6"
 tauri-plugin-os = "2"
+fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-updater = "2"

src-tauri/Cargo.toml

@@ -4,32 +4,26 @@ use tauri::AppHandle;
 use tauri_plugin_os::arch;
 use tauri_plugin_shell::ShellExt;
 
-pub fn check_docker_status(app: &AppHandle) -> bool {
+pub fn check_docker_status(app: &AppHandle) -> Result<bool, String> {
     let shell = app.shell();
     match tauri::async_runtime::block_on(async move {
         shell.command("docker").args(["ps"]).output().await
     }) {
         Ok(output) => {
             if output.status.success() {
-                println!("Result: {:?}", String::from_utf8(output.stdout));
-                return true;
+                return Ok(true);
             } else {
-                println!("Exit with code: {}", output.status.code().unwrap());
-                return false;
+                return Err(String::from_utf8(output.stderr).unwrap());
             }
         }
         Err(e) => {
             println!("Error: {}", e);
-            return false;
+            return Err(e.to_string());
         }
     }
 }
 
-pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> bool {
-    if !check_docker_status(app) {
-        return false;
-    }
-
+pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> Result<bool, String> {
     let shell = app.shell();
     let start_cmd = ["start", "novelscraper-cloudflare-resolver"];
 
@@ -38,16 +32,12 @@ pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> bool {
     }) {
         Ok(start_output) => {
             if start_output.status.success() {
-                println!("Result: {:?}", String::from_utf8(start_output.stdout));
-                return true;
-            } else {
-                println!("Exit with code: {}", start_output.status.code().unwrap());
-                println!("Error: {:?}", String::from_utf8(start_output.stderr));
+                return Ok(true);
             }
         }
         Err(e) => {
             println!("Error: {}", e);
-            return false;
+            return Err(e.to_string());
         }
     }
 
@@ -77,22 +67,19 @@ pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> bool {
     }) {
         Ok(run_output) => {
             if run_output.status.success() {
-                println!("Result: {:?}", String::from_utf8(run_output.stdout));
-                return true;
+                return Ok(true);
             } else {
-                println!("Exit with code: {}", run_output.status.code().unwrap());
-                println!("Error: {:?}", String::from_utf8(run_output.stderr));
-                return false;
+                return Err(String::from_utf8(run_output.stderr).unwrap());
             }
         }
         Err(e) => {
             println!("Error: {}", e);
-            return false;
+            return Err(e.to_string());
         }
     }
 }
 
-pub fn stop_cloudflare_resolver(app: &AppHandle) -> bool {
+pub fn stop_cloudflare_resolver(app: &AppHandle) -> Result<bool, String> {
     let shell = app.shell();
     match tauri::async_runtime::block_on(async move {
         shell
@@ -103,16 +90,14 @@ pub fn stop_cloudflare_resolver(app: &AppHandle) -> bool {
     }) {
         Ok(output) => {
             if output.status.success() {
-                println!("Result: {:?}", String::from_utf8(output.stdout));
-                return true;
+                return Ok(true);
             } else {
-                println!("Exit with code: {}", output.status.code().unwrap());
-                return false;
+                return Err(String::from_utf8(output.stderr).unwrap());
             }
         }
         Err(e) => {
             println!("Error: {}", e);
-            return false;
+            return Err(e.to_string());
         }
     }
 }

src-tauri/src/docker.rs

@@ -86,19 +86,17 @@ async fn fetch_image(
 }
 
 #[tauri::command]
-fn check_docker_status(app: AppHandle) -> bool {
-    let is_started = docker::check_docker_status(&app);
-    return is_started;
+fn check_docker_status(app: AppHandle) -> Result<bool, String> {
+    return docker::check_docker_status(&app);
 }
 
 #[tauri::command]
-fn start_cloudflare_resolver(app: AppHandle, port: usize) -> bool {
-    let is_started = docker::start_cloudflare_resolver(&app, port);
-    return is_started;
+fn start_cloudflare_resolver(app: AppHandle, port: usize) -> Result<bool, String> {
+    return docker::start_cloudflare_resolver(&app, port);
 }
 
 #[tauri::command]
-fn stop_cloudflare_resolver(app: AppHandle) -> bool {
+fn stop_cloudflare_resolver(app: AppHandle) -> Result<bool, String> {
     return docker::stop_cloudflare_resolver(&app);
 }
 
@@ -151,6 +149,7 @@ async fn install_update(app: tauri::AppHandle) -> tauri_plugin_updater::Result<(
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    let _ = fix_path_env::fix();
     tauri::Builder::default()
         .setup(|app| {
             app.manage(Mutex::new(AppState::default()));

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://schema.tauri.app/config/2",
 	"productName": "NovelScraper",
-	"version": "3.0.7",
+	"version": "3.0.8",
 	"identifier": "me.hanadigital.novelscraper",
 	"build": {
 		"beforeDevCommand": "pnpm dev",

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@ import { appStateAtom, dockerAtom } from "@/lib/store";
 import { Button } from "./ui/button";
 import { TooltipUI } from "./tooltip";
 import DialogUI from "./dialog";
-import { CodeP, P, SmallP } from "./typography";
+import { SmallP } from "./typography";
 import { openUrl } from "@tauri-apps/plugin-opener";
 import { DialogClose } from "@radix-ui/react-dialog";
 
@@ -29,10 +29,9 @@ export function CloudflareResolverStatus() {
 	const initCloudflareResolver = async () => {
 		setIsDockerInitializing(true);
 		await new Promise((resolve) => setTimeout(resolve, 500));
-		const dStatus = await handleCheckDockerStatus();
-		const cfStatus = await handleStartCloudflareResolver();
+		const status = await handleCheckDockerStatus() && await handleStartCloudflareResolver();
 		setIsDockerInitializing(false);
-		return dStatus && cfStatus
+		return status;
 	}
 
 	const handleCheckDockerStatus = async () => {
@@ -75,6 +74,7 @@ export function CloudflareResolverStatus() {
 			setDocker(d => { d.cfResolverStatus = !isClosed });
 		} catch (e) {
 			console.error(e);
+			await initCloudflareResolver();
 		}
 		setIsLoadingCloudflareResolver(false);
 	}

src/components/cloudflare-resolver.tsx

@@ -35,7 +35,6 @@ function RootComponent() {
 				const isClosed = await invoke<boolean>("stop_cloudflare_resolver");
 			} catch (err) {
 				console.error(err);
-				event.preventDefault();
 			}
 		});