diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 948fc76..db8ef96 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -15,7 +15,7 @@ pub struct Configuration { pub last_ip: Option, pub last_port: Option, pub language: Option, - pub customBackground: Option, + pub custom_background: Option, pub cert_generated: Option, pub theme: Option, pub https_enabled: Option, diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 1e12dbe..ea0bf9c 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -341,7 +341,7 @@ fn restart_grasscutter(window: tauri::Window) -> bool { #[cfg(unix)] #[tauri::command] -fn restart_grasscutter(window: tauri::Window) { +fn restart_grasscutter(_window: tauri::Window) { // Placeholder text for imports let s = System::new(); if let Some(process) = s.process(Pid::from(1337)) { @@ -412,7 +412,7 @@ fn enable_grasscutter_watcher(window: tauri::Window, process: String) { #[cfg(unix)] #[tauri::command] -fn enable_grasscutter_watcher(window: tauri::Window, process: String) { +fn enable_grasscutter_watcher(_window: tauri::Window, _process: String) { let gc_pid = Pid::from(696969); } diff --git a/src-tauri/src/system_helpers.rs b/src-tauri/src/system_helpers.rs index 305856a..efedec1 100644 --- a/src-tauri/src/system_helpers.rs +++ b/src-tauri/src/system_helpers.rs @@ -247,7 +247,7 @@ pub fn service_status(service: String) -> bool { #[cfg(unix)] #[tauri::command] -pub fn service_status(service: String) {} +pub fn service_status(_service: String) {} #[cfg(windows)] #[tauri::command] @@ -270,7 +270,7 @@ pub fn start_service(service: String) -> bool { #[cfg(unix)] #[tauri::command] -pub fn start_service(service: String) { +pub fn start_service(_service: String) { let started = OsStr::new("Started service!"); } @@ -295,7 +295,7 @@ pub fn stop_service(service: String) -> bool { #[cfg(unix)] #[tauri::command] -pub fn stop_service(service: String) {} +pub fn stop_service(_service: String) {} #[cfg(unix)] #[tauri::command] diff --git a/src/ui/App.tsx b/src/ui/App.tsx index d971e79..3c46541 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -38,7 +38,7 @@ class App extends React.Component, IState> { } // Get custom bg AFTER theme is loaded !! important !! - const custom_bg = await getConfigOption('customBackground') + const custom_bg = await getConfigOption('custom_background') if (custom_bg) { const isUrl = /^http(s)?:\/\//gm.test(custom_bg) diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx index 5ab915d..ffa47f5 100644 --- a/src/ui/components/menu/Options.tsx +++ b/src/ui/components/menu/Options.tsx @@ -111,7 +111,7 @@ export default class Options extends React.Component { grasscutter_with_game: config.grasscutter_with_game || false, language_options: languages, current_language: config.language || 'en', - bg_url_or_path: config.customBackground || '', + bg_url_or_path: config.custom_background || '', themes: (await getThemeList()).map((t) => t.name), theme: config.theme || 'default', encryption: encEnabled || false, @@ -231,13 +231,13 @@ export default class Options extends React.Component { async setCustomBackground(value: string) { const isUrl = /^(?:http(s)?:\/\/)/gm.test(value) - if (!value) return await setConfigOption('customBackground', '') + if (!value) return await setConfigOption('custom_background', '') if (!isUrl) { const filename = value.replace(/\\/g, '/').split('/').pop() const localBgPath = ((await dataDir()) as string).replace(/\\/g, '/') - await setConfigOption('customBackground', `${localBgPath}/cultivation/bg/${filename}`) + await setConfigOption('custom_background', `${localBgPath}/cultivation/bg/${filename}`) // Copy the file over to the local directory await invoke('copy_file', { @@ -247,7 +247,7 @@ export default class Options extends React.Component { window.location.reload() } else { - await setConfigOption('customBackground', value) + await setConfigOption('custom_background', value) window.location.reload() } } @@ -541,7 +541,7 @@ export default class Options extends React.Component { readonly={false} clearable={true} customClearBehaviour={async () => { - await setConfigOption('customBackground', '') + await setConfigOption('custom_background', '') window.location.reload() }} /> diff --git a/src/utils/configuration.ts b/src/utils/configuration.ts index 20b9962..662c1ac 100644 --- a/src/utils/configuration.ts +++ b/src/utils/configuration.ts @@ -15,7 +15,7 @@ let defaultConfig: Configuration last_ip: 'localhost', last_port: '443', language: 'en', - customBackground: '', + custom_background: '', cert_generated: false, theme: 'default', https_enabled: false, @@ -43,7 +43,7 @@ export interface Configuration { last_ip: string last_port: string language: string - customBackground: string + custom_background: string cert_generated: boolean theme: string https_enabled: boolean diff --git a/src/utils/themes.ts b/src/utils/themes.ts index e6f2628..b1fe878 100644 --- a/src/utils/themes.ts +++ b/src/utils/themes.ts @@ -112,8 +112,8 @@ export async function loadTheme(theme: ThemeList, document: Document) { // Set custom background if (theme.customBackgroundURL) { // If the custom bg is already set don't overwrite - if (config.customBackground === '') { - config.customBackground = theme.customBackgroundURL + if (config.custom_background === '') { + config.custom_background = theme.customBackgroundURL } } @@ -130,13 +130,13 @@ export async function loadTheme(theme: ThemeList, document: Document) { // Set the background // If the custom bg is already set don't overwrite - if (config.customBackground === '') { - config.customBackground = bgPath + imageName + if (config.custom_background === '') { + config.custom_background = bgPath + imageName } } // Write config - await setConfigOption('customBackground', config.customBackground) + await setConfigOption('custom_background', config.custom_background) return }