gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-08-22 00:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(integration): decode persisted settings and align ports

Browse Source
This commit is contained in:
NimBold
2026-06-18 07:52:48 +03:30
parent 5200c1e453
commit e2dd387a8c
5 changed files with 306 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/lib.rs
+19 -43
View File
@@ -517,6 +517,7 @@ mod parity;
pub mod error;
pub mod commands;
pub mod retry;
mod settings;
pub use error::AppError;
// Retained only for compatibility with the optional aria2 diagnostic monitor.
@@ -2153,20 +2154,9 @@ pub fn run() {
let max_concurrent = {
use tauri_plugin_store::StoreExt;
let mut capacity = crate::queue::DEFAULT_MAX_CONCURRENT;
if let Ok(store) = app.handle().store("store.bin") {
if let Some(settings_val) = store.get("settings") {
if let Some(settings_str) = settings_val.as_str() {
if let Ok(settings_json) = serde_json::from_str::<serde_json::Value>(settings_str) {
if let Some(n) = settings_json.get("maxConcurrentDownloads").and_then(|v| v.as_u64()) {
capacity = n as usize;
}
}
}
}
}
capacity
crate::settings::load_settings(app.handle())
.map(|settings| settings.max_concurrent_downloads)
.unwrap_or(crate::queue::DEFAULT_MAX_CONCURRENT)
};
let queue_manager = Arc::new(queue::QueueManager::new(app.handle().clone(), max_concurrent));
@@ -2234,21 +2224,9 @@ pub fn run() {
}
crate::scheduler::spawn_scheduler(app.handle().clone());
let mut global_speed_limit = String::new();
{
use tauri_plugin_store::StoreExt;
if let Ok(store) = app.handle().store("store.bin") {
if let Some(settings_val) = store.get("settings") {
if let Some(settings_str) = settings_val.as_str() {
if let Ok(settings_json) = serde_json::from_str::<serde_json::Value>(settings_str) {
if let Some(limit) = settings_json.get("globalSpeedLimit").and_then(|v| v.as_str()) {
global_speed_limit = limit.to_string();
}
}
}
}
}
}
let global_speed_limit = crate::settings::load_settings(app.handle())
.map(|settings| settings.global_speed_limit)
.unwrap_or_default();
match resolve_bundled_binary_path(app.handle(), "aria2c") {
Ok(binary_path) => {
@@ -2281,22 +2259,20 @@ pub fn run() {
std::thread::spawn(move || {
use std::io::BufRead;
let reader = std::io::BufReader::new(stderr);
for line in reader.lines() {
if let Ok(trimmed) = line {
let trimmed = trimmed.trim().to_string();
if let Ok(mut stderr_lock) = daemon_app.state::<Aria2DaemonGuard>().last_stderr.lock() {
stderr_lock.push_str(&trimmed);
stderr_lock.push('\n');
let excess = stderr_lock.len().saturating_sub(8192);
if excess > 0 {
let _ = stderr_lock.drain(..excess);
}
}
let lower = trimmed.to_lowercase();
if lower.contains("error") || lower.contains("critical") {
log::error!("aria2c stderr: {}", trimmed);
for line in reader.lines().map_while(Result::ok) {
let trimmed = line.trim().to_string();
if let Ok(mut stderr_lock) = daemon_app.state::<Aria2DaemonGuard>().last_stderr.lock() {
stderr_lock.push_str(&trimmed);
stderr_lock.push('\n');
let excess = stderr_lock.len().saturating_sub(8192);
if excess > 0 {
let _ = stderr_lock.drain(..excess);
}
}
let lower = trimmed.to_lowercase();
if lower.contains("error") || lower.contains("critical") {
log::error!("aria2c stderr: {}", trimmed);
}
}
});
}