Merge pull request #77 from HanaDigital/master

v3.0.7

Author: dr-nyt

.github/workflows/publish.yml

@@ -62,10 +62,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
-          releaseName: "App v__VERSION__"
+          tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          releaseName: "NovelScraper v__VERSION__"
           releaseBody: |
             ### Platform Files
+            Your computer may block you from installing the app. Read more [here](https://github.com/HanaDigital/NovelScraper/wiki/How-to-Install).
+
             **Windows:** `NovelScraper_X.X.X_x64_en-US.msi`
             **MacOS:** `NovelScraper_X.X.X_x64.dmg`
             **Linux:** You can figure it out :D

README.md

@@ -34,10 +34,11 @@ Download and update translated web/light novels from a list of sites.
 List of supported sites:
 -	[NovelFull](https://novelfull.com/)
 -   [NovelBin](https://novelbin.com/)
+-   [Novgo](https://novgo.co)
 
-Author: [@dr-nyt](https://github.com/dr-nyt)
+Author: [@dr-nyt](https://github.com/dr-nyt)  
 Contributors: [@webdagger](https://github.com/webdagger), [@jiskim](https://github.com/jiskim)
-Version: 3.0.6
+Version: 3.0.7
 
 ## FEATURES
 
@@ -46,14 +47,6 @@ Version: 3.0.6
   	<img src="https://user-images.githubusercontent.com/41040912/95752022-76181800-0cb0-11eb-9e9c-2627334b0779.png">
 </p>
 
-## CONTRIBUTE
-
-Contributing to this project is very straight forward. There is a step-by-step guide on how to add a source to the app.
-
-You can find the contribution guide [here](https://github.com/HanaDigital/NovelScraper/wiki/Contribution-Guide).
-
-## ATTRIBUTION
-
 ## LICENSE
 
 ```

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "novelscraper",
 	"private": true,
-	"version": "3.0.6",
+	"version": "3.0.7",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -21,6 +21,7 @@
 		"@tauri-apps/plugin-dialog": "~2",
 		"@tauri-apps/plugin-fs": "~2",
 		"@tauri-apps/plugin-opener": "^2.2.6",
+		"@tauri-apps/plugin-os": "~2",
 		"@tauri-apps/plugin-shell": "^2.0.1",
 		"@tauri-apps/plugin-store": "~2",
 		"@tauri-apps/plugin-updater": "~2",

pnpm-lock.yaml

@@ -32,6 +32,7 @@ futures = "0.3.31"
 regex = "1.11.1"
 reqwest = "0.12.12"
 tauri-plugin-opener = "2.2.6"
+tauri-plugin-os = "2"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-updater = "2"

src-tauri/Cargo.lock

@@ -7,6 +7,7 @@
   ],
   "permissions": [
     "core:default",
+    "core:window:allow-destroy",
     "shell:allow-open",
     "store:default",
     "fs:default",
@@ -33,7 +34,6 @@
     },
     "dialog:default",
     "shell:default",
-    "opener:default",
     "opener:default"
   ]
 }

src-tauri/Cargo.toml

@@ -1,17 +1,27 @@
+use std::{thread::sleep, time::Duration};
+
 use tauri::AppHandle;
+use tauri_plugin_os::arch;
 use tauri_plugin_shell::ShellExt;
 
 pub fn check_docker_status(app: &AppHandle) -> bool {
     let shell = app.shell();
-    let output = tauri::async_runtime::block_on(async move {
-        shell.command("docker").args(["ps"]).output().await.unwrap()
-    });
-    if output.status.success() {
-        println!("Result: {:?}", String::from_utf8(output.stdout));
-        return true;
-    } else {
-        println!("Exit with code: {}", output.status.code().unwrap());
-        return false;
+    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;
+            } else {
+                println!("Exit with code: {}", output.status.code().unwrap());
+                return false;
+            }
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            return false;
+        }
     }
 }
 
@@ -23,6 +33,30 @@ pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> bool {
     let shell = app.shell();
     let start_cmd = ["start", "novelscraper-cloudflare-resolver"];
 
+    match tauri::async_runtime::block_on(async move {
+        shell.command("docker").args(start_cmd).output().await
+    }) {
+        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));
+            }
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            return false;
+        }
+    }
+
+    let image = if arch() == "aarch64" {
+        sleep(Duration::from_secs(1));
+        "drnyt/cf-clearance-scraper-arm64:latest"
+    } else {
+        "zfcsoftware/cf-clearance-scraper:latest"
+    };
     let port_link = format!("{port}:3000");
     let run_cmd = [
         "run",
@@ -35,39 +69,50 @@ pub fn start_cloudflare_resolver(app: &AppHandle, port: usize) -> bool {
         "browserLimit=20",
         "-e",
         "timeOut=60000",
-        "zfcsoftware/cf-clearance-scraper:latest",
+        image,
     ];
-    let start_output = tauri::async_runtime::block_on(async move {
-        shell
-            .command("docker")
-            .args(start_cmd)
-            .output()
-            .await
-            .unwrap()
-    });
-    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));
+
+    match tauri::async_runtime::block_on(async move {
+        shell.command("docker").args(run_cmd).output().await
+    }) {
+        Ok(run_output) => {
+            if run_output.status.success() {
+                println!("Result: {:?}", String::from_utf8(run_output.stdout));
+                return true;
+            } else {
+                println!("Exit with code: {}", run_output.status.code().unwrap());
+                println!("Error: {:?}", String::from_utf8(run_output.stderr));
+                return false;
+            }
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            return false;
+        }
     }
+}
 
-    let run_output = tauri::async_runtime::block_on(async move {
+pub fn stop_cloudflare_resolver(app: &AppHandle) -> bool {
+    let shell = app.shell();
+    match tauri::async_runtime::block_on(async move {
         shell
             .command("docker")
-            .args(run_cmd)
+            .args(["stop", "novelscraper-cloudflare-resolver"])
             .output()
             .await
-            .unwrap()
-    });
-    if run_output.status.success() {
-        println!("Result: {:?}", String::from_utf8(run_output.stdout));
-        return true;
-    } else {
-        println!("Exit with code: {}", run_output.status.code().unwrap());
-        println!("Error: {:?}", String::from_utf8(run_output.stderr));
-
-        return false;
+    }) {
+        Ok(output) => {
+            if output.status.success() {
+                println!("Result: {:?}", String::from_utf8(output.stdout));
+                return true;
+            } else {
+                println!("Exit with code: {}", output.status.code().unwrap());
+                return false;
+            }
+        }
+        Err(e) => {
+            println!("Error: {}", e);
+            return false;
+        }
     }
 }

src-tauri/capabilities/default.json

@@ -68,9 +68,13 @@ async fn download_novel_chapters(
     }
 }
 
-#[tauri::command]
-async fn fetch_html(url: &str, headers: Option<HashMap<String, String>>) -> Result<String, String> {
-    source::fetch_html(url, &headers).await
+#[tauri::command(rename_all = "snake_case")]
+async fn fetch_html(
+    url: &str,
+    headers: Option<HashMap<String, String>>,
+    fetch_type: source::types::FetchType,
+) -> Result<String, String> {
+    source::fetch_html(url, &headers, fetch_type).await
 }
 
 #[tauri::command]
@@ -83,12 +87,19 @@ async fn fetch_image(
 
 #[tauri::command]
 fn check_docker_status(app: AppHandle) -> bool {
-    return docker::check_docker_status(&app);
+    let is_started = docker::check_docker_status(&app);
+    return is_started;
 }
 
 #[tauri::command]
 fn start_cloudflare_resolver(app: AppHandle, port: usize) -> bool {
-    return docker::start_cloudflare_resolver(&app, port);
+    let is_started = docker::start_cloudflare_resolver(&app, port);
+    return is_started;
+}
+
+#[tauri::command]
+fn stop_cloudflare_resolver(app: AppHandle) -> bool {
+    return docker::stop_cloudflare_resolver(&app);
 }
 
 #[derive(Default)]
@@ -159,6 +170,7 @@ pub fn run() {
             update_novel_download_status,
             check_docker_status,
             start_cloudflare_resolver,
+            stop_cloudflare_resolver,
             check_for_update,
             install_update
         ])