burrito.space / diffuse
forked from tokono.ma/diffuse
A music player that connects to your cloud/distributed storage.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Update tauri

Steven Vandevelde 14d78835 a6e978d6

+141 -103
+110 -75
src-tauri/Cargo.lock
··· 64 64 65 65 [[package]] 66 66 name = "ashpd" 67 - version = "0.2.2" 67 + version = "0.2.6" 68 68 source = "registry+https://github.com/rust-lang/crates.io-index" 69 - checksum = "7915e26e0786f91768d23de32afafa4ee5e2ea76be21c0ecd8e14441543c1655" 69 + checksum = "5eea0a7a98b3bd2832eb087e1078f6f58db5a54447574d3007cdac6309c1e9f1" 70 70 dependencies = [ 71 71 "enumflags2", 72 72 "futures", ··· 133 133 134 134 [[package]] 135 135 name = "async-lock" 136 - version = "2.4.0" 136 + version = "2.5.0" 137 137 source = "registry+https://github.com/rust-lang/crates.io-index" 138 - checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" 138 + checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" 139 139 dependencies = [ 140 140 "event-listener", 141 141 ] ··· 153 153 154 154 [[package]] 155 155 name = "async-task" 156 - version = "4.1.0" 156 + version = "4.2.0" 157 157 source = "registry+https://github.com/rust-lang/crates.io-index" 158 - checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8" 158 + checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" 159 159 160 160 [[package]] 161 161 name = "async-trait" ··· 306 306 checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" 307 307 308 308 [[package]] 309 - name = "bzip2" 310 - version = "0.4.3" 311 - source = "registry+https://github.com/rust-lang/crates.io-index" 312 - checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" 313 - dependencies = [ 314 - "bzip2-sys", 315 - "libc", 316 - ] 317 - 318 - [[package]] 319 - name = "bzip2-sys" 320 - version = "0.1.11+1.0.8" 321 - source = "registry+https://github.com/rust-lang/crates.io-index" 322 - checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" 323 - dependencies = [ 324 - "cc", 325 - "libc", 326 - "pkg-config", 327 - ] 328 - 329 - [[package]] 330 309 name = "cache-padded" 331 310 version = "1.2.0" 332 311 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 775 754 "tauri", 776 755 "tauri-build", 777 756 "tauri-plugin-localhost", 757 + "tauri-plugin-window-state", 758 + "window-shadows", 759 + "window-vibrancy", 778 760 ] 779 761 780 762 [[package]] ··· 2035 2017 2036 2018 [[package]] 2037 2019 name = "os_pipe" 2038 - version = "1.0.0" 2020 + version = "1.0.1" 2039 2021 source = "registry+https://github.com/rust-lang/crates.io-index" 2040 - checksum = "0e3492ebca331b895fe23ed427dce2013d9b2e00c45964f12040b0db38b8ab27" 2022 + checksum = "2c92f2b54f081d635c77e7120862d48db8e91f7f21cef23ab1b4fe9971c59f55" 2041 2023 dependencies = [ 2042 2024 "libc", 2043 2025 "winapi", ··· 3022 3004 ] 3023 3005 3024 3006 [[package]] 3025 - name = "sys-info" 3026 - version = "0.9.1" 3027 - source = "registry+https://github.com/rust-lang/crates.io-index" 3028 - checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" 3029 - dependencies = [ 3030 - "cc", 3031 - "libc", 3032 - ] 3033 - 3034 - [[package]] 3035 3007 name = "system-deps" 3036 3008 version = "3.2.0" 3037 3009 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3141 3113 3142 3114 [[package]] 3143 3115 name = "tauri" 3144 - version = "1.0.0-rc.3" 3116 + version = "1.0.0-rc.4" 3145 3117 source = "registry+https://github.com/rust-lang/crates.io-index" 3146 - checksum = "bb0c4a4ffd1f9b02cc3e974ce902f8132fb3d08ec6cce4ca193f97d921f5bce4" 3118 + checksum = "1112a78b3de89c41e01b671d62f24038d324c6cb61708896ee16f533b655c82e" 3147 3119 dependencies = [ 3148 3120 "anyhow", 3149 3121 "attohttpc", ··· 3160 3132 "gtk", 3161 3133 "http", 3162 3134 "ignore", 3135 + "memchr", 3163 3136 "notify-rust", 3164 3137 "once_cell", 3165 3138 "open", ··· 3187 3160 "tokio", 3188 3161 "url", 3189 3162 "uuid", 3190 - "zip", 3163 + "windows 0.30.0", 3191 3164 ] 3192 3165 3193 3166 [[package]] 3194 3167 name = "tauri-build" 3195 - version = "1.0.0-rc.3" 3168 + version = "1.0.0-rc.4" 3196 3169 source = "registry+https://github.com/rust-lang/crates.io-index" 3197 - checksum = "855e47d8cfb2219fc14d2eed2c09bfb35f9ecd71a40ca2084aeeee2d23e0b60d" 3170 + checksum = "d7e31905edc1b40f369beccbbfb30b2e44c2f2bb1ffc06a3778d844af4a81da8" 3198 3171 dependencies = [ 3199 3172 "anyhow", 3200 3173 "cargo_toml", ··· 3205 3178 3206 3179 [[package]] 3207 3180 name = "tauri-codegen" 3208 - version = "1.0.0-rc.2" 3181 + version = "1.0.0-rc.3" 3209 3182 source = "registry+https://github.com/rust-lang/crates.io-index" 3210 - checksum = "eef4656d174ba982198266da0c016573fe6c7c760e4290f05c8c384fe180007e" 3183 + checksum = "fbcba93e945eb73ee232621763a1295247d0155867bb72e815ab107a10a7cf97" 3211 3184 dependencies = [ 3212 3185 "base64", 3213 3186 "blake3", 3187 + "ico", 3188 + "png 0.16.8", 3214 3189 "proc-macro2", 3215 3190 "quote", 3216 3191 "regex", ··· 3226 3201 3227 3202 [[package]] 3228 3203 name = "tauri-macros" 3229 - version = "1.0.0-rc.2" 3204 + version = "1.0.0-rc.3" 3230 3205 source = "registry+https://github.com/rust-lang/crates.io-index" 3231 - checksum = "a0993f5a867e321d26200b2d6394cdf482bd6cc5a0e4691bcabf811544f51cd4" 3206 + checksum = "ed251657dcdd21922e0146af5f8a3b9ccf92707d4a42add615c250ff92a6838d" 3232 3207 dependencies = [ 3233 3208 "heck 0.4.0", 3234 3209 "proc-macro2", ··· 3246 3221 "serde_json", 3247 3222 "tauri", 3248 3223 "tiny_http", 3224 + ] 3225 + 3226 + [[package]] 3227 + name = "tauri-plugin-window-state" 3228 + version = "0.1.0" 3229 + source = "git+https://github.com/tauri-apps/tauri-plugin-window-state?branch=renovate/tauri-1.x#e71ed6a42081cee86c4a762dec37905f0c1887ab" 3230 + dependencies = [ 3231 + "bincode", 3232 + "serde", 3233 + "serde_json", 3234 + "tauri", 3249 3235 ] 3250 3236 3251 3237 [[package]] 3252 3238 name = "tauri-runtime" 3253 - version = "0.3.2" 3239 + version = "0.3.3" 3254 3240 source = "registry+https://github.com/rust-lang/crates.io-index" 3255 - checksum = "851cd65e2c9df4dd70a4f9e115fb2441ac89f1c80df79de0c15a448b4acd7768" 3241 + checksum = "ae0442d935c2d168541d74be51c4d4f176b1c00ee6bf052f07c1aa5f688ba497" 3256 3242 dependencies = [ 3257 3243 "gtk", 3258 3244 "http", ··· 3269 3255 3270 3256 [[package]] 3271 3257 name = "tauri-runtime-wry" 3272 - version = "0.3.2" 3258 + version = "0.3.3" 3273 3259 source = "registry+https://github.com/rust-lang/crates.io-index" 3274 - checksum = "0184f95e065fb80afadf53f0a5f87a75af2da774d0524fe8cb2976fbec4a0bf2" 3260 + checksum = "643aaa56237304264804dbf34748b21042eadda71d2e964bced1651c19cc0314" 3275 3261 dependencies = [ 3276 3262 "gtk", 3277 - "ico", 3278 - "infer", 3279 - "png 0.16.8", 3280 3263 "tauri-runtime", 3281 3264 "tauri-utils", 3282 3265 "uuid", ··· 3287 3270 3288 3271 [[package]] 3289 3272 name = "tauri-utils" 3290 - version = "1.0.0-rc.2" 3273 + version = "1.0.0-rc.3" 3291 3274 source = "registry+https://github.com/rust-lang/crates.io-index" 3292 - checksum = "0ad38ad698838886bf22ecb91c4b3d1ce178fdff7901ac7bff370103a4f51e59" 3275 + checksum = "21f11483d205c77d1ec398e80566485101696335983e69832cc6c41ab1e07266" 3293 3276 dependencies = [ 3294 3277 "ctor", 3295 3278 "glob", ··· 3832 3815 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 3833 3816 3834 3817 [[package]] 3818 + name = "window-shadows" 3819 + version = "0.1.0" 3820 + source = "registry+https://github.com/rust-lang/crates.io-index" 3821 + checksum = "b8d1ab438f940af891939941a6618ea0c9f0ce776041bdfe0099a0fd8dfaeb49" 3822 + dependencies = [ 3823 + "cocoa", 3824 + "objc", 3825 + "raw-window-handle", 3826 + "windows-sys", 3827 + ] 3828 + 3829 + [[package]] 3830 + name = "window-vibrancy" 3831 + version = "0.1.0" 3832 + source = "registry+https://github.com/rust-lang/crates.io-index" 3833 + checksum = "554d8f050517a4e494ea769a531ad8774c4b0829d8b679b3453e52683c497208" 3834 + dependencies = [ 3835 + "cocoa", 3836 + "objc", 3837 + "raw-window-handle", 3838 + "windows-sys", 3839 + ] 3840 + 3841 + [[package]] 3835 3842 name = "windows" 3836 3843 version = "0.24.0" 3837 3844 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3849 3856 source = "registry+https://github.com/rust-lang/crates.io-index" 3850 3857 checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" 3851 3858 dependencies = [ 3852 - "windows_aarch64_msvc", 3859 + "windows_aarch64_msvc 0.30.0", 3853 3860 "windows_i686_gnu 0.30.0", 3854 3861 "windows_i686_msvc 0.30.0", 3855 3862 "windows_x86_64_gnu 0.30.0", ··· 3867 3874 ] 3868 3875 3869 3876 [[package]] 3877 + name = "windows-sys" 3878 + version = "0.33.0" 3879 + source = "registry+https://github.com/rust-lang/crates.io-index" 3880 + checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" 3881 + dependencies = [ 3882 + "windows_aarch64_msvc 0.33.0", 3883 + "windows_i686_gnu 0.33.0", 3884 + "windows_i686_msvc 0.33.0", 3885 + "windows_x86_64_gnu 0.33.0", 3886 + "windows_x86_64_msvc 0.33.0", 3887 + ] 3888 + 3889 + [[package]] 3870 3890 name = "windows_aarch64_msvc" 3871 3891 version = "0.30.0" 3872 3892 source = "registry+https://github.com/rust-lang/crates.io-index" 3873 3893 checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" 3874 3894 3875 3895 [[package]] 3896 + name = "windows_aarch64_msvc" 3897 + version = "0.33.0" 3898 + source = "registry+https://github.com/rust-lang/crates.io-index" 3899 + checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" 3900 + 3901 + [[package]] 3876 3902 name = "windows_gen" 3877 3903 version = "0.30.0" 3878 3904 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3895 3921 checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" 3896 3922 3897 3923 [[package]] 3924 + name = "windows_i686_gnu" 3925 + version = "0.33.0" 3926 + source = "registry+https://github.com/rust-lang/crates.io-index" 3927 + checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" 3928 + 3929 + [[package]] 3898 3930 name = "windows_i686_msvc" 3899 3931 version = "0.24.0" 3900 3932 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3907 3939 checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" 3908 3940 3909 3941 [[package]] 3942 + name = "windows_i686_msvc" 3943 + version = "0.33.0" 3944 + source = "registry+https://github.com/rust-lang/crates.io-index" 3945 + checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" 3946 + 3947 + [[package]] 3910 3948 name = "windows_macros" 3911 3949 version = "0.30.0" 3912 3950 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3943 3981 checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" 3944 3982 3945 3983 [[package]] 3984 + name = "windows_x86_64_gnu" 3985 + version = "0.33.0" 3986 + source = "registry+https://github.com/rust-lang/crates.io-index" 3987 + checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" 3988 + 3989 + [[package]] 3946 3990 name = "windows_x86_64_msvc" 3947 3991 version = "0.24.0" 3948 3992 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3955 3999 checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" 3956 4000 3957 4001 [[package]] 4002 + name = "windows_x86_64_msvc" 4003 + version = "0.33.0" 4004 + source = "registry+https://github.com/rust-lang/crates.io-index" 4005 + checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" 4006 + 4007 + [[package]] 3958 4008 name = "winres" 3959 4009 version = "0.1.12" 3960 4010 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3976 4026 3977 4027 [[package]] 3978 4028 name = "wry" 3979 - version = "0.13.2" 4029 + version = "0.13.3" 3980 4030 source = "registry+https://github.com/rust-lang/crates.io-index" 3981 - checksum = "620bfe8ed3cde9310f32a69ffc654dfd8dae4ac5a0e08d6fbf0205a996fc7f0f" 4031 + checksum = "9514586e5c964d30cc7123c9aea9880ff7b3cb1c43f6a1dc8703941eb72ac89f" 3982 4032 dependencies = [ 3983 4033 "cocoa", 3984 4034 "core-graphics", ··· 3994 4044 "once_cell", 3995 4045 "serde", 3996 4046 "serde_json", 3997 - "sys-info", 3998 4047 "tao", 3999 4048 "thiserror", 4000 4049 "url", ··· 4100 4149 "serde", 4101 4150 "static_assertions", 4102 4151 "zvariant", 4103 - ] 4104 - 4105 - [[package]] 4106 - name = "zip" 4107 - version = "0.5.13" 4108 - source = "registry+https://github.com/rust-lang/crates.io-index" 4109 - checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" 4110 - dependencies = [ 4111 - "byteorder", 4112 - "bzip2", 4113 - "crc32fast", 4114 - "flate2", 4115 - "thiserror", 4116 - "time", 4117 4152 ] 4118 4153 4119 4154 [[package]]
+10 -4
src-tauri/Cargo.toml
··· 12 12 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html 13 13 14 14 [build-dependencies] 15 - tauri-build = { version = "1.0.0-rc.3", features = [] } 15 + tauri-build = { version = "1.0.0-rc.4", features = [] } 16 16 17 17 [dependencies] 18 - serde_json = "1.0" 19 - serde = { version = "1.0", features = ["derive"] } 20 - tauri = { version = "1.0.0-rc.3", features = ["api-all"] } 18 + serde_json = "^1.0" 19 + serde = { version = "^1.0", features = ["derive"] } 20 + tauri = { version = "1.0.0-rc.4", features = ["api-all"] } 21 21 tauri-plugin-localhost = { git = "https://github.com/icidasset/tauri-plugin-localhost.git", branch = "dev" } 22 + window-shadows = { version = "^0.1.0" } 23 + window-vibrancy = { version = "^0.1.0" } 24 + 25 + [dependencies.tauri-plugin-window-state] 26 + git = "https://github.com/tauri-apps/tauri-plugin-window-state" 27 + branch = "renovate/tauri-1.x" 22 28 23 29 [features] 24 30 default = [ "custom-protocol" ]
+21 -24
src-tauri/src/main.rs
··· 3 3 windows_subsystem = "windows" 4 4 )] 5 5 6 - use tauri::{App, PhysicalPosition, PhysicalSize, Position, Size}; 7 - use tauri::{Menu, MenuItem, Submenu}; 8 - use tauri::{Window, WindowBuilder, WindowUrl}; 6 + use tauri::{PhysicalPosition, PhysicalSize, Position, Size}; 7 + use tauri::{Manager, Menu, MenuItem, Submenu}; 8 + use tauri::{WindowBuilder, WindowUrl}; 9 + 9 10 10 11 fn main() { 11 12 let port = 44999; 12 13 13 14 tauri::Builder::default() 14 15 .plugin(tauri_plugin_localhost::Localhost::new(port)) 16 + .plugin(tauri_plugin_window_state::WindowState::default()) 17 + .create_window( 18 + "main", 19 + WindowUrl::External(format!("http://localhost:{}", port).parse().unwrap()), 20 + |window_builder, webview_attributes| { 21 + let win = window_builder 22 + .title("Diffuse") 23 + .menu(menu()) 24 + .maximized(true) 25 + .resizable(true); 26 + 27 + return (win, webview_attributes); 28 + }, 29 + ) 30 + .unwrap() 15 31 .setup(move |app| { 16 - let w = create_window(app, port).unwrap(); 32 + let w = app.get_window("main").unwrap(); 17 33 18 34 // Scale window to a bit smaller than screen size 19 35 let monitor = w.current_monitor().unwrap().unwrap(); ··· 34 50 Ok(()) 35 51 }) 36 52 .run(tauri::generate_context!()) 37 - .expect("error while running tauri application"); 38 - } 39 - 40 - /** 41 - * Create a window that loads our localhost server. 42 - */ 43 - fn create_window(app: &mut App, port: u16) -> tauri::Result<Window> { 44 - app.create_window( 45 - "main", 46 - WindowUrl::External(format!("http://localhost:{}", port).parse().unwrap()), 47 - |window_builder, webview_attributes| { 48 - let w = window_builder 49 - .maximized(true) 50 - .menu(menu()) 51 - .resizable(true) 52 - .title("Diffuse"); 53 - 54 - (w, webview_attributes) 55 - }, 56 - ) 53 + .expect("Error while running tauri application"); 57 54 } 58 55 59 56 /**