From 0f939f87ee964545dbe6575314ec497b31821e5b Mon Sep 17 00:00:00 2001 From: FTCHD <144691102+FTCHD@users.noreply.github.com> Date: Fri, 31 Oct 2025 17:20:07 +0100 Subject: [PATCH] revert to 2.7.8 (as 2.7.20) Signed-off-by: FTCHD <144691102+FTCHD@users.noreply.github.com> --- .github/workflows/release.yml | 76 +-------- lib/store.ts | 8 - lib/tray.ts | 77 ++------- package-lock.json | 4 +- package.json | 2 +- src-tauri/Cargo.lock | 220 ++----------------------- src-tauri/Cargo.toml | 5 +- src-tauri/flatpak.metainfo.xml | 6 +- src-tauri/icons/favicon/icon-light.png | Bin 1071 -> 15382 bytes src-tauri/icons/favicon/icon.png | Bin 1026 -> 14405 bytes src-tauri/src/lib.rs | 172 ++++++++++--------- src-tauri/tauri.conf.json | 2 +- src/pages/Settings.tsx | 136 ++++++++++----- 13 files changed, 233 insertions(+), 475 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51fa5d9..293570b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,38 +15,22 @@ jobs: args: '--target aarch64-apple-darwin' arch: 'silicon' type: 'aarch64' - assetPattern: '[name]_[arch][ext]' - platform: 'macos-latest' args: '--target x86_64-apple-darwin' arch: 'silicon' type: 'x86_64' - assetPattern: '[name]_[arch][ext]' - platform: 'ubuntu-22.04' args: '' - assetPattern: '[name]_[arch][ext]' - variant: 'default' - - platform: 'ubuntu-22.04' - args: "--config '{\"bundle\":{\"createUpdaterArtifacts\":false}}'" - assetPattern: '[name]_[arch]_legacy[ext]' - variant: 'legacy' - - platform: 'ubuntu-24.04' - args: "--config '{\"bundle\":{\"createUpdaterArtifacts\":false}}'" - assetPattern: '[name]_[arch]_alternate[ext]' - variant: 'alternate' - platform: 'ubuntu-22.04-arm' args: '' - assetPattern: '[name]_[arch][ext]' - variant: 'default' - platform: 'windows-11-arm' args: '--target x86_64-pc-windows-msvc' arch: 'arm64' type: 'x86_64' - assetPattern: '[name]_[arch][ext]' - platform: "windows-11-arm" args: "--target aarch64-pc-windows-msvc" arch: 'arm64' type: 'aarch64' - assetPattern: '[name]_[arch][ext]' runs-on: ${{ matrix.platform }} env: @@ -61,14 +45,9 @@ jobs: node-version: lts/* cache: 'npm' - - name: Purge cargo - if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' || matrix.platform == 'ubuntu-24.04' - run: | - rm -rf ~/.cargo/registry ~/.cargo/git ./target || true - - name: install Rust stable (linux only) uses: dtolnay/rust-toolchain@stable - if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' || matrix.platform == 'ubuntu-24.04' + if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' - name: install Rust stable (macos only) uses: dtolnay/rust-toolchain@stable @@ -86,49 +65,16 @@ jobs: uses: swatinem/rust-cache@v2 with: workspaces: './src-tauri -> target' - key: ${{ runner.os }}-${{ runner.arch }}${{ matrix.variant && format('-{0}', matrix.variant) || '' }} + key: ${{ runner.os }}-${{ runner.arch }} - name: install dependencies (linux only) - if: matrix.variant == 'default' || matrix.variant == 'alternate' + if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above. run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - - - name: install dependencies (linux legacy only) - if: matrix.variant == 'legacy' - run: | - sudo apt-get update - - sudo apt-get install -y \ - build-essential \ - curl \ - wget \ - file \ - libgtk-3-dev \ - libxdo-dev \ - libssl-dev \ - libappindicator3-dev \ - librsvg2-dev \ - patchelf - - mkdir -p /tmp/ubuntu-packages - cd /tmp/ubuntu-packages - wget https://launchpadlibrarian.net/723972773/libwebkit2gtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/723972761/libwebkit2gtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/723972770/libjavascriptcoregtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/723972746/libjavascriptcoregtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/723972735/gir1.2-javascriptcoregtk-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/723972739/gir1.2-webkit2-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb - wget https://launchpadlibrarian.net/606433947/libicu70_70.1-2ubuntu1_amd64.deb - wget https://launchpadlibrarian.net/606433941/libicu-dev_70.1-2ubuntu1_amd64.deb - wget https://launchpadlibrarian.net/606433945/icu-devtools_70.1-2ubuntu1_amd64.deb - wget https://launchpadlibrarian.net/595623693/libjpeg8_8c-2ubuntu10_amd64.deb - wget https://launchpadlibrarian.net/587202140/libjpeg-turbo8_2.1.2-0ubuntu1_amd64.deb - wget https://launchpadlibrarian.net/592959859/xdg-desktop-portal-gtk_1.14.0-1build1_amd64.deb - sudo apt-get install -y /tmp/ubuntu-packages/*.deb - + - name: install dependencies (linux arm only) - if: matrix.platform == 'ubuntu-22.04-arm' + if: matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above. run: | sudo apt-get install -y xdg-utils libayatana-appindicator3-dev @@ -137,14 +83,6 @@ jobs: run: | cargo install trusted-signing-cli - - name: Override linuxdeploy (linux legacy only) - if: matrix.variant == 'legacy' - run: | - TAURI_TOOLKIT_PATH="${XDG_CACHE_HOME:-$HOME/.cache}/tauri" - mkdir -p "$TAURI_TOOLKIT_PATH" - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20250213-2/linuxdeploy-x86_64.AppImage -O "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage" - chmod +x "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage" - - name: install frontend dependencies run: npm install @@ -172,7 +110,7 @@ jobs: echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV echo "Certificate imported." - - uses: tauri-apps/tauri-action@v0.5.23 + - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -198,7 +136,7 @@ jobs: tagName: v__VERSION__ releaseName: 'v__VERSION__' releaseBody: "\"Rclone\n\n# Rclone UI v__VERSION__\n- Bug squashing & improvements.\n\n**See the assets to download this version and install.**" - assetNamePattern: ${{ matrix.assetPattern }} + assetNamePattern: '[name]_[arch][ext]' releaseDraft: true prerelease: false args: ${{ matrix.args }} diff --git a/lib/store.ts b/lib/store.ts index d92a9db..1654632 100644 --- a/lib/store.ts +++ b/lib/store.ts @@ -111,10 +111,6 @@ interface PersistedState { lastSkippedVersion: string | undefined hideStartup: boolean - - themeV2: { - tray: 'light' | 'dark' | undefined - } } const getStorage = (store: LazyStore): StateStorage => ({ @@ -257,10 +253,6 @@ export const usePersistedStore = create()( lastSkippedVersion: undefined, hideStartup: false, - - themeV2: { - tray: undefined, - }, }), { name: 'store', diff --git a/lib/tray.ts b/lib/tray.ts index 2b68368..f2776ee 100644 --- a/lib/tray.ts +++ b/lib/tray.ts @@ -9,7 +9,6 @@ import { getAllWindows, getCurrentWindow } from '@tauri-apps/api/window' import { ask } from '@tauri-apps/plugin-dialog' import { platform } from '@tauri-apps/plugin-os' import { buildMenu } from './menu' -import { usePersistedStore } from './store' import { resetMainWindow } from './window' export async function triggerTrayRebuild() { @@ -25,76 +24,20 @@ async function getTray() { } async function resolveTrayIconForTheme() { - const existingTheme = usePersistedStore.getState().themeV2 - - if ('tray' in existingTheme && existingTheme.tray) { - return existingTheme.tray === 'dark' - ? 'icons/favicon/icon.png' - : 'icons/favicon/icon-light.png' - } - let theme: 'light' | 'dark' = 'dark' - - if (['macos', 'windows'].includes(platform())) { - try { - const detectedTheme = (await invoke('get_system_theme')) as - | 'light' - | 'dark' - | 'unknown' - - const currentWindow = getCurrentWindow() - const windowTheme = await currentWindow.theme() - - if (windowTheme !== detectedTheme) { - Sentry.captureException(new Error('Window theme mismatch'), { - extra: { - detectedTheme, - windowTheme, - os: platform(), - }, - }) - } - - if (detectedTheme === 'unknown') { - const answer = await ask( - 'Could not determine your system theme, please select the correct one below', - { - title: 'Hmm...', - okLabel: 'Dark', - cancelLabel: 'Light', - } - ) - - if (answer) { - theme = 'dark' - } else { - theme = 'light' - } - } else { - theme = detectedTheme - } - } catch {} - } else { - const answer = await ask( - 'Based on your tray/menubar, how do you want the icon to look?\n\nIf your menubar has a dark background select light, otherwise select dark.', - { - title: 'Greetings, Linux User', - okLabel: 'Dark', - cancelLabel: 'Light', - } - ) - - if (answer) { - theme = 'dark' + try { + if (platform() === 'macos') { + const t = (await invoke('get_system_theme')) || 'dark' + theme = t === 'dark' ? 'dark' : 'light' } else { - theme = 'light' + const currentWindow = getCurrentWindow() + const t = await currentWindow.theme() + theme = t === 'dark' ? 'dark' : 'light' } - } + } catch {} console.log('[resolveTrayIconForTheme] theme', theme) - usePersistedStore.setState({ themeV2: { tray: theme } }) - const pickedPath = theme === 'dark' ? 'icons/favicon/icon.png' : 'icons/favicon/icon-light.png' console.log('[resolveTrayIconForTheme] pickedPath', pickedPath) @@ -179,10 +122,10 @@ export async function initTray() { try { console.log('[initTray]') - // const initialIcon = await resolveResource('icons/favicon/frame_00_delay-0.1s.png') + const initialIcon = await resolveTrayIconForTheme() await TrayIcon.new({ id: 'main-tray', - icon: (await resolveResource('icons/favicon/icon.png'))!, + icon: initialIcon!, tooltip: 'Rclone', menuOnLeftClick: true, action: async (event: TrayIconEvent) => { diff --git a/package-lock.json b/package-lock.json index b101192..54a8855 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rclone-ui", - "version": "2.7.19", + "version": "2.7.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rclone-ui", - "version": "2.7.19", + "version": "2.7.20", "dependencies": { "@formkit/auto-animate": "^0.9.0", "@heroui/react": "^2.7.11", diff --git a/package.json b/package.json index 726beef..16f4699 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rclone-ui", "private": true, - "version": "2.7.19", + "version": "2.7.20", "type": "module", "scripts": { "dev": "node scripts/buildExternal.js && vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e8513c1..adb9b4e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -255,10 +255,9 @@ checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "app" -version = "2.7.19" +version = "2.7.20" dependencies = [ "cocoa", - "dark-light", "fix-path-env", "log", "machine-uid", @@ -286,7 +285,7 @@ dependencies = [ "tauri-plugin-store", "tauri-plugin-updater", "x11rb", - "zbus 5.9.0", + "zbus", "zip 0.6.6", ] @@ -344,7 +343,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus 5.9.0", + "zbus", ] [[package]] @@ -385,17 +384,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - [[package]] name = "async-io" version = "2.5.0" @@ -1178,22 +1166,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "dark-light" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a76fa97167fa740dcdbfe18e8895601e1bc36525f09b044e00916e717c03a3c" -dependencies = [ - "dconf_rs", - "detect-desktop-environment", - "dirs 4.0.0", - "objc", - "rust-ini", - "web-sys", - "winreg 0.10.1", - "zbus 4.4.0", -] - [[package]] name = "darling" version = "0.20.11" @@ -1235,12 +1207,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" -[[package]] -name = "dconf_rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" - [[package]] name = "debugid" version = "0.8.0" @@ -1316,12 +1282,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "detect-desktop-environment" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" - [[package]] name = "digest" version = "0.10.7" @@ -1435,12 +1395,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - [[package]] name = "document-features" version = "0.2.11" @@ -3338,19 +3292,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.30.1" @@ -3391,7 +3332,7 @@ dependencies = [ "mac-notification-sys", "serde", "tauri-winrt-notification", - "zbus 5.9.0", + "zbus", ] [[package]] @@ -3805,16 +3746,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown 0.12.3", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -4837,16 +4768,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - [[package]] name = "rust_decimal" version = "1.37.2" @@ -6185,7 +6106,7 @@ dependencies = [ "thiserror 2.0.14", "url", "windows", - "zbus 5.9.0", + "zbus", ] [[package]] @@ -6279,7 +6200,7 @@ dependencies = [ "thiserror 2.0.14", "tracing", "windows-sys 0.60.2", - "zbus 5.9.0", + "zbus", ] [[package]] @@ -8107,16 +8028,6 @@ dependencies = [ "rustix 1.0.8", ] -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "yoke" version = "0.8.0" @@ -8141,44 +8052,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - [[package]] name = "zbus" version = "5.9.0" @@ -8208,22 +8081,9 @@ dependencies = [ "uds_windows", "windows-sys 0.59.0", "winnow 0.7.12", - "zbus_macros 5.9.0", - "zbus_names 4.2.0", - "zvariant 5.6.0", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate 3.3.0", - "proc-macro2", - "quote", - "syn 2.0.104", - "zvariant_utils 2.1.0", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -8236,20 +8096,9 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.104", - "zbus_names 4.2.0", - "zvariant 5.6.0", - "zvariant_utils 3.2.0", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", + "zbus_names", + "zvariant", + "zvariant_utils", ] [[package]] @@ -8261,7 +8110,7 @@ dependencies = [ "serde", "static_assertions", "winnow 0.7.12", - "zvariant 5.6.0", + "zvariant", ] [[package]] @@ -8405,19 +8254,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.6.0" @@ -8429,21 +8265,8 @@ dependencies = [ "serde", "url", "winnow 0.7.12", - "zvariant_derive 5.6.0", - "zvariant_utils 3.2.0", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate 3.3.0", - "proc-macro2", - "quote", - "syn 2.0.104", - "zvariant_utils 2.1.0", + "zvariant_derive", + "zvariant_utils", ] [[package]] @@ -8456,18 +8279,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.104", - "zvariant_utils 3.2.0", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", + "zvariant_utils", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 10c556f..59ebcc4 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "2.7.19" +version = "2.7.20" description = "A Tauri App" authors = ["you"] license = "" @@ -52,6 +52,3 @@ cocoa = "0.26" [target.'cfg(target_os = "linux")'.dependencies] zbus = { version = "5" } x11rb = "0.13" - -[target.'cfg(not(target_os = "linux"))'.dependencies] -dark-light = "1.1.1" diff --git a/src-tauri/flatpak.metainfo.xml b/src-tauri/flatpak.metainfo.xml index 91d2a40..8bb98b7 100644 --- a/src-tauri/flatpak.metainfo.xml +++ b/src-tauri/flatpak.metainfo.xml @@ -94,10 +94,10 @@ - - https://github.com/rclone-ui/rclone-ui/releases/tag/v2.7.19 + + https://github.com/rclone-ui/rclone-ui/releases/tag/v2.7.20 -

2.7.19 Release

+

2.7.20 Release

  • Improved Linux stability and overall performance.
diff --git a/src-tauri/icons/favicon/icon-light.png b/src-tauri/icons/favicon/icon-light.png index 538315bdb89cfe31e2c4d0f3fae705fa7e7a9ee2..ad319778282a7d2a41299c193f07aaab95277854 100644 GIT binary patch literal 15382 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 VrF6W|k9z^QqGPCCaM>>C{{r`q%Qyf4 delta 1035 zcmV+m1oZosc&`W{iBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{kge*?rx zL_t(|0j*duOdCNEynh>Npi0LJTZqm@BBgXekuEMMBSAqKiGm&%P7x_Z3VM)?lp+O@ zpp4|gB~mEd5o9BONdY)5U^_F`z4ftg@9v+B1o!^C-Jjdt+ui>_y#P@ZEftH!>Uca} z;_n~``p?hLoqoSRP&pB(94M7ae>)hqL8NL_8U$?&C%s;;sWKuHp>nxQYaHWm)n`43 z#S04yn^#v?edUSJcOk7Z8jV`MWC*T(e0=O`i+Z8pvj~={LHRe8AGMX0mH6S|q2pTU zbQuCSDijL8lEBRixNiXWy>YqE>9Q~k4_-=!ppK`frz6)oD!e@KXhljCqW{EAFlG3|_Tf_k-Sl1K1Lbk~_jZ7m2?f78#=q)w+i_-}1( zjXSETjL->kEBUSC?=vo!q_xQYKMeD)nBAGd11e$MSbRRf+zC&|Z2m#J8lzqP=N_9l z_Du#oyBwkGNO}%VbU9%2WLeaK&$qI4d<1m1((Ns+gY;0+ae9h5sU+<)54{&A<2+;t z>~t3oo)TgpbEGxFe`!nVueb?X=u%+ZuoX~(?n$l@I|JX0u48uYBr+sI$$WT#*dh=~ zkDdI%Dy`X^A_2OM#K9%4P<^n8G8FQ$YDzIXHeJBxC@(x41{ zf!luL=R1`HVJy0+bKj@r(v$q2gFr2_j(O;sBty9E7;=YvYxR}WL}IqTv)_=!j}7`0 z%ATb%^H`seOb$8mW0ud?4}P|*B-xb#h&0i5eYVRh_ZPFfDLmfw)O`Q|002ovPDHLk FV1iCR>xuvX diff --git a/src-tauri/icons/favicon/icon.png b/src-tauri/icons/favicon/icon.png index 171298ea3bee5e9c3526f1c57f9e826908506574..5bed5380efe7a7a362c1b2170615ac320b8ae42e 100644 GIT binary patch literal 14405 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 delta 990 zcmV<410npyaDoUSiBL{Q4GJ0x0000DNk~Le0000Z0000Z2nGNE03O-1S&<<$e*>3E zL_t(|0i{^GY8ycmofQJxRa6*^?IJQs?|?tRf&Bpgfdx^ofKywAQpXVY4p_Yc`T#+c zIsv;kNN)7#ltxIPN6uN_73 zoC-{*(<$uk?ly3HZn8^rGMSW5PEJNiiaC=)0OW2%Ae0NN|CUBE5zJsPsBlBGos?uB zr#Rgt!P-JVzSVRjV7s^$U3!oa-1Xk&t|ZHxYX=YnF8iYfn`X+C9|sa!$3t7TIk;+HbCqftva2#Rasi>py!Al1 zs-UgQYZIXNU=d9Ih`4zO$MO8nq!8+1o$X-8VAo^;19P&*?8}?1e2oL>hLY$sHIqZ{ zjk2{CPj)cExQu*$RI@^de{Z=)_YyPKb*xvU3|rk=iy4v=4tX*!HAn>_QsKt&LAdCL zqTgmLlDk6ds$f_Mp?H%5L@3m|j_px$kY649hun21g?Amy1{FD!-{B42i^HsY2=}y+ z7@s4<)hM6&s7*CwfzC;NV7ljBl3IJW*WT zK+e$!SsN=7o6#A%BJ-+%^sN0fanLea+FI)l-2f|SfnAVa5>}D@tkz?jlEar4bOl>M zZ^``*?M}7g2H<%SIf5)1zG2_}(2Z+E$Z0JKU z=Sdq|#1DvSoozDDoe%| zfL^iutL923%4s*Ji;$|P1ccAMNiWREt9ZGw)^lb8l&^8nN2OeZEk!L_(HVPEcuN`x zd~T7Aw>G9uH2h11j5(XliU_hG8*qIXkH^n0+Lwl&8B~l6x05=6|KjcSyyyrM@c;k- M07*qoM6N<$f)3x*{r~^~ diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 6568cdb..0c8c703 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -250,21 +250,96 @@ fn get_uid() -> String { #[tauri::command] fn get_system_theme() -> String { - #[cfg(not(target_os = "linux"))] + #[cfg(target_os = "macos")] { - match dark_light::detect() { - dark_light::Mode::Dark => "dark".to_string(), - dark_light::Mode::Light => "light".to_string(), - dark_light::Mode::Default => "unknown".to_string(), + use std::process::Command; + if let Ok(output) = Command::new("defaults") + .args(&["read", "-g", "AppleInterfaceStyle"]) + .output() + { + if output.status.success() { + let out = String::from_utf8_lossy(&output.stdout).to_ascii_lowercase(); + if out.contains("dark") { + return "dark".to_string(); + } + } } + return "light".to_string(); + } + + #[cfg(target_os = "windows")] + { + use std::process::Command; + if let Ok(output) = Command::new("reg").args(&[ + "query", + r"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", + "/v", + "AppsUseLightTheme", + ]).output() { + if output.status.success() { + let out = String::from_utf8_lossy(&output.stdout).to_ascii_lowercase(); + if out.contains("0x0") || out.contains("0x00000000") { + return "dark".to_string(); + } + if out.contains("0x1") || out.contains("0x00000001") { + return "light".to_string(); + } + } + } + return "light".to_string(); } #[cfg(target_os = "linux")] { - "unknown".to_string() + use std::process::Command; + + // GNOME color-scheme (prefer-dark) + if let Ok(output) = Command::new("gsettings") + .args(&["get", "org.gnome.desktop.interface", "color-scheme"]) + .output() + { + if output.status.success() { + let out = String::from_utf8_lossy(&output.stdout).to_ascii_lowercase(); + if out.contains("dark") { + return "dark".to_string(); + } + } + } + + // GNOME gtk-theme name contains "dark" + if let Ok(output) = Command::new("gsettings") + .args(&["get", "org.gnome.desktop.interface", "gtk-theme"]) + .output() + { + if output.status.success() { + let out = String::from_utf8_lossy(&output.stdout).to_ascii_lowercase(); + if out.contains("dark") { + return "dark".to_string(); + } + } + } + + // KDE color scheme via kreadconfig5 + if let Ok(output) = Command::new("kreadconfig5") + .args(&["--group", "General", "--key", "ColorScheme"]) + .output() + { + if output.status.success() { + let out = String::from_utf8_lossy(&output.stdout).to_ascii_lowercase(); + if out.contains("dark") { + return "dark".to_string(); + } + } + } + + return "light".to_string(); + } + + #[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "linux")))] + { + "dark".to_string() } } - #[tauri::command] fn is_rclone_running(port: Option) -> bool { @@ -469,103 +544,52 @@ async fn prompt_text( if is_sensitive { // Try zenity password dialog first - match std::process::Command::new("zenity") + if let Ok(output) = std::process::Command::new("zenity") .args(&["--password", "--title", &title, "--text", &message]) .output() { - Ok(output) => { - if output.status.success() { - let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + if output.status.success() { + let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + if !result.is_empty() { return Ok(Some(result)); - } else { - // Check if user cancelled (exit code 1) or other error - let exit_code = output.status.code().unwrap_or(-1); - if exit_code == 1 { - // User clicked Cancel - return Ok(None); - } - // For other errors, fall through to try kdialog - let stderr = String::from_utf8_lossy(&output.stderr); - eprintln!("zenity password dialog failed (exit {}): {}", exit_code, stderr); } } - Err(e) => { - // Command not found or couldn't execute, try kdialog - eprintln!("zenity not available: {}", e); - } } // Fallback to kdialog password - match std::process::Command::new("kdialog") + if let Ok(output) = std::process::Command::new("kdialog") .args(&["--password", &message, "--title", &title]) .output() { - Ok(output) => { - if output.status.success() { - let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + if output.status.success() { + let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + if !result.is_empty() { return Ok(Some(result)); - } else { - let exit_code = output.status.code().unwrap_or(-1); - if exit_code == 1 { - // User clicked Cancel - return Ok(None); - } - let stderr = String::from_utf8_lossy(&output.stderr); - eprintln!("kdialog password dialog failed (exit {}): {}", exit_code, stderr); } } - Err(e) => { - eprintln!("kdialog not available: {}", e); - } } return Err("No suitable password dialog found. Please install zenity or kdialog.".to_string()); } else { // Try zenity text entry first - match std::process::Command::new("zenity") + if let Ok(output) = std::process::Command::new("zenity") .args(&["--entry", "--title", &title, "--text", &message, "--entry-text", &default_value]) .output() { - Ok(output) => { - if output.status.success() { - let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); - return Ok(Some(result)); - } else { - let exit_code = output.status.code().unwrap_or(-1); - if exit_code == 1 { - // User clicked Cancel - return Ok(None); - } - let stderr = String::from_utf8_lossy(&output.stderr); - eprintln!("zenity entry dialog failed (exit {}): {}", exit_code, stderr); - } - } - Err(e) => { - eprintln!("zenity not available: {}", e); + if output.status.success() { + let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + return Ok(Some(result)); } } // Fallback to kdialog input box - match std::process::Command::new("kdialog") + if let Ok(output) = std::process::Command::new("kdialog") .args(&["--inputbox", &message, &default_value, "--title", &title]) .output() { - Ok(output) => { - if output.status.success() { - let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); - return Ok(Some(result)); - } else { - let exit_code = output.status.code().unwrap_or(-1); - if exit_code == 1 { - // User clicked Cancel - return Ok(None); - } - let stderr = String::from_utf8_lossy(&output.stderr); - eprintln!("kdialog inputbox failed (exit {}): {}", exit_code, stderr); - } - } - Err(e) => { - eprintln!("kdialog not available: {}", e); + if output.status.success() { + let result = String::from_utf8_lossy(&output.stdout).trim().to_string(); + return Ok(Some(result)); } } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3ee9f88..7084891 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -2,7 +2,7 @@ "$schema": "https://schema.tauri.app/config/2", "productName": "Rclone UI", "mainBinaryName": "Rclone UI", - "version": "2.7.19", + "version": "2.7.20", "identifier": "com.rclone.ui", "build": { "frontendDist": "../dist", diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index 365bdc2..d0f03e0 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -49,7 +49,7 @@ import { MedalIcon, PencilIcon, PlusIcon, - SatelliteDishIcon, + SatelliteDish, ServerIcon, Trash2Icon, } from 'lucide-react' @@ -213,7 +213,7 @@ function Settings() { key="proxy" title={
- + Proxy
} @@ -292,7 +292,11 @@ function GeneralSection() { const [isWorkingUpdate, setIsWorkingUpdate] = useState(false) const [update, setUpdate] = useState(null) - const [showServe, setShowServe] = useState(false) + const [rcloneVersion, setRcloneVersion] = useState<{ yours: string; latest: string } | null>( + null + ) + + const showServe = rcloneVersion?.yours && compareVersions(rcloneVersion.yours, '1.70.0') === 1 async function updateCallback() { if (!update) { @@ -393,28 +397,19 @@ function GeneralSection() { await getCurrentWindow().emit('relaunch-app') } - function updateDisabledActions({ - name, - value, - }: { name: (typeof disabledActions)[number]; value: boolean }) { - if (value) { - setDisabledActions(disabledActions?.filter((action) => action !== name) || []) - } else { - setDisabledActions([...(disabledActions || []), name]) - } - triggerTrayRebuild() - } - useEffect(() => { // needed since the first value from the persisted store is undefined setPasswordInput(settingsPass || '') }, [settingsPass]) + // biome-ignore lint/correctness/useExhaustiveDependencies: + useEffect(() => { + triggerTrayRebuild() + }, [disabledActions]) + useEffect(() => { getRcloneVersion().then((version) => { - if (version?.yours && compareVersions(version.yours, '1.70.0') === 1) { - setShowServe(true) - } + setRcloneVersion(version) }) }, []) @@ -530,66 +525,123 @@ function GeneralSection() { - updateDisabledActions({ name: 'tray-mount', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-mount') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-mount']) + } + }} > Show Mount option - updateDisabledActions({ name: 'tray-sync', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-sync') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-sync']) + } + }} > Show Sync option - updateDisabledActions({ name: 'tray-copy', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-copy') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-copy']) + } + }} > Show Copy option - updateDisabledActions({ name: 'tray-move', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-move') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-move']) + } + }} > Show Move option - updateDisabledActions({ name: 'tray-download', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter( + (action) => action !== 'tray-download' + ) || [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-download']) + } + }} > Show Download option - updateDisabledActions({ name: 'tray-serve', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-serve') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-serve']) + } + }} isDisabled={!showServe} > Show Serve option - updateDisabledActions({ name: 'tray-purge', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-purge') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-purge']) + } + }} > Show Purge option - updateDisabledActions({ name: 'tray-delete', value }) - } + onValueChange={(value) => { + if (value) { + setDisabledActions( + disabledActions?.filter((action) => action !== 'tray-delete') || + [] + ) + } else { + setDisabledActions([...(disabledActions || []), 'tray-delete']) + } + }} > Show Delete option