diff --git a/package.json b/package.json index 5aef320..d700f55 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "type": "module", "packageManager": "pnpm@7.8.0", - "version": "1.0.0", + "version": "1.0.2", "scripts": { "build": "vite build", "dev": "vite --port 3333", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7edf0eb..0775e4a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,49 +2,50 @@ lockfileVersion: 5.4 specifiers: '@antfu/eslint-config': ^0.27.0 - '@iconify-json/carbon': ^1.1.15 - '@iconify-json/ic': ^1.1.13 + '@iconify-json/carbon': ^1.1.8 + '@iconify-json/ic': ^1.1.9 '@intlify/vite-plugin-vue-i18n': ^6.0.3 - '@tauri-apps/api': ^1.2.0 + '@tauri-apps/api': ^1.1.1 + '@tauri-apps/cli': 1.1.1 '@types/node': 18.8.0 '@types/nprogress': ^0.2.0 - '@unocss/extractor-pug': ^0.45.30 - '@unocss/reset': ^0.45.30 - '@vitejs/plugin-vue': ^3.2.0 - '@volar/vue-language-plugin-pug': ^1.0.24 - '@vue/devtools': ^6.5.0 - '@vue/test-utils': ^2.2.10 - '@vueuse/core': ^9.12.0 - '@vueuse/head': ^0.9.8 + '@unocss/extractor-pug': ^0.45.29 + '@unocss/reset': ^0.45.28 + '@vitejs/plugin-vue': ^3.1.2 + '@volar/vue-language-plugin-pug': ^1.0.9 + '@vue/devtools': ^6.4.5 + '@vue/test-utils': ^2.1.0 + '@vueuse/core': ^9.3.0 + '@vueuse/head': ^0.9.7 critters: ^0.0.16 cross-env: ^7.0.3 - eslint: ^8.34.0 + eslint: ^8.24.0 https-localhost: ^4.7.1 nprogress: ^0.2.0 - pinia: ^2.0.30 - pnpm: ^7.27.0 + pinia: ^2.0.22 + pnpm: ^7.13.2 pug: ^3.0.2 - sass: ^1.58.1 - typescript: ^4.9.5 - unocss: ^0.45.30 - unplugin-auto-import: ^0.11.5 - unplugin-vue-components: ^0.22.12 - vite: ^3.2.5 - vite-plugin-inspect: ^0.7.15 + sass: ^1.55.0 + typescript: ^4.8.4 + unocss: ^0.45.28 + unplugin-auto-import: ^0.11.2 + unplugin-vue-components: ^0.22.8 + vite: ^3.1.6 + vite-plugin-inspect: ^0.7.5 vite-plugin-pages: ^0.26.0 - vite-plugin-pwa: ^0.13.3 - vite-plugin-vue-component-preview: ^0.3.4 + vite-plugin-pwa: ^0.13.1 + vite-plugin-vue-component-preview: ^0.3.3 vite-plugin-vue-layouts: ^0.7.0 - vite-plugin-vue-markdown: ^0.22.4 - vite-ssg: ^0.21.2 + vite-plugin-vue-markdown: ^0.22.1 + vite-ssg: ^0.21.0 vite-ssg-sitemap: ^0.4.3 - vitest: ^0.24.5 - vue: ^3.2.47 + vitest: ^0.24.0 + vue: ^3.2.41 vue-demi: ^0.13.11 vue-devtools: ^5.1.4 vue-i18n: ^9.2.2 - vue-router: ^4.1.6 - vue-tsc: ^1.0.24 + vue-router: ^4.1.5 + vue-tsc: ^1.0.9 dependencies: '@tauri-apps/api': 1.2.0 @@ -54,6 +55,7 @@ dependencies: '@vueuse/head': 0.9.8_vue@3.2.47 nprogress: 0.2.0 pinia: 2.0.30_hmuptsblhheur2tugfgucj7gc4 + pnpm: 7.27.0 pug: 3.0.2 sass: 1.58.1 vue: 3.2.47 @@ -67,6 +69,7 @@ devDependencies: '@iconify-json/carbon': 1.1.15 '@iconify-json/ic': 1.1.13 '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.2.5+vue-i18n@9.2.2 + '@tauri-apps/cli': 1.1.1 '@types/node': 18.8.0 '@types/nprogress': 0.2.0 '@unocss/extractor-pug': 0.45.30_pug@3.0.2 @@ -77,7 +80,6 @@ devDependencies: cross-env: 7.0.3 eslint: 8.34.0 https-localhost: 4.7.1 - pnpm: 7.27.0 typescript: 4.9.5 unocss: 0.45.30_vite@3.2.5 unplugin-auto-import: 0.11.5_@vueuse+core@9.12.0 @@ -1758,6 +1760,103 @@ packages: engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false + /@tauri-apps/cli-darwin-arm64/1.1.1: + resolution: {integrity: sha512-qBG11ig525/qf0f5OQxn0ON3hT8YdpTfpa4Y4kVqBJhdW50R5fadPv6tv5Dpl2TS2X7nWh/zg5mEXYoCK3HZ9w==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-darwin-x64/1.1.1: + resolution: {integrity: sha512-M3dMsp78OdxisbTwAWGvy3jIb3uqThtQcUYVvqOu9LeEOHyldOBFDSht+6PTBpaJLAHFMQK2rmNxiWgigklJaA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-linux-arm-gnueabihf/1.1.1: + resolution: {integrity: sha512-LYlvdAd73cq+yTi6rw7j/DWIvDpeApwgQkIn+HYsNNeFhyFmABU7tmw+pekK3W3nHAkYAJ69Rl4ZdoxdNGKmHg==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-linux-arm64-gnu/1.1.1: + resolution: {integrity: sha512-o/hbMQIKuFI7cTNpeQBHD/OCNJOBIci78faKms/t6AstLXx0QJuRHDk477Rg6VVy/I3BBKbyATALbmcTq+ti0A==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-linux-arm64-musl/1.1.1: + resolution: {integrity: sha512-8Ci4qlDnXIp93XqUrtzFCBDatUzPHpZq7L3bociUbWpvy/bnlzxp1C/C+vwdc4uS1MiAp9v3BFgrU4i0f0Z3QQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-linux-x64-gnu/1.1.1: + resolution: {integrity: sha512-ES4Bkx2JAI8+dDNDJswhLS3yqt+yT/4C6UfGOPIHFxcXUh6fe36eUllrTt+HLRS9xTZbYnteJy7ebq2TqMkaxw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-linux-x64-musl/1.1.1: + resolution: {integrity: sha512-qrN1WOMAaDl+LE8P8iO0+DYlrWNTc9jIu/CsnVY/LImTn79ZPxEkcVBo0UGeKRI7f10TfvkVmLCBLxTz8QhEyA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-win32-ia32-msvc/1.1.1: + resolution: {integrity: sha512-vw7VOmrQlywHhFV3pf54udf2FRNj9dg9WP1gL0My55FnB+w+PWS9Ipm871kX5qepmChdnZHKq9fsqE2uTjX//Q==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli-win32-x64-msvc/1.1.1: + resolution: {integrity: sha512-OukxlLLi3AoCN4ABnqCDTiiC7xJGWukAjrKCIx7wFISrLjNfsrnH7/UOzuopfGpZChSe2c+AamVmcpBfVsEmJA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@tauri-apps/cli/1.1.1: + resolution: {integrity: sha512-80kjMEMPBwLYCp0tTKSquy90PHHGGBvZsneNr3B/mWxNsvjzA1C0vOyGJGFrJuT2OmkvrdvuJZ5mch5hL8O1Xg==} + engines: {node: '>= 10'} + hasBin: true + optionalDependencies: + '@tauri-apps/cli-darwin-arm64': 1.1.1 + '@tauri-apps/cli-darwin-x64': 1.1.1 + '@tauri-apps/cli-linux-arm-gnueabihf': 1.1.1 + '@tauri-apps/cli-linux-arm64-gnu': 1.1.1 + '@tauri-apps/cli-linux-arm64-musl': 1.1.1 + '@tauri-apps/cli-linux-x64-gnu': 1.1.1 + '@tauri-apps/cli-linux-x64-musl': 1.1.1 + '@tauri-apps/cli-win32-ia32-msvc': 1.1.1 + '@tauri-apps/cli-win32-x64-msvc': 1.1.1 + dev: true + /@tootallnate/once/2.0.0: resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} @@ -5966,7 +6065,7 @@ packages: resolution: {integrity: sha512-nvxGrxgu3oYyw7zg7DdotEnqp9r/c0/iLZHr6QewJPEkVFGSPdsxrm0HFKBkOqwCInoutFzz/mtGx+pbYV8UCw==} engines: {node: '>=14.6'} hasBin: true - dev: true + dev: false /postcss-selector-parser/6.0.11: resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==} diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index d4c96e5..91baa39 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -61,19 +61,20 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", @@ -124,22 +125,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "attohttpc" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded", - "url", -] - [[package]] name = "atty" version = "0.2.14" @@ -206,7 +191,7 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "better-ilias" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "env_logger", @@ -282,9 +267,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "serde", @@ -714,17 +699,6 @@ dependencies = [ "syn", ] -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - [[package]] name = "derive_builder" version = "0.12.0" @@ -1239,7 +1213,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows 0.39.0", + "windows", ] [[package]] @@ -1285,9 +1259,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gio" @@ -1476,12 +1450,12 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "headless_chrome" -version = "1.0.4" -source = "git+https://github.com/Billy-Sheppard/rust-headless-chrome.git#607f49c575a4ec95e9f492e958abcc5e7ee87418" +version = "1.0.5" +source = "git+https://github.com/rust-headless-chrome/rust-headless-chrome.git#284754b0724a87b3bde719573da764e880874009" dependencies = [ "anyhow", "auto_generate_cdp", - "base64 0.13.1", + "base64 0.21.0", "derive_builder", "directories", "log", @@ -1578,9 +1552,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1907,15 +1881,6 @@ version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" -[[package]] -name = "libdbus-sys" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" -dependencies = [ - "pkg-config", -] - [[package]] name = "line-wrap" version = "0.1.1" @@ -1971,19 +1936,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -[[package]] -name = "mac-notification-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - [[package]] name = "malloc_buf" version = "0.0.6" @@ -2165,17 +2117,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "notify-rust" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce656bb6d22a93ae276a23de52d1aec5ba4db3ece3c0eb79dfd5add7384db6a" -dependencies = [ - "dbus", - "mac-notification-sys", - "tauri-winrt-notification", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2228,18 +2169,18 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2257,17 +2198,6 @@ dependencies = [ "objc_exception", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc_exception" version = "0.1.2" @@ -2297,9 +2227,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2362,27 +2292,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_info" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_pipe" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - [[package]] name = "overload" version = "0.1.1" @@ -2639,14 +2548,14 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" +checksum = "9469799ca90293a376f68f6fcb8f11990d9cff55602cfba0ba83893c973a7f46" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "indexmap", "line-wrap", - "quick-xml 0.26.0", + "quick-xml", "serde", "time", ] @@ -2753,15 +2662,6 @@ dependencies = [ "psl-types", ] -[[package]] -name = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.26.0" @@ -2984,30 +2884,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - [[package]] name = "ring" version = "0.16.20" @@ -3435,16 +3311,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3462,9 +3328,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -3562,9 +3428,9 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "fcac566e671100a4d4c4a2fb55ceb6c3d3554b9d4fb30b70ddacde3c96ac7986" dependencies = [ "new_debug_unreachable", "once_cell", @@ -3592,27 +3458,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "subtle" version = "2.4.1" @@ -3709,7 +3554,7 @@ dependencies = [ "serde", "unicode-segmentation", "uuid 1.3.0", - "windows 0.39.0", + "windows", "windows-implement", "x11-dl", ] @@ -3732,7 +3577,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" dependencies = [ "anyhow", - "attohttpc", "cocoa", "dirs-next", "embed_plist", @@ -3745,23 +3589,16 @@ dependencies = [ "heck 0.4.1", "http", "ignore", - "notify-rust", "objc", "once_cell", - "open", - "os_info", - "os_pipe", "percent-encoding", "rand 0.8.5", "raw-window-handle", - "regex", - "rfd", "semver 1.0.16", "serde", "serde_json", "serde_repr", "serialize-to-javascript", - "shared_child", "state", "tar", "tauri-macros", @@ -3775,7 +3612,7 @@ dependencies = [ "uuid 1.3.0", "webkit2gtk", "webview2-com", - "windows 0.39.0", + "windows", ] [[package]] @@ -3808,7 +3645,6 @@ dependencies = [ "png", "proc-macro2", "quote", - "regex", "semver 1.0.16", "serde", "serde_json", @@ -3851,7 +3687,7 @@ dependencies = [ "thiserror", "uuid 1.3.0", "webview2-com", - "windows 0.39.0", + "windows", ] [[package]] @@ -3870,7 +3706,7 @@ dependencies = [ "uuid 1.3.0", "webkit2gtk", "webview2-com", - "windows 0.39.0", + "windows", "wry", ] @@ -3899,18 +3735,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.39.0", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" -dependencies = [ - "quick-xml 0.23.1", - "strum", - "windows 0.39.0", + "windows", ] [[package]] @@ -3985,9 +3810,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" dependencies = [ "itoa 1.0.5", "serde", @@ -4003,9 +3828,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" dependencies = [ "time-core", ] @@ -4067,9 +3892,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -4563,7 +4388,7 @@ checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows 0.39.0", + "windows", "windows-implement", ] @@ -4588,7 +4413,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "windows 0.39.0", + "windows", "windows-bindgen", "windows-metadata", ] @@ -4635,19 +4460,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - [[package]] name = "windows" version = "0.39.0" @@ -4739,12 +4551,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - [[package]] name = "windows_aarch64_msvc" version = "0.39.0" @@ -4757,12 +4563,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - [[package]] name = "windows_i686_gnu" version = "0.39.0" @@ -4775,12 +4575,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - [[package]] name = "windows_i686_msvc" version = "0.39.0" @@ -4793,12 +4587,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - [[package]] name = "windows_x86_64_gnu" version = "0.39.0" @@ -4817,12 +4605,6 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - [[package]] name = "windows_x86_64_msvc" version = "0.39.0" @@ -4887,7 +4669,7 @@ dependencies = [ "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows 0.39.0", + "windows", "windows-implement", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1f5eadd..93fcfe7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "better-ilias" -version = "1.0.1" +version = "1.0.2" description = "A program to navigate Ilias and sync files to the local filesystem" authors = ["Sebastian Klähn"] repository = "https://github.com/Septias/better-ilias" @@ -25,7 +25,7 @@ winres = "0.1" [dependencies] serde_json = "1.0" -tauri = { version = "1.2", features = ["api-all", "default"] } +tauri = { version = "1.2", features = [] } itertools = "0.10" lazy_static = "1.4" open = "3.0" @@ -37,7 +37,7 @@ urlencoding = "2.1" anyhow = "1.0" thiserror = "1.0" futures = "0.3" -headless_chrome = {git="https://github.com/Billy-Sheppard/rust-headless-chrome.git", features = ["fetch"] } +headless_chrome = {git="https://github.com/rust-headless-chrome/rust-headless-chrome.git", features = ["fetch"] } failure = "*" [dependencies.hyper] diff --git a/src-tauri/src/ilias.rs b/src-tauri/src/ilias.rs index 00c4877..66797bc 100644 --- a/src-tauri/src/ilias.rs +++ b/src-tauri/src/ilias.rs @@ -10,12 +10,11 @@ use std::{ path::PathBuf, sync::{Arc, Mutex}, }; -use tauri::api::file::read_string; +use tauri::api::{file::read_string, path::home_dir}; pub const ILIAS_ROOT: &str = "ilias.php?cmdClass=ilmembershipoverviewgui&cmdNode=kt&baseClass=ilmembershipoverviewgui"; -pub const ROOT_PATH: &str = "studium/"; type WrappedNode = Arc>; #[derive(Debug, Deserialize, Serialize, Clone)] @@ -100,6 +99,13 @@ fn saves_path() -> Option { }) } +pub(crate) fn root_path() -> Option { + home_dir().map(|mut path| { + path.push("better-ilias"); + path +}) +} + impl IliasTree { pub async fn new() -> Self { Self { diff --git a/src-tauri/src/tree.rs b/src-tauri/src/tree.rs index 69d3edf..2da55bd 100644 --- a/src-tauri/src/tree.rs +++ b/src-tauri/src/tree.rs @@ -13,7 +13,7 @@ use tokio::task::JoinHandle; use crate::{ client::{ClientError, IliasClient}, - ilias::{IlNode, IlNodeType, ILIAS_ROOT, ROOT_PATH}, + ilias::{root_path, IlNode, IlNodeType, ILIAS_ROOT}, }; lazy_static! { @@ -85,12 +85,12 @@ impl<'a> HypNode<'a> { let mut chars = title.chars(); let start = chars.next().unwrap(); - let rest = chars - .filter_map(|character| match character { - '/' | '\\' | ':' | '*' | '?' | '"' | '<' | '>' | '|' => None, - ' ' => Some('_'), - c => Some(c), - }); + let rest = chars.filter_map(|character| match character { + 'a'..='z' => Some(character), + 'A'..='Z' => Some(character), + ' ' => Some('_'), + _ => None, + }); path.push(std::iter::once(start).chain(rest).collect::()); let breed = match self.icon_name() { @@ -259,12 +259,14 @@ pub fn update_root( breed: IlNodeType::Folder { store_files: true, // This is done sooo fishy xD - path: Some(PathBuf::from(ROOT_PATH)) - .map(|mut path| { - path.push(folder); - path - }) - .unwrap(), + path: Some(PathBuf::from( + root_path().expect("should be able to get path"), + )) + .map(|mut path| { + path.push(folder); + path + }) + .unwrap(), }, title, visible: true, diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ded1aa5..fef070f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "better-ilias", - "version": "1.0.0" + "version": "1.0.2" }, "build": { "distDir": "../dist", @@ -23,9 +23,9 @@ ], "resources": [], "externalBin": [], - "copyright": "", + "copyright": "Sebastian Klähn ", "category": "Utility", - "shortDescription": "", + "shortDescription": "Better interaction with ILIAS", "longDescription": "", "deb": { "depends": [] @@ -47,27 +47,14 @@ "updater": { "active": false }, - "allowlist": { - "all": true, - "protocol": { - "assetScope": [ - "$HOME/**" - ], - "all": true, - "asset": true - } - }, "windows": [ { - "title": "Manage Wallpapers", + "title": "BetterIlias", "width": 800, "height": 600, "resizable": true, "fullscreen": false } - ], - "security": { - "csp": "default-src 'self'; img-src * asset: https://asset.localhost; font-src *" - } + ] } } diff --git a/src/components/Leaf.vue b/src/components/Leaf.vue index 7372ac0..6c644c0 100644 --- a/src/components/Leaf.vue +++ b/src/components/Leaf.vue @@ -33,7 +33,7 @@ function handle_click() {