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

Upgrade AW to 0.13.2

Browse Source
This commit is contained in:
Demmie 2024-11-07 10:22:56 -05:00
parent e2ee19f494
commit 5b8c90a69c
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
4 changed files with 89 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

114
Cargo.lock generated
View File

@ -149,9 +149,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.90" version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]] [[package]]
name = "appdirs" name = "appdirs"
@ -406,9 +406,9 @@ dependencies = [
[[package]] [[package]]
name = "avif-serialize" name = "avif-serialize"
version = "0.8.1" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
] ]
@ -416,7 +416,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=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"aw-models", "aw-models",
"chrono", "chrono",
@ -430,7 +430,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=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"appdirs", "appdirs",
"aw-models", "aw-models",
@ -446,7 +446,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=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"chrono", "chrono",
"log", "log",
@ -458,7 +458,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=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"aw-datastore", "aw-datastore",
"aw-models", "aw-models",
@ -474,7 +474,7 @@ dependencies = [
[[package]] [[package]]
name = "aw-server" name = "aw-server"
version = "0.13.1" version = "0.13.1"
source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"android_logger", "android_logger",
"appdirs", "appdirs",
@ -484,7 +484,7 @@ dependencies = [
"aw-transform", "aw-transform",
"chrono", "chrono",
"clap 4.5.20", "clap 4.5.20",
"fern", "fern 0.6.2",
"gethostname 0.4.3", "gethostname 0.4.3",
"jemallocator", "jemallocator",
"jni", "jni",
@ -496,6 +496,7 @@ dependencies = [
"rocket", "rocket",
"rocket_cors", "rocket_cors",
"rust-embed", "rust-embed",
"sd-notify",
"serde", "serde",
"serde_json", "serde_json",
"toml", "toml",
@ -505,7 +506,7 @@ dependencies = [
[[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=bb787fd#bb787fdaa39a8b9683814686791a048b9f682877" source = "git+https://github.com/ActivityWatch/aw-server-rust?rev=656f3c9#656f3c97b3b5fb9be96b9e3a60f52c9e5cfdaf67"
dependencies = [ dependencies = [
"aw-models", "aw-models",
"chrono", "chrono",
@ -518,14 +519,14 @@ dependencies = [
[[package]] [[package]]
name = "awatcher" name = "awatcher"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"aw-datastore", "aw-datastore",
"aw-server", "aw-server",
"chrono", "chrono",
"clap 4.5.20", "clap 4.5.20",
"fern", "fern 0.7.0",
"image", "image",
"ksni", "ksni",
"log", "log",
@ -794,6 +795,16 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "colored"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
dependencies = [
"lazy_static",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "combine" name = "combine"
version = "4.6.7" version = "4.6.7"
@ -1216,7 +1227,17 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
dependencies = [ dependencies = [
"colored", "colored 1.9.4",
"log",
]
[[package]]
name = "fern"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69ff9c9d5fb3e6da8ac2f77ab76fe7e8087d512ce095200f8f29ac5b656cf6dc"
dependencies = [
"colored 2.1.0",
"log", "log",
] ]
@ -1677,9 +1698,9 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.25.4" version = "0.25.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder-lite", "byteorder-lite",
@ -2022,6 +2043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"rayon",
] ]
[[package]] [[package]]
@ -2655,15 +2677,16 @@ dependencies = [
[[package]] [[package]]
name = "ravif" name = "ravif"
version = "0.11.10" version = "0.11.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" checksum = "2413fd96bd0ea5cdeeb37eaf446a22e6ed7b981d792828721e74ded1980a45c6"
dependencies = [ dependencies = [
"avif-serialize", "avif-serialize",
"imgref", "imgref",
"loop9", "loop9",
"quick-error", "quick-error",
"rav1e", "rav1e",
"rayon",
"rgb", "rgb",
] ]
@ -2738,9 +2761,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.11.0" version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -3116,6 +3139,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sd-notify"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1be20c5f7f393ee700f8b2f28ea35812e4e212f40774b550cd2a93ea91684451"
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "2.11.1" version = "2.11.1"
@ -3147,9 +3176,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.210" version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -3168,9 +3197,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.210" version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3373,9 +3402,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.79" version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3539,9 +3568,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.40.0" version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -3956,7 +3985,7 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]] [[package]]
name = "watchers" name = "watchers"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -3997,9 +4026,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
version = "0.31.6" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"rustix", "rustix",
@ -4009,9 +4038,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols" name = "wayland-protocols"
version = "0.32.4" version = "0.32.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"wayland-backend", "wayland-backend",
@ -4021,9 +4050,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols-plasma" name = "wayland-protocols-plasma"
version = "0.3.4" 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 = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"wayland-backend", "wayland-backend",
@ -4034,9 +4063,9 @@ dependencies = [
[[package]] [[package]]
name = "wayland-protocols-wlr" name = "wayland-protocols-wlr"
version = "0.3.4" 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 = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"wayland-backend", "wayland-backend",
@ -4355,9 +4384,9 @@ dependencies = [
[[package]] [[package]]
name = "zbus" name = "zbus"
version = "5.0.0" version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d17185ff0b54cf0af51da5762f9ccef45b633af5006651669fe90bb97e830f4" checksum = "4e0c8d6fdd4c4ac401fd298fd169d538a386e9df3c32ff136e8745dfa443dbd8"
dependencies = [ dependencies = [
"async-broadcast", "async-broadcast",
"async-executor", "async-executor",
@ -4382,6 +4411,7 @@ dependencies = [
"tracing", "tracing",
"uds_windows", "uds_windows",
"windows-sys 0.59.0", "windows-sys 0.59.0",
"winnow",
"xdg-home", "xdg-home",
"zbus_macros", "zbus_macros",
"zbus_names", "zbus_names",
@ -4390,14 +4420,16 @@ dependencies = [
[[package]] [[package]]
name = "zbus_macros" name = "zbus_macros"
version = "5.0.0" version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3ad52bf7d51ef2a7b1bf9bbac6a2ebb8c77c7df297d3246963573d931bd5fd" checksum = "ed1f3cc6313cbefd539b4eee6de36a990897ab6cc2c30a82b3ac29ef9099e6c0"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
"zbus_names",
"zvariant",
"zvariant_utils", "zvariant_utils",
] ]

16
Cargo.toml
View File

@ -12,19 +12,19 @@ name = "awatcher"
path = "src/main.rs" path = "src/main.rs"
[build-dependencies] [build-dependencies]
image = { version = "0.25.4" } image = { version = "0.25.5" }
[workspace] [workspace]
members = ["watchers"] members = ["watchers"]
[workspace.package] [workspace.package]
version = "0.3.0" version = "0.3.1"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.90" anyhow = "1.0.93"
log = { version = "0.4.22", features = ["std"] } log = { version = "0.4.22", features = ["std"] }
tokio = { version = "1.40.0" } tokio = { version = "1.41.1" }
serde = "1.0.210" serde = "1.0.214"
[dev-dependencies] [dev-dependencies]
rstest = "0.23.0" rstest = "0.23.0"
@ -35,14 +35,14 @@ watchers = { path = "./watchers", default-features = false }
chrono = "0.4.38" chrono = "0.4.38"
toml = "0.8.19" toml = "0.8.19"
clap = { version = "4.5.20", features = ["string"] } clap = { version = "4.5.20", features = ["string"] }
fern = { version = "0.6.2", features = ["colored"] } fern = { version = "0.7.0", features = ["colored"] }
log = { workspace = true } log = { workspace = true }
anyhow = { workspace = true } 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 = "bb787fd" } aw-server = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "656f3c9" }
aw-datastore = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "bb787fd" } aw-datastore = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "656f3c9" }
open = { version = "5.3.0", optional = true } open = { version = "5.3.0", optional = true }
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }

14
watchers/Cargo.toml
View File

@ -14,20 +14,20 @@ rstest = "0.23.0"
tempfile = "3.13.0" tempfile = "3.13.0"
[dependencies] [dependencies]
aw-client-rust = { git = "https://github.com/ActivityWatch/aw-server-rust", rev = "bb787fd" } aw-client-rust = { git = "https://github.com/ActivityWatch/aw-server-rust", rev = "656f3c9" }
wayland-client = "0.31.6" wayland-client = "0.31.7"
wayland-protocols = { version = "0.32.4", features = ["staging", "client" ]} wayland-protocols = { version = "0.32.5", features = ["staging", "client" ]}
wayland-protocols-plasma = { version = "0.3.4", features = ["client"] } wayland-protocols-plasma = { version = "0.3.5", features = ["client"] }
wayland-protocols-wlr = { version = "0.3.4", features = ["client"] } wayland-protocols-wlr = { version = "0.3.5", features = ["client"] }
x11rb = { version = "0.13.1", features = ["screensaver"] } x11rb = { version = "0.13.1", features = ["screensaver"] }
zbus = {version = "5.0.0", optional = true} zbus = {version = "5.1.0", optional = true}
chrono = "0.4.38" chrono = "0.4.38"
toml = "0.8.19" toml = "0.8.19"
dirs = "5.0.1" dirs = "5.0.1"
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_default = "0.2.0" serde_default = "0.2.0"
serde_json = "1.0.132" serde_json = "1.0.132"
regex = "1.11.0" regex = "1.11.1"
gethostname = "0.5.0" gethostname = "0.5.0"
log = { workspace = true } log = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }