Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
05e0083
feat: add networkmanager module
Zedfrigg Feb 10, 2024
3e9cf85
Merge branch 'JakeStanger:master' into feat/networkmanager
Zedfrigg Feb 13, 2024
33d367c
feat: networkmanager module is now an optional Cargo feature
Zedfrigg Feb 15, 2024
b92c8d6
feat: add icon size config and cellular support to networkmanager module
Zedfrigg Feb 15, 2024
b96d696
docs: add networkmanager module documentation
Zedfrigg Feb 15, 2024
4b40455
Merge branch 'JakeStanger:master' into feat/networkmanager
Zedfrigg Feb 15, 2024
4df4805
docs: remove todo for icon size config
Zedfrigg Mar 12, 2024
cdc196d
fix: missing cfg attribute for networkmanager module in bar loading
Zedfrigg Mar 12, 2024
85db13d
fix: yet another missing cfg attribute for networkmanager module
Zedfrigg Mar 12, 2024
9031438
Merge branch 'master' into feat/networkmanager
Zedfrigg Mar 12, 2024
47a2982
refactor: add initial DBus proxy traits
Zedfrigg Mar 29, 2024
4e2352c
Merge branch 'master' into feat/networkmanager
Zedfrigg Mar 29, 2024
288cfeb
docs: expand comment about dbus client refactor
Zedfrigg Mar 29, 2024
53c4c7b
feat: add support for VPN primary connection
Zedfrigg Mar 30, 2024
ed9332d
Merge branch 'master' into feat/networkmanager
Zedfrigg Mar 30, 2024
417a6be
docs: expand module docs, add note about primary connection limitations
Zedfrigg Mar 30, 2024
20a1207
docs: use note block for primary connection note, remove hardwraps
Zedfrigg Mar 31, 2024
68ca8da
refactor: change NetworkManager module and state capitalisation
Zedfrigg Mar 31, 2024
c41d37c
fix: add explicit failure message for DBus property downcasting
Zedfrigg Mar 31, 2024
e1094ca
refactor: change NetworkManager ModuleConfig capitalisation
Zedfrigg Mar 31, 2024
1044da2
refactor: introduce networkmanager client
Zedfrigg Apr 17, 2024
b860f5b
Merge branch 'master' into feat/networkmanager
Zedfrigg Apr 17, 2024
8d0560e
fix: post-merge fixes
Zedfrigg Apr 18, 2024
59a5166
refactor: remove unnecessary intermediate variable
Zedfrigg Apr 18, 2024
6478dd6
refactor: networkmanager rewritten to utilise fallible_client
Zedfrigg Apr 22, 2024
6a33013
refactor: make client state enum order consistent
Zedfrigg Apr 24, 2024
4da42fc
Merge branch 'master' into feat/networkmanager
Zedfrigg Apr 24, 2024
3061375
Merge branch 'master' into feat/networkmanager
Zedfrigg Apr 29, 2024
33f73ee
Add GTK Box import alias, change DBus strings to const
Zedfrigg May 14, 2024
17e830a
Revert "Add GTK Box import alias, change DBus strings to const"
Zedfrigg May 14, 2024
00df5aa
Add GTK Box import alias, change DBus strings to const
Zedfrigg May 14, 2024
da94923
Replace text with icons in volume module
Zedfrigg May 18, 2024
b14fe5a
Merge branch 'master' into develop
Zedfrigg May 27, 2024
41bdecf
Merge branch 'develop' into feat/volume-icon
Zedfrigg May 27, 2024
cd8c6b3
Merge branch 'develop' into feat/networkmanager
Zedfrigg May 27, 2024
078563e
Merge branch 'master' into develop
Zedfrigg May 30, 2024
5c9ca71
Merge branch 'feat/networkmanager' into develop
Zedfrigg May 30, 2024
1207402
Merge branch 'feat/volume-icon' into develop
Zedfrigg May 30, 2024
96d0d9e
Merge branch 'develop' into refactor/dbus-traits
Zedfrigg May 31, 2024
ef73972
refactor: re-add proxy trait to client
Zedfrigg Jun 4, 2024
14e1f49
refactor: prop changes are handled using generic signal
Zedfrigg Jun 4, 2024
4361952
fix: useless imports, check changed props interface name
Zedfrigg Jun 4, 2024
c75de5c
fix: client not setting initial state
Zedfrigg Jun 4, 2024
3bf4e9b
Merge branch 'refs/heads/master' into develop
Zedfrigg Jun 5, 2024
8b91feb
fix: add JSON schema derivation, move dep declaration back to bottom
Zedfrigg Jun 7, 2024
de29b8d
fix: remove unconditional schemars import
Zedfrigg Jun 7, 2024
cd0991e
feat: icon per connection type
Zedfrigg Jun 15, 2024
4182038
feat: actually implement icon per connection type
Zedfrigg Jun 17, 2024
39eb3cf
fix: state not being set properly in initialisation
Zedfrigg Jun 17, 2024
2ae8d50
refactor: extract property and path list watcher macros
Zedfrigg Jun 17, 2024
d56f76f
refactor: extract initialisation macro
Zedfrigg Jun 17, 2024
465d168
fix: only update relevant parts of state upon property change
Zedfrigg Jun 19, 2024
a9cd5f5
refactor: extract selective state update macro
Zedfrigg Jun 19, 2024
de479f1
refactor: remove unnecessary blocks
Zedfrigg Jun 19, 2024
f32f98b
Merge branch 'master' into feat/networkmanager-multi-icon
Zedfrigg Jun 30, 2024
e1945d1
fix: revert inclusion of local volume module patch
Zedfrigg Jun 30, 2024
3e7e7c0
Merge branch 'master' into develop
Zedfrigg Aug 4, 2024
f5f81da
Merge branch 'master' into feat/networkmanager-multi-icon
Zedfrigg Aug 4, 2024
97bbddb
fix: issues introduced by merge (see parent)
Zedfrigg Aug 4, 2024
2c68b4a
fix: issues introduced by merge (see parent)
Zedfrigg Aug 4, 2024
c42024d
Merge branch 'master' into develop
Zedfrigg Jul 14, 2025
2668673
WIP update of networkmanager & volume modules
Zedfrigg Aug 10, 2025
9ca5f4b
WIP failed attempt at StreamMap-based implementation
Zedfrigg Aug 14, 2025
1836ab2
refactor(networkmanager): replace state-based w/ event-based approach
Zedfrigg Aug 16, 2025
8bb95e2
fix(networkmanager): prevent race condition, support all device types
Zedfrigg Aug 17, 2025
e6f6106
refactor(networkmanager): remove unnecessary async & unused fields
Zedfrigg Aug 17, 2025
7568b83
build(networkmanager): remove futures-signals dep & lto enabling
Zedfrigg Aug 20, 2025
48493c6
refactor(networkmanager): event-based approach, update module interfaces
Zedfrigg Aug 20, 2025
4a09e95
Merge branch 'master' into feat/networkmanager-multi-icon
Zedfrigg Aug 20, 2025
dfad982
refactor(networkmanager): implement clippy::pedantic suggestions
Zedfrigg Aug 20, 2025
4594271
refactor(networkmanager): remove now unused state.rs
Zedfrigg Aug 20, 2025
226b32c
fix(networkmanager): support late module initialisation
Zedfrigg Sep 2, 2025
ec00b2c
refactor(networkmanager): break Client::run up into multiple functions
Zedfrigg Sep 2, 2025
4c516a1
refactor(networkmanager): rename DeviceStateChanged event to DeviceCh…
Zedfrigg Sep 2, 2025
3ffb668
refactor(networkmanager): pass device proxy directly to device state …
Zedfrigg Sep 2, 2025
5385c7e
refactor(networkmanager): Replace Mutex with RwLock for shared state …
Zedfrigg Sep 3, 2025
13c2520
refactor(networkmanager): use inner client with static lifetime, make…
Zedfrigg Sep 3, 2025
01de9da
refactor(networkmanager): store property watcher join handles & stop …
Zedfrigg Sep 3, 2025
f83c9e6
refactor(networkmanager): merge devices and watchers fields in Client…
Zedfrigg Sep 4, 2025
d752e88
refactor(networkmanager): make dbus connection a ClientInner field
Zedfrigg Sep 4, 2025
af49acb
fix(networkmanager): remove icons for removed devices
Zedfrigg Sep 4, 2025
db88e12
refactor(networkmanager): identify devices by their number outside of…
Zedfrigg Sep 4, 2025
a106f41
fix(networkmanager): notify upon new device from watch_device()
Zedfrigg Sep 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 12 additions & 64 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ music = ["dep:regex"]
"music+mpris" = ["music", "mpris"]
"music+mpd" = ["music", "mpd-utils"]

network_manager = ["futures-lite", "futures-signals", "zbus"]
network_manager = ["futures-lite", "tokio-stream", "zbus"]

notifications = ["zbus"]

Expand Down Expand Up @@ -171,7 +171,7 @@ regex = { version = "1.11.1", default-features = false, features = [
], optional = true }

# network_manager
futures-signals = { version = "0.3.34", optional = true }
tokio-stream = { version = "0.1.17", optional = true }

# sys_info
sysinfo = { version = "0.36.1", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/clients/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ impl Clients {
if let Some(client) = &self.network_manager {
Ok(client.clone())
} else {
let client = await_sync(async move { networkmanager::create_client().await })?;
let client = networkmanager::create_client()?;
self.network_manager = Some(client.clone());
Ok(client)
}
Expand Down
171 changes: 0 additions & 171 deletions src/clients/networkmanager.rs

This file was deleted.

Loading