github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-05 19:15:33 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Upgrade AW UI and server

Browse Source
This commit is contained in:
Demmie 2024-06-11 03:13:17 -04:00
parent cfb3ad858d
commit a76f6e3e5b
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
8 changed files with 145 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
with: with:
repository: ActivityWatch/aw-webui repository: ActivityWatch/aw-webui
path: aw-webui path: aw-webui
ref: 839366e66f859faadd7f9128de3bea14b25ce4ae ref: 2f3d1e8390c3d5314a69bfd1a8d388d90b74280f
submodules: true submodules: true
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3

385
Cargo.lock generated
View File

@ -169,8 +169,8 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -284,8 +284,8 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -324,8 +324,8 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -341,8 +341,8 @@ version = "0.1.80"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -401,7 +401,7 @@ dependencies = [
[[package]] [[package]]
name = "aw-client-rust" name = "aw-client-rust"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"aw-models", "aw-models",
"chrono", "chrono",
@ -415,7 +415,7 @@ dependencies = [
[[package]] [[package]]
name = "aw-datastore" name = "aw-datastore"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"appdirs", "appdirs",
"aw-models", "aw-models",
@ -431,7 +431,7 @@ dependencies = [
[[package]] [[package]]
name = "aw-models" name = "aw-models"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"chrono", "chrono",
"log", "log",
@ -443,7 +443,7 @@ dependencies = [
[[package]] [[package]]
name = "aw-query" name = "aw-query"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"aw-datastore", "aw-datastore",
"aw-models", "aw-models",
@ -458,8 +458,8 @@ dependencies = [
[[package]] [[package]]
name = "aw-server" name = "aw-server"
version = "0.12.1" version = "0.13.1"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"android_logger", "android_logger",
"appdirs", "appdirs",
@ -477,29 +477,28 @@ dependencies = [
"libc", "libc",
"log", "log",
"log-panics", "log-panics",
"multipart",
"openssl-sys", "openssl-sys",
"rocket", "rocket",
"rocket_cors", "rocket_cors",
"rust-embed", "rust-embed",
"serde", "serde",
"serde_json", "serde_json",
"toml 0.7.8", "toml 0.8.13",
"uuid", "uuid",
] ]
[[package]] [[package]]
name = "aw-transform" name = "aw-transform"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=448312d#448312d410980d4a92a0fb4d4bb3fa3494cf6c89" source = "git+https://github.com/2e3s/aw-server-rust?rev=83958b7#83958b741b1bf471bf572aab31ee5bea5ed2228b"
dependencies = [ dependencies = [
"aw-models", "aw-models",
"chrono", "chrono",
"fancy-regex", "fancy-regex",
"log", "log",
"rocket",
"serde", "serde",
"serde_json", "serde_json",
"url",
] ]
[[package]] [[package]]
@ -551,30 +550,15 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
[[package]]
name = "bit-set"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c"
dependencies = [
"bit-vec 0.4.4",
]
[[package]] [[package]]
name = "bit-set" name = "bit-set"
version = "0.5.3" version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
dependencies = [ dependencies = [
"bit-vec 0.6.3", "bit-vec",
] ]
[[package]]
name = "bit-vec"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
[[package]] [[package]]
name = "bit-vec" name = "bit-vec"
version = "0.6.3" version = "0.6.3"
@ -628,16 +612,6 @@ dependencies = [
"piper", "piper",
] ]
[[package]]
name = "buf_redux"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
dependencies = [
"memchr",
"safemem",
]
[[package]] [[package]]
name = "built" name = "built"
version = "0.7.2" version = "0.7.2"
@ -745,7 +719,7 @@ dependencies = [
"strsim 0.8.0", "strsim 0.8.0",
"textwrap", "textwrap",
"unicode-width", "unicode-width",
"vec_map 0.8.2", "vec_map",
] ]
[[package]] [[package]]
@ -777,8 +751,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -832,9 +806,9 @@ dependencies = [
[[package]] [[package]]
name = "cookie" name = "cookie"
version = "0.17.0" version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
dependencies = [ dependencies = [
"percent-encoding", "percent-encoding",
"time", "time",
@ -963,8 +937,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"strsim 0.10.0", "strsim 0.10.0",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -976,7 +950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -1034,7 +1008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6"
dependencies = [ dependencies = [
"devise_core", "devise_core",
"quote 1.0.36", "quote",
] ]
[[package]] [[package]]
@ -1044,9 +1018,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a"
dependencies = [ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"proc-macro2 1.0.82", "proc-macro2",
"proc-macro2-diagnostics", "proc-macro2-diagnostics",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -1159,8 +1133,8 @@ version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -1250,9 +1224,9 @@ dependencies = [
[[package]] [[package]]
name = "fallible-iterator" name = "fallible-iterator"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
[[package]] [[package]]
name = "fallible-streaming-iterator" name = "fallible-streaming-iterator"
@ -1262,11 +1236,11 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]] [[package]]
name = "fancy-regex" name = "fancy-regex"
version = "0.11.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05"
dependencies = [ dependencies = [
"bit-set 0.5.3", "bit-set",
"regex", "regex",
] ]
@ -1427,8 +1401,8 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -1771,7 +1745,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"hashbrown 0.12.3", "hashbrown 0.12.3",
"serde",
] ]
[[package]] [[package]]
@ -1782,6 +1755,7 @@ checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.14.1", "hashbrown 0.14.1",
"serde",
] ]
[[package]] [[package]]
@ -1796,8 +1770,8 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -1990,9 +1964,9 @@ dependencies = [
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
version = "0.25.2" version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
dependencies = [ dependencies = [
"cc", "cc",
"pkg-config", "pkg-config",
@ -2110,16 +2084,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime",
"unicase",
]
[[package]] [[package]]
name = "minimal-lexical" name = "minimal-lexical"
version = "0.2.1" version = "0.2.1"
@ -2176,24 +2140,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "multipart"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182"
dependencies = [
"buf_redux",
"httparse",
"log",
"mime",
"mime_guess",
"quick-error 1.2.3",
"rand",
"safemem",
"tempfile",
"twoway",
]
[[package]] [[package]]
name = "native-tls" name = "native-tls"
version = "0.2.11" version = "0.2.11"
@ -2286,8 +2232,8 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -2389,8 +2335,8 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -2493,7 +2439,7 @@ checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c"
dependencies = [ dependencies = [
"inlinable_string", "inlinable_string",
"pear_codegen", "pear_codegen",
"yansi 1.0.0-rc.1", "yansi",
] ]
[[package]] [[package]]
@ -2502,9 +2448,9 @@ version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"proc-macro2-diagnostics", "proc-macro2-diagnostics",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -2545,15 +2491,15 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]] [[package]]
name = "plex" name = "plex"
version = "0.2.5" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa14234571e92edfd3ac883defc6fcf310ae395cccdb10d2319d3e2e60083fc" checksum = "7d8fc09f81816d9530a29fc1a879c7b4a6b94c3a50bb9d5626a58ae15ca34360"
dependencies = [ dependencies = [
"lalr", "lalr",
"proc-macro2 0.4.30", "proc-macro2",
"quote 0.6.13", "quote",
"redfa", "redfa",
"syn 0.15.44", "syn 2.0.64",
] ]
[[package]] [[package]]
@ -2599,15 +2545,6 @@ dependencies = [
"toml_edit 0.21.0", "toml_edit 0.21.0",
] ]
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.82" version = "1.0.82"
@ -2623,11 +2560,11 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
"version_check", "version_check",
"yansi 1.0.0-rc.1", "yansi",
] ]
[[package]] [[package]]
@ -2645,7 +2582,7 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
dependencies = [ dependencies = [
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -2658,12 +2595,6 @@ dependencies = [
"bytemuck", "bytemuck",
] ]
[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]] [[package]]
name = "quick-error" name = "quick-error"
version = "2.0.1" version = "2.0.1"
@ -2679,22 +2610,13 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.36" version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
] ]
[[package]] [[package]]
@ -2771,7 +2693,7 @@ dependencies = [
"avif-serialize", "avif-serialize",
"imgref", "imgref",
"loop9", "loop9",
"quick-error 2.0.1", "quick-error",
"rav1e", "rav1e",
"rayon", "rayon",
"rgb", "rgb",
@ -2799,12 +2721,11 @@ dependencies = [
[[package]] [[package]]
name = "redfa" name = "redfa"
version = "0.0.2" version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29cc2771cc9f5fb0061cdedc05a37170254694dffec6b89920a6e767f08c4220" checksum = "ba41b4ee12e29433820b330c8ac41d2f01390be8a8ef8ac59ed2b8edeaa7857e"
dependencies = [ dependencies = [
"bit-set 0.4.0", "bit-set",
"vec_map 0.6.0",
] ]
[[package]] [[package]]
@ -2851,8 +2772,8 @@ version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -2954,9 +2875,9 @@ dependencies = [
[[package]] [[package]]
name = "rocket" name = "rocket"
version = "0.5.0-rc.3" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" checksum = "9e7bb57ccb26670d73b6a47396c83139447b9e7878cab627fdfe9ea8da489150"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
@ -2966,8 +2887,7 @@ dependencies = [
"either", "either",
"figment", "figment",
"futures", "futures",
"indexmap 1.9.3", "indexmap 2.0.2",
"is-terminal",
"log", "log",
"memchr", "memchr",
"multer", "multer",
@ -2988,30 +2908,31 @@ dependencies = [
"tokio-util", "tokio-util",
"ubyte", "ubyte",
"version_check", "version_check",
"yansi 0.5.1", "yansi",
] ]
[[package]] [[package]]
name = "rocket_codegen" name = "rocket_codegen"
version = "0.5.0-rc.3" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" checksum = "a2238066abf75f21be6cd7dc1a09d5414a671f4246e384e49fe3f8a4936bd04c"
dependencies = [ dependencies = [
"devise", "devise",
"glob", "glob",
"indexmap 1.9.3", "indexmap 2.0.2",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"rocket_http", "rocket_http",
"syn 2.0.64", "syn 2.0.64",
"unicode-xid 0.2.4", "unicode-xid",
"version_check",
] ]
[[package]] [[package]]
name = "rocket_cors" name = "rocket_cors"
version = "0.6.0-alpha2" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b12771b47f52e34d5d0e0e444aeba382863e73263cb9e18847e7d5b74aa2cbd0" checksum = "cfac3a1df83f8d4fc96aa41dba3b86c786417b7fc0f52ec76295df2ba781aa69"
dependencies = [ dependencies = [
"http", "http",
"log", "log",
@ -3026,16 +2947,16 @@ dependencies = [
[[package]] [[package]]
name = "rocket_http" name = "rocket_http"
version = "0.5.0-rc.3" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" checksum = "37a1663694d059fe5f943ea5481363e48050acedd241d46deb2e27f71110389e"
dependencies = [ dependencies = [
"cookie", "cookie",
"either", "either",
"futures", "futures",
"http", "http",
"hyper", "hyper",
"indexmap 1.9.3", "indexmap 2.0.2",
"log", "log",
"memchr", "memchr",
"pear", "pear",
@ -3053,9 +2974,9 @@ dependencies = [
[[package]] [[package]]
name = "rstest" name = "rstest"
version = "0.19.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682"
dependencies = [ dependencies = [
"futures", "futures",
"futures-timer", "futures-timer",
@ -3065,14 +2986,15 @@ dependencies = [
[[package]] [[package]]
name = "rstest_macros" name = "rstest_macros"
version = "0.19.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"glob", "glob",
"proc-macro2 1.0.82", "proc-macro-crate",
"quote 1.0.36", "proc-macro2",
"quote",
"regex", "regex",
"relative-path", "relative-path",
"rustc_version", "rustc_version",
@ -3082,11 +3004,11 @@ dependencies = [
[[package]] [[package]]
name = "rusqlite" name = "rusqlite"
version = "0.28.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.4.0",
"chrono", "chrono",
"fallible-iterator", "fallible-iterator",
"fallible-streaming-iterator", "fallible-streaming-iterator",
@ -3113,8 +3035,8 @@ version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"rust-embed-utils", "rust-embed-utils",
"shellexpand", "shellexpand",
"syn 2.0.64", "syn 2.0.64",
@ -3171,12 +3093,6 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "safemem"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "1.0.6" version = "1.0.6"
@ -3214,8 +3130,8 @@ version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"serde_derive_internals", "serde_derive_internals",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -3277,8 +3193,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fd4c77b86d9fb10363e52607ca6dc3043d8dfde6c790b702ed4ffafb34e7b99" checksum = "9fd4c77b86d9fb10363e52607ca6dc3043d8dfde6c790b702ed4ffafb34e7b99"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -3288,8 +3204,8 @@ version = "1.0.202"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -3299,8 +3215,8 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -3321,8 +3237,8 @@ version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -3418,7 +3334,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
dependencies = [ dependencies = [
"quote 1.0.36", "quote",
] ]
[[package]] [[package]]
@ -3476,9 +3392,9 @@ dependencies = [
[[package]] [[package]]
name = "state" name = "state"
version = "0.5.3" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
dependencies = [ dependencies = [
"loom", "loom",
] ]
@ -3507,25 +3423,14 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
]
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.109" version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"unicode-ident", "unicode-ident",
] ]
@ -3535,8 +3440,8 @@ version = "2.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"unicode-ident", "unicode-ident",
] ]
@ -3595,8 +3500,8 @@ version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -3688,8 +3593,8 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -3821,8 +3726,8 @@ version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
] ]
@ -3871,15 +3776,6 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "twoway"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.17.0" version = "1.17.0"
@ -3962,12 +3858,6 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]] [[package]]
name = "unicode-xid" name = "unicode-xid"
version = "0.2.4" version = "0.2.4"
@ -4024,12 +3914,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vec_map"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cac5efe5cb0fa14ec2f84f83c701c562ee63f6dcc680861b21d65c682adfb05f"
[[package]] [[package]]
name = "vec_map" name = "vec_map"
version = "0.8.2" version = "0.8.2"
@ -4098,8 +3982,8 @@ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
"once_cell", "once_cell",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -4122,7 +4006,7 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [ dependencies = [
"quote 1.0.36", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
] ]
@ -4132,8 +4016,8 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 2.0.64", "syn 2.0.64",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
@ -4242,9 +4126,9 @@ version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quick-xml", "quick-xml",
"quote 1.0.36", "quote",
] ]
[[package]] [[package]]
@ -4526,17 +4410,14 @@ version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
[[package]]
name = "yansi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]] [[package]]
name = "yansi" name = "yansi"
version = "1.0.0-rc.1" version = "1.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
dependencies = [
"is-terminal",
]
[[package]] [[package]]
name = "zbus" name = "zbus"
@ -4583,8 +4464,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
"zvariant_utils", "zvariant_utils",
] ]
@ -4644,8 +4525,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
"zvariant_utils", "zvariant_utils",
] ]
@ -4656,7 +4537,7 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a"
dependencies = [ dependencies = [
"proc-macro2 1.0.82", "proc-macro2",
"quote 1.0.36", "quote",
"syn 1.0.109", "syn 1.0.109",
] ]

6
Cargo.toml
View File

@ -27,7 +27,7 @@ tokio = { version = "1.37.0" }
serde = "1.0.202" serde = "1.0.202"
[dev-dependencies] [dev-dependencies]
rstest = "0.19.0" rstest = "0.21.0"
tempfile = "3.10.1" tempfile = "3.10.1"
[dependencies] [dependencies]
@ -41,8 +41,8 @@ anyhow = { workspace = true }
tokio = { workspace = true, features = ["rt", "macros", "signal"] } tokio = { workspace = true, features = ["rt", "macros", "signal"] }
ksni = {version = "0.2.2", optional = true} ksni = {version = "0.2.2", optional = true}
aw-server = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "448312d" } aw-server = { git = "https://github.com/2e3s/aw-server-rust", optional = true, rev = "83958b7" }
aw-datastore = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "448312d" } aw-datastore = { git = "https://github.com/2e3s/aw-server-rust", optional = true, rev = "83958b7" }
open = { version = "5.1.3", optional = true } open = { version = "5.1.3", optional = true }
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }

2
src/bundle.rs
View File

@ -8,7 +8,7 @@ use tokio::sync::mpsc::UnboundedSender;
pub async fn run( pub async fn run(
host: String, host: String,
port: u32, port: u16,
config_file: PathBuf, config_file: PathBuf,
no_tray: bool, no_tray: bool,
shutdown_sender: UnboundedSender<()>, shutdown_sender: UnboundedSender<()>,

4
src/bundle/menu.rs
View File

@ -7,7 +7,7 @@ use super::modules::Manager;
pub struct Tray { pub struct Tray {
server_host: String, server_host: String,
server_port: u32, server_port: u16,
config_file: PathBuf, config_file: PathBuf,
shutdown_sender: UnboundedSender<()>, shutdown_sender: UnboundedSender<()>,
watchers_manager: Manager, watchers_manager: Manager,
@ -17,7 +17,7 @@ pub struct Tray {
impl Tray { impl Tray {
pub fn new( pub fn new(
server_host: String, server_host: String,
server_port: u32, server_port: u16,
config_file: PathBuf, config_file: PathBuf,
shutdown_sender: UnboundedSender<()>, shutdown_sender: UnboundedSender<()>,
watchers_manager: Manager, watchers_manager: Manager,

4
src/bundle/server.rs
View File

@ -2,7 +2,7 @@ use anyhow::anyhow;
use aw_server::endpoints::{build_rocket, AssetResolver, ServerState}; use aw_server::endpoints::{build_rocket, AssetResolver, ServerState};
use std::sync::Mutex; use std::sync::Mutex;
pub async fn run(port: u32) { pub async fn run(port: u16) {
let db_path = aw_server::dirs::db_path(false) let db_path = aw_server::dirs::db_path(false)
.map_err(|()| anyhow!("DB path is not found")) .map_err(|()| anyhow!("DB path is not found"))
.unwrap() .unwrap()
@ -12,7 +12,7 @@ pub async fn run(port: u32) {
let device_id = aw_server::device_id::get_device_id(); let device_id = aw_server::device_id::get_device_id();
let mut config = aw_server::config::create_config(false); let mut config = aw_server::config::create_config(false);
config.address = "127.0.0.1".to_string(); config.address = "127.0.0.1".to_string();
config.port = u16::try_from(port).unwrap(); config.port = port;
let legacy_import = false; let legacy_import = false;
let server_state = ServerState { let server_state = ServerState {

4
watchers/Cargo.toml
View File

@ -10,11 +10,11 @@ crate-type = ["lib"]
path = "src/lib.rs" path = "src/lib.rs"
[dev-dependencies] [dev-dependencies]
rstest = "0.19.0" rstest = "0.21.0"
tempfile = "3.10.1" tempfile = "3.10.1"
[dependencies] [dependencies]
aw-client-rust = { git = "https://github.com/ActivityWatch/aw-server-rust", rev = "9275009" } aw-client-rust = { git = "https://github.com/2e3s/aw-server-rust", rev = "83958b7" }
wayland-client = "0.31.1" wayland-client = "0.31.1"
wayland-protocols = { version = "0.31.2", features = ["staging", "client" ]} wayland-protocols = { version = "0.31.2", features = ["staging", "client" ]}
wayland-protocols-plasma = { version = "0.2.0", features = ["client"] } wayland-protocols-plasma = { version = "0.2.0", features = ["client"] }

2
watchers/src/report_client.rs
View File

@ -3,8 +3,8 @@ use anyhow::Context;
use aw_client_rust::{AwClient, Event as AwEvent}; use aw_client_rust::{AwClient, Event as AwEvent};
use chrono::{DateTime, Duration, Utc}; use chrono::{DateTime, Duration, Utc};
use serde_json::{Map, Value}; use serde_json::{Map, Value};
use std::future::Future;
use std::error::Error; use std::error::Error;
use std::future::Future;
pub struct ReportClient { pub struct ReportClient {
pub client: AwClient, pub client: AwClient,