Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e8b2e6a02 | ||
|
|
578a4f5607 | ||
|
|
d90191618d | ||
|
|
936e28b483 | ||
|
|
62169be746 |
@@ -2,6 +2,36 @@
|
||||
|
||||
One section per version, newest first.
|
||||
|
||||
## v0.6.3 (2026-11-04)
|
||||
|
||||
### Features
|
||||
|
||||
- On the now-playing screen the cover flips around when the next track has a different picture, and settles with a small bounce. Tracks that share a picture do not flip, even on servers such as Navidrome that give every track its own cover id.
|
||||
|
||||
## v0.6.2 (2026-11-04)
|
||||
|
||||
### Bug fixes
|
||||
|
||||
- The app icon has thinner margins and a larger mark, so it stays legible at small sizes such as a taskbar or a repository avatar.
|
||||
|
||||
## v0.6.1 (2026-11-04)
|
||||
|
||||
### Bug fixes
|
||||
|
||||
- The logo is centred on the login screen.
|
||||
|
||||
## v0.6.0 (2026-11-04)
|
||||
|
||||
### Features
|
||||
|
||||
- The login screen has an Exit button below Connect, so remus can be closed from a controller before logging in.
|
||||
|
||||
## v0.5.0 (2026-11-04)
|
||||
|
||||
### Features
|
||||
|
||||
- While music plays, remus asks the system to keep the screensaver and sleep away, and lets go when playback is paused or stopped, or remus quits.
|
||||
|
||||
## v0.4.0 (2026-11-04)
|
||||
|
||||
### Features
|
||||
|
||||
@@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
|
||||
|
||||
[[package]]
|
||||
name = "remus"
|
||||
version = "0.4.0"
|
||||
version = "0.6.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"directories",
|
||||
@@ -4404,6 +4404,7 @@ dependencies = [
|
||||
"slint-build",
|
||||
"tokio",
|
||||
"toml",
|
||||
"zbus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5407,8 +5408,10 @@ dependencies = [
|
||||
"libc",
|
||||
"mio",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"tracing",
|
||||
"windows-sys 0.61.2",
|
||||
]
|
||||
|
||||
@@ -6727,6 +6730,7 @@ dependencies = [
|
||||
"rustix 1.1.6",
|
||||
"serde",
|
||||
"serde_repr",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"uds_windows",
|
||||
"uuid",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "remus"
|
||||
version = "0.4.0"
|
||||
version = "0.6.3"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
|
||||
@@ -21,6 +21,7 @@ serde_json = "1.0.154"
|
||||
slint = "1.18.1"
|
||||
tokio = { version = "1.54.1", features = ["rt-multi-thread", "sync", "macros", "time"] }
|
||||
toml = "1.1.8"
|
||||
zbus = { version = "5.19.0", default-features = false, features = ["tokio"] }
|
||||
|
||||
[build-dependencies]
|
||||
slint-build = "1.18.1"
|
||||
|
||||
@@ -166,12 +166,14 @@ def variants() -> dict[str, str]:
|
||||
# Full-bleed square, the composition of the source artwork.
|
||||
v["remus-square.svg"] = svg(1024, 1024, mark(CREAM, 512, 512, 512), MAROON)
|
||||
|
||||
# Desktop / Flatpak app icon: rounded tile with a margin, 128 grid.
|
||||
# Desktop / Flatpak app icon: rounded tile on a 128 grid. The margins are
|
||||
# kept thin so the mark stays legible at 16 to 32 px. The mark sits 1 unit
|
||||
# above centre because its wide base reads heavier than the R.
|
||||
v["remus-icon.svg"] = svg(
|
||||
128,
|
||||
128,
|
||||
f'<rect x="8" y="8" width="112" height="112" rx="26" fill="{MAROON}"/>'
|
||||
+ mark(CREAM, 64, 64, 74),
|
||||
f'<rect x="2" y="2" width="124" height="124" rx="24" fill="{MAROON}"/>'
|
||||
+ mark(CREAM, 64, 63, 100),
|
||||
)
|
||||
|
||||
# Lockups with the wordmark, transparent background.
|
||||
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.3 KiB |
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="8" y="8" width="112" height="112" rx="26" fill="#5a0712"/><g fill="#faebda" transform="translate(64 64) scale(0.117741) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="2" y="2" width="124" height="124" rx="24" fill="#5a0712"/><g fill="#faebda" transform="translate(64 63) scale(0.159109) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
@@ -20,6 +20,11 @@
|
||||
</supports>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="0.6.3" date="2026-11-04"/>
|
||||
<release version="0.6.2" date="2026-11-04"/>
|
||||
<release version="0.6.1" date="2026-11-04"/>
|
||||
<release version="0.6.0" date="2026-11-04"/>
|
||||
<release version="0.5.0" date="2026-11-04"/>
|
||||
<release version="0.4.0" date="2026-11-04"/>
|
||||
<release version="0.3.0" date="2026-11-04"/>
|
||||
<release version="0.2.1" date="2026-11-04"/>
|
||||
|
||||
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="8" y="8" width="112" height="112" rx="26" fill="#5a0712"/><g fill="#faebda" transform="translate(64 64) scale(0.117741) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128"><rect x="2" y="2" width="124" height="124" rx="24" fill="#5a0712"/><g fill="#faebda" transform="translate(64 63) scale(0.159109) translate(-627.5 -627.25)"><path d="M456.32,605.50C452.96,605.35 452.88,605.29 452.88,603.08C452.88,601.03 453.05,600.88 456.88,599.52C460.01,598.41 460.90,598.05 463.45,596.85C464.45,596.38 465.33,596.00 465.40,596.00C465.81,596.00 472.53,592.55 474.76,591.20C490.25,581.80 496.47,573.90 499.54,559.75L500.11,557.12L500.24,497.38C500.43,412.59 500.22,363.56 499.67,360.75C498.12,352.93 496.40,348.79 492.61,343.77C485.58,334.43 474.65,326.59 459.62,320.12C457.15,319.06 454.76,318.08 454.31,317.95C453.12,317.62 452.67,316.78 452.80,315.14C452.86,314.39 453.06,313.60 453.24,313.39C453.53,313.04 462.72,313.00 547.89,313.00C653.06,313.00 647.36,312.92 660.75,314.64C672.81,316.19 690.05,321.27 698.25,325.70C709.70,331.88 714.98,335.69 721.89,342.78C731.72,352.87 738.85,366.60 740.96,379.50C742.04,386.15 742.34,389.75 742.17,394.18C741.67,407.42 738.27,418.76 731.68,429.15C724.99,439.71 714.77,449.22 702.54,456.28C701.26,457.02 699.91,457.80 699.54,458.02C693.02,461.86 679.82,467.01 670.12,469.50C665.05,470.81 664.39,471.06 664.30,471.71C664.21,472.26 665.78,474.37 671.26,481.12C672.72,482.91 677.78,489.21 682.52,495.13C687.27,501.04 692.08,507.00 693.22,508.38C694.36,509.75 696.22,512.11 697.37,513.62C698.51,515.14 700.73,517.97 702.29,519.91C710.78,530.50 718.71,540.31 721.45,543.62C723.15,545.69 726.41,549.68 728.71,552.50C735.86,561.29 738.22,564.01 742.11,567.89C750.99,576.78 762.35,584.44 773.88,589.31C774.70,589.66 776.22,590.31 777.25,590.75C778.28,591.20 779.69,591.76 780.38,592.00C783.56,593.10 786.30,593.97 788.25,594.49C789.42,594.79 791.11,595.26 792.00,595.52C793.57,595.97 795.02,596.30 799.48,597.23C802.20,597.80 802.25,597.88 802.25,601.41C802.25,604.02 802.21,604.27 801.65,604.92L801.04,605.62L753.96,605.62C715.51,605.62 706.46,605.56 704.62,605.28C692.89,603.51 683.14,597.15 674.69,585.75C673.21,583.76 671.10,580.94 670.00,579.50C667.28,575.93 664.03,571.58 660.00,566.13C658.14,563.62 655.56,560.13 654.25,558.38C652.94,556.62 650.03,552.70 647.77,549.66C641.97,541.85 633.78,530.97 619.02,511.50C617.41,509.37 613.97,504.81 611.37,501.38C608.78,497.94 605.19,493.21 603.39,490.88C601.59,488.54 599.31,485.56 598.33,484.25C596.30,481.54 595.64,480.88 594.74,480.66C594.38,480.58 589.15,480.50 583.11,480.49L572.13,480.47L571.68,481.02C571.25,481.55 571.24,483.35 571.31,519.85C571.38,549.72 571.47,558.48 571.72,559.75C574.89,575.81 583.99,585.82 604.45,595.75C605.86,596.44 607.11,597.00 607.23,597.00C607.35,597.00 608.15,597.35 609.02,597.78C609.88,598.21 611.16,598.76 611.86,599.01C614.40,599.93 615.15,600.22 616.31,600.72L617.50,601.23L617.50,602.84C617.50,604.03 617.38,604.59 617.03,605.02L616.57,605.60L537.85,605.61C494.55,605.62 457.86,605.57 456.32,605.50ZM600.38,463.00C606.75,462.53 613.03,461.37 618.38,459.66C629.72,456.04 637.60,451.38 645.27,443.75C651.89,437.18 657.19,428.71 659.74,420.62C660.05,419.66 660.44,418.48 660.62,418.00C662.11,413.97 663.57,406.53 664.03,400.62C664.33,396.86 664.17,385.71 663.79,383.88C663.64,383.19 663.40,381.84 663.25,380.88C662.92,378.72 661.84,373.77 661.37,372.25C661.18,371.63 660.75,370.23 660.41,369.12C660.07,368.02 659.61,366.79 659.40,366.38C659.18,365.96 659.00,365.51 659.00,365.36C659.00,365.22 658.26,363.65 657.35,361.86C648.63,344.78 632.27,333.74 611.62,331.03C610.52,330.88 608.67,330.63 607.50,330.47C606.12,330.28 599.60,330.14 589.00,330.06L572.62,329.95L571.94,330.50L571.25,331.04L571.31,396.95L571.38,462.86L571.89,463.12C572.56,463.45 595.54,463.36 600.38,463.00Z"/><path fill-rule="evenodd" d="M453,633Q453,632 454,632H801Q802,632 802,633V653A13 12 0 0 1 789,665H466A13 12 0 0 1 453,653ZM493.5,677H761.5V683A16 16 0 0 1 745.5,699H509.5A16 16 0 0 1 493.5,683ZM520,710H735Q726,714 726,724V856Q726.5,870 735,873H520Q528.5,870 529,856V724Q529,714 520,710ZM562.5,855.5V738.5A11.5 11.5 0 0 1 585.5,738.5V855.5ZM616.0,855.5V738.5A11.5 11.5 0 0 1 639.0,738.5V855.5ZM669.5,855.5V738.5A11.5 11.5 0 0 1 692.5,738.5V855.5ZM487,905V900A16 16 0 0 1 503,884H752A16 16 0 0 1 768,900V905ZM460,941.5V930A14 14 0 0 1 474,916H781A14 14 0 0 1 795,930V941.5Z"/><rect x="460.0" y="741" width="30" height="115" rx="6"/><rect x="765.0" y="741" width="30" height="115" rx="6"/><rect x="400.0" y="707" width="30" height="182" rx="6"/><rect x="825.0" y="707" width="30" height="182" rx="6"/><rect x="340.0" y="757" width="30" height="99" rx="6"/><rect x="885.0" y="757" width="30" height="99" rx="6"/></g></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
@@ -15,6 +15,9 @@ finish-args:
|
||||
# GPU rendering and gamepads (evdev). --device=input would be narrower but
|
||||
# needs Flatpak 1.15.6, which not every SteamOS release ships.
|
||||
- --device=all
|
||||
# Keeps the screensaver off while music plays, the way Chromium and
|
||||
# Electron apps do. The XDG portal route needs no permission.
|
||||
- --talk-name=org.freedesktop.ScreenSaver
|
||||
|
||||
build-options:
|
||||
append-path: /usr/lib/sdk/rust-stable/bin
|
||||
|
||||
@@ -17,6 +17,7 @@ use tokio::runtime::Handle;
|
||||
use tokio::sync::Semaphore;
|
||||
|
||||
use crate::config::{self, Config, Settings};
|
||||
use crate::inhibit::Inhibitor;
|
||||
use crate::palette::{Lab, Palette, Role, Tone};
|
||||
use crate::player::{Player, PlayerEvent};
|
||||
use crate::prompts::{self, Control, Family, Prompts};
|
||||
@@ -64,6 +65,9 @@ pub fn shutdown() {
|
||||
let app = APP.with(|cell| cell.borrow_mut().take());
|
||||
if let Some(mut app) = app {
|
||||
app.save_queue();
|
||||
if let Some(i) = app.inhibitor.take() {
|
||||
i.shutdown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,6 +128,9 @@ enum Setting {
|
||||
|
||||
/// How long the UI takes to change from one palette to the next.
|
||||
const FADE: Duration = Duration::from_millis(800);
|
||||
/// How long the now-playing cover takes to turn edge-on, the `in` animation
|
||||
/// of the `turned` state in NowPlayingView. The turn back is in the .slint.
|
||||
const FLIP_OUT: Duration = Duration::from_millis(170);
|
||||
|
||||
/// The palette on screen and the one it is fading towards.
|
||||
struct Fade {
|
||||
@@ -195,6 +202,8 @@ struct Covers {
|
||||
/// Per cover id, whatever size it was decoded at. None for a cover with
|
||||
/// too little colour to base a palette on.
|
||||
tones: LruCache<String, Option<Tone>>,
|
||||
/// Hash of each decoded cover's pixels, to tell two ids with one picture.
|
||||
prints: LruCache<CoverKey, u64>,
|
||||
pending: HashSet<CoverKey>,
|
||||
failed: HashSet<CoverKey>,
|
||||
limit: Arc<Semaphore>,
|
||||
@@ -206,6 +215,8 @@ pub struct App {
|
||||
rt: Handle,
|
||||
client: Option<Client>,
|
||||
player: Option<Player>,
|
||||
/// Keeps the screensaver off while music plays. Taken at shutdown.
|
||||
inhibitor: Option<Inhibitor>,
|
||||
screen: Screen,
|
||||
area: Area,
|
||||
section: usize,
|
||||
@@ -241,6 +252,20 @@ pub struct App {
|
||||
icons: RefCell<HashMap<(Prompts, Control), Vec<Image>>>,
|
||||
settings: Settings,
|
||||
fade: Fade,
|
||||
/// The now-playing art on screen, `None` when nothing is playing.
|
||||
art_shown: Option<ShownArt>,
|
||||
/// Runs while the cover turns away; the new art goes up when it fires.
|
||||
flip_timer: Timer,
|
||||
}
|
||||
|
||||
/// What the now-playing art shows, to decide whether a track change flips it.
|
||||
/// Compared by picture, not by id: Navidrome gives every track its own cover
|
||||
/// id even when the whole album shares one image.
|
||||
struct ShownArt {
|
||||
/// Cover id of the track the art belongs to.
|
||||
id: Option<String>,
|
||||
/// Hash of the decoded cover, `None` for the letter placeholder.
|
||||
print: Option<u64>,
|
||||
}
|
||||
|
||||
impl App {
|
||||
@@ -257,11 +282,13 @@ impl App {
|
||||
{
|
||||
log::warn!("cover cache disabled, cannot create {}: {e}", d.display());
|
||||
}
|
||||
let inhibitor = Inhibitor::spawn(&rt);
|
||||
App {
|
||||
ui,
|
||||
rt,
|
||||
client: None,
|
||||
player: None,
|
||||
inhibitor: Some(inhibitor),
|
||||
screen: Screen::Login,
|
||||
area: Area::Content,
|
||||
section: 0,
|
||||
@@ -274,6 +301,7 @@ impl App {
|
||||
covers: Covers {
|
||||
images: LruCache::new(NonZeroUsize::new(400).unwrap()),
|
||||
tones: LruCache::new(NonZeroUsize::new(400).unwrap()),
|
||||
prints: LruCache::new(NonZeroUsize::new(400).unwrap()),
|
||||
pending: HashSet::new(),
|
||||
failed: HashSet::new(),
|
||||
limit: Arc::new(Semaphore::new(6)),
|
||||
@@ -294,6 +322,8 @@ impl App {
|
||||
last_save: Instant::now(),
|
||||
login_focus: 0,
|
||||
toast_timer: Timer::default(),
|
||||
art_shown: None,
|
||||
flip_timer: Timer::default(),
|
||||
prompts: Prompts::Keyboard,
|
||||
icons: RefCell::default(),
|
||||
settings: config::load_settings(),
|
||||
@@ -362,7 +392,7 @@ impl App {
|
||||
}
|
||||
|
||||
fn set_login_focus(&mut self, i: i32) {
|
||||
self.login_focus = i.clamp(0, 3);
|
||||
self.login_focus = i.clamp(0, 4);
|
||||
self.ui.set_login_focus(self.login_focus);
|
||||
self.ui.invoke_focus_login(self.login_focus);
|
||||
self.render_hints();
|
||||
@@ -373,6 +403,7 @@ impl App {
|
||||
Action::Up | Action::SectionPrev => self.set_login_focus(self.login_focus - 1),
|
||||
Action::Down | Action::SectionNext => self.set_login_focus(self.login_focus + 1),
|
||||
Action::Activate if self.login_focus < 2 => self.set_login_focus(self.login_focus + 1),
|
||||
Action::Activate if self.login_focus == 4 => self.action(Action::Quit),
|
||||
Action::Activate => self.login_submit(),
|
||||
_ => {}
|
||||
}
|
||||
@@ -1298,7 +1329,12 @@ impl App {
|
||||
};
|
||||
match self.screen {
|
||||
Screen::Login => {
|
||||
h(Control::Activate, if self.login_focus < 2 { "Next" } else { "Connect" });
|
||||
let label = match self.login_focus {
|
||||
0 | 1 => "Next",
|
||||
4 => "Exit",
|
||||
_ => "Connect",
|
||||
};
|
||||
h(Control::Activate, label);
|
||||
}
|
||||
Screen::Browse => match self.area {
|
||||
Area::Sidebar => {
|
||||
@@ -1435,11 +1471,12 @@ impl App {
|
||||
None
|
||||
}
|
||||
|
||||
fn cover_loaded(&mut self, key: CoverKey, result: Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>)>) {
|
||||
fn cover_loaded(&mut self, key: CoverKey, result: Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>, u64)>) {
|
||||
self.covers.pending.remove(&key);
|
||||
match result {
|
||||
Ok((buf, tone)) => {
|
||||
Ok((buf, tone, print)) => {
|
||||
self.covers.images.put(key.clone(), Image::from_rgb8(buf));
|
||||
self.covers.prints.put(key.clone(), print);
|
||||
// The first size decoded decides: other sizes give a tone that
|
||||
// differs in the last digits, which would restart the fade.
|
||||
if !self.covers.tones.contains(&key.0) {
|
||||
@@ -1449,7 +1486,16 @@ impl App {
|
||||
}
|
||||
Err(e) => {
|
||||
log::debug!("cover {} failed: {e:#}", key.0);
|
||||
// The playing track's art may be waiting on this to flip.
|
||||
let playing = self
|
||||
.current
|
||||
.and_then(|i| self.queue.get(i))
|
||||
.and_then(|s| s.cover_art.as_deref())
|
||||
== Some(key.0.as_str());
|
||||
self.covers.failed.insert(key);
|
||||
if playing {
|
||||
self.render_player();
|
||||
}
|
||||
// The playing track's cover failing means the brand palette.
|
||||
self.update_theme();
|
||||
return;
|
||||
@@ -1644,6 +1690,15 @@ impl App {
|
||||
self.save_queue();
|
||||
}
|
||||
}
|
||||
self.sync_inhibit();
|
||||
}
|
||||
|
||||
/// Inhibits only while sound is coming out: a restored queue is loaded
|
||||
/// paused and held until play is pressed.
|
||||
fn sync_inhibit(&self) {
|
||||
if let Some(i) = &self.inhibitor {
|
||||
i.set(self.current.is_some() && !self.paused && !self.held);
|
||||
}
|
||||
}
|
||||
|
||||
fn send_now_playing(&self) {
|
||||
@@ -1750,18 +1805,16 @@ impl App {
|
||||
self.ui.set_np_paused(self.paused);
|
||||
match song {
|
||||
Some(s) => {
|
||||
let px = self.now_playing_px();
|
||||
let cover = s.cover_art.as_deref().and_then(|id| self.cover(id, px));
|
||||
self.ui
|
||||
.set_np_letter(initial(s.album.as_deref().unwrap_or(&s.title)).into());
|
||||
self.ui.set_np_tint(tint(s.album.as_deref().unwrap_or(&s.title)));
|
||||
self.ui.set_np_has_cover(cover.is_some());
|
||||
self.ui.set_np_cover(cover.unwrap_or_default());
|
||||
self.update_art(&s);
|
||||
self.prefetch_next_cover();
|
||||
self.ui.set_np_title(s.title.into());
|
||||
self.ui.set_np_artist(s.artist.unwrap_or_default().into());
|
||||
self.ui.set_np_album(s.album.unwrap_or_default().into());
|
||||
}
|
||||
None => {
|
||||
self.flip_timer.stop();
|
||||
self.ui.set_np_flip_out(false);
|
||||
self.art_shown = None;
|
||||
self.ui.set_np_has_cover(false);
|
||||
self.ui.set_np_cover(Image::default());
|
||||
self.ui.set_np_letter("".into());
|
||||
@@ -1774,6 +1827,94 @@ impl App {
|
||||
self.update_theme();
|
||||
}
|
||||
|
||||
/// Shows the song's art, flipping the cover if it is a different picture
|
||||
/// from the one on screen. While a changed track's cover loads, the old one
|
||||
/// stays up: the load ends in a render either way, and decides then.
|
||||
fn update_art(&mut self, s: &Song) {
|
||||
if self.flip_timer.running() {
|
||||
// Mid-turn: the midpoint puts up whatever is current then.
|
||||
return;
|
||||
}
|
||||
let Some(shown) = &self.art_shown else {
|
||||
// From nothing playing: no flip, the cover fades in when it loads.
|
||||
self.render_art(s);
|
||||
return;
|
||||
};
|
||||
if shown.id == s.cover_art || self.screen != Screen::NowPlaying {
|
||||
self.render_art(s);
|
||||
return;
|
||||
}
|
||||
let Some(print) = self.art_print(s) else { return };
|
||||
if Some(print) == self.art_shown.as_ref().map(|a| a.print) {
|
||||
log::debug!("same cover picture under a new id, no flip");
|
||||
self.render_art(s);
|
||||
} else {
|
||||
log::debug!("cover picture changed, flipping");
|
||||
self.ui.set_np_flip_out(true);
|
||||
self.flip_timer
|
||||
.start(slint::TimerMode::SingleShot, FLIP_OUT, || with_app(|app| app.flip_in()));
|
||||
}
|
||||
}
|
||||
|
||||
/// The picture the song's art will show: `Some(None)` for the placeholder,
|
||||
/// `None` while its cover is still loading.
|
||||
fn art_print(&mut self, s: &Song) -> Option<Option<u64>> {
|
||||
let Some(id) = s.cover_art.as_deref() else {
|
||||
return Some(None);
|
||||
};
|
||||
let key: CoverKey = (id.to_string(), self.now_playing_px());
|
||||
if let Some(p) = self.covers.prints.get(&key) {
|
||||
return Some(Some(*p));
|
||||
}
|
||||
if self.covers.failed.contains(&key) {
|
||||
return Some(None);
|
||||
}
|
||||
// Starts the load if it is not under way.
|
||||
self.cover(id, key.1);
|
||||
None
|
||||
}
|
||||
|
||||
/// Loads the next track's cover at the now-playing size, so a skip can
|
||||
/// tell at once whether the picture changes.
|
||||
fn prefetch_next_cover(&mut self) {
|
||||
if self.screen != Screen::NowPlaying {
|
||||
return;
|
||||
}
|
||||
let next = self.current.and_then(|i| self.queue.get(i + 1));
|
||||
if let Some(id) = next.and_then(|s| s.cover_art.clone()) {
|
||||
let px = self.now_playing_px();
|
||||
self.cover(&id, px);
|
||||
}
|
||||
}
|
||||
|
||||
/// Puts the song's cover, or its letter placeholder, on screen.
|
||||
fn render_art(&mut self, s: &Song) {
|
||||
let px = self.now_playing_px();
|
||||
let cover = s.cover_art.as_deref().and_then(|id| self.cover(id, px));
|
||||
let print = s
|
||||
.cover_art
|
||||
.as_ref()
|
||||
.and_then(|id| self.covers.prints.get(&(id.clone(), px)).copied())
|
||||
.filter(|_| cover.is_some());
|
||||
let name = s.album.as_deref().unwrap_or(&s.title);
|
||||
self.ui.set_np_letter(initial(name).into());
|
||||
self.ui.set_np_tint(tint(name));
|
||||
self.ui.set_np_has_cover(cover.is_some());
|
||||
self.ui.set_np_cover(cover.unwrap_or_default());
|
||||
self.art_shown = Some(ShownArt {
|
||||
id: s.cover_art.clone(),
|
||||
print,
|
||||
});
|
||||
}
|
||||
|
||||
/// The cover is edge-on: swap in the current track's art and turn it back.
|
||||
fn flip_in(&mut self) {
|
||||
if let Some(s) = self.current.and_then(|i| self.queue.get(i)).cloned() {
|
||||
self.render_art(&s);
|
||||
}
|
||||
self.ui.set_np_flip_out(false);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- now playing
|
||||
|
||||
fn open_now_playing(&mut self) {
|
||||
@@ -2010,7 +2151,7 @@ fn bucket(px: f32) -> u32 {
|
||||
}
|
||||
|
||||
/// Decodes a cover at `px` and works out its tone for the album art palette.
|
||||
fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>)> {
|
||||
fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>, Option<Tone>, u64)> {
|
||||
let img = image::load_from_memory(bytes)?;
|
||||
let img = if img.width() > px || img.height() > px {
|
||||
img.resize(px, px, image::imageops::FilterType::Triangle)
|
||||
@@ -2023,8 +2164,11 @@ fn decode_cover(bytes: &[u8], px: u32) -> Result<(SharedPixelBuffer<Rgb8Pixel>,
|
||||
.to_rgb8();
|
||||
let tone = crate::palette::tone(small.as_raw());
|
||||
let rgb = img.to_rgb8();
|
||||
let mut hasher = std::hash::DefaultHasher::new();
|
||||
std::hash::Hash::hash(rgb.as_raw(), &mut hasher);
|
||||
let print = std::hash::Hasher::finish(&hasher);
|
||||
let buf = SharedPixelBuffer::clone_from_slice(rgb.as_raw(), rgb.width(), rgb.height());
|
||||
Ok((buf, tone))
|
||||
Ok((buf, tone, print))
|
||||
}
|
||||
|
||||
fn color(lab: Lab) -> Color {
|
||||
@@ -2133,6 +2277,22 @@ fn join_dot<I: IntoIterator<Item = Option<String>>>(parts: I) -> String {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn png(pixel: [u8; 3]) -> Vec<u8> {
|
||||
let img = image::RgbImage::from_pixel(8, 8, image::Rgb(pixel));
|
||||
let mut out = std::io::Cursor::new(Vec::new());
|
||||
img.write_to(&mut out, image::ImageFormat::Png).unwrap();
|
||||
out.into_inner()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_picture_under_two_ids_has_one_print() {
|
||||
let (_, _, a) = decode_cover(&png([120, 20, 30]), 64).unwrap();
|
||||
let (_, _, b) = decode_cover(&png([120, 20, 30]), 64).unwrap();
|
||||
let (_, _, c) = decode_cover(&png([20, 120, 30]), 64).unwrap();
|
||||
assert_eq!(a, b);
|
||||
assert_ne!(a, c);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn grid_window_is_row_aligned() {
|
||||
assert_eq!(window(1000, 0, 5, false), (0, 55));
|
||||
|
||||
@@ -0,0 +1,316 @@
|
||||
//! Keeps the screensaver and idle sleep away while music plays.
|
||||
//!
|
||||
//! Two routes, each held independently: org.freedesktop.ScreenSaver, the one
|
||||
//! Chromium and Electron apps use during playback, and the XDG portal's
|
||||
//! Inhibit, which needs no Flatpak permission and covers desktops where the
|
||||
//! first is not served. A route that fails is logged once and otherwise
|
||||
//! ignored. Services normally drop an inhibit when its client leaves the bus,
|
||||
//! so a crash should not leave one behind.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::Result;
|
||||
use tokio::runtime::Handle;
|
||||
use tokio::sync::{oneshot, watch};
|
||||
use zbus::Connection;
|
||||
use zbus::zvariant::{OwnedObjectPath, Value};
|
||||
|
||||
const APP: &str = "remus";
|
||||
const REASON: &str = "Playing music";
|
||||
|
||||
/// The portal's idle and suspend flags.
|
||||
const PORTAL_FLAGS: u32 = 4 | 8;
|
||||
|
||||
pub struct Inhibitor {
|
||||
want: watch::Sender<bool>,
|
||||
done: oneshot::Receiver<()>,
|
||||
rt: Handle,
|
||||
}
|
||||
|
||||
impl Inhibitor {
|
||||
pub fn spawn(rt: &Handle) -> Inhibitor {
|
||||
let (want, rx) = watch::channel(false);
|
||||
let (done_tx, done) = oneshot::channel();
|
||||
rt.spawn(async move {
|
||||
run(DBus::default(), rx).await;
|
||||
let _ = done_tx.send(());
|
||||
});
|
||||
Inhibitor {
|
||||
want,
|
||||
done,
|
||||
rt: rt.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Hold the inhibit while `on`, release it otherwise.
|
||||
pub fn set(&self, on: bool) {
|
||||
self.want.send_if_modified(|v| std::mem::replace(v, on) != on);
|
||||
}
|
||||
|
||||
/// Releases what is held before the runtime goes away. Called from
|
||||
/// outside the runtime, so it may block briefly.
|
||||
pub fn shutdown(self) {
|
||||
let Inhibitor { want, done, rt } = self;
|
||||
drop(want);
|
||||
// The timer needs the runtime, so it is made inside block_on.
|
||||
let _ = rt.block_on(async { tokio::time::timeout(Duration::from_secs(1), done).await });
|
||||
}
|
||||
}
|
||||
|
||||
/// One way of inhibiting, so the loop can be tested without a bus.
|
||||
trait Backend {
|
||||
/// Takes every route that is not held yet.
|
||||
async fn acquire(&mut self);
|
||||
/// Gives back every route that is held.
|
||||
async fn release(&mut self);
|
||||
}
|
||||
|
||||
/// Follows the wanted state until the sender is dropped, then releases.
|
||||
async fn run(mut backend: impl Backend, mut want: watch::Receiver<bool>) {
|
||||
while want.changed().await.is_ok() {
|
||||
// Changes that arrive while a call is in flight coalesce into the latest.
|
||||
if *want.borrow_and_update() {
|
||||
backend.acquire().await;
|
||||
} else {
|
||||
backend.release().await;
|
||||
}
|
||||
}
|
||||
backend.release().await;
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct DBus {
|
||||
conn: Option<Connection>,
|
||||
cookie: Option<u32>,
|
||||
request: Option<OwnedObjectPath>,
|
||||
warned_bus: bool,
|
||||
warned_screensaver: bool,
|
||||
warned_portal: bool,
|
||||
}
|
||||
|
||||
impl DBus {
|
||||
async fn connection(&mut self) -> Option<Connection> {
|
||||
if self.conn.is_none() {
|
||||
match Connection::session().await {
|
||||
Ok(c) => self.conn = Some(c),
|
||||
Err(e) => {
|
||||
warn_once(
|
||||
&mut self.warned_bus,
|
||||
format_args!("no session bus, the screensaver stays on: {e}"),
|
||||
);
|
||||
return None;
|
||||
}
|
||||
}
|
||||
}
|
||||
self.conn.clone()
|
||||
}
|
||||
}
|
||||
|
||||
impl Backend for DBus {
|
||||
async fn acquire(&mut self) {
|
||||
let Some(conn) = self.connection().await else { return };
|
||||
if self.cookie.is_none() {
|
||||
match screensaver_inhibit(&conn).await {
|
||||
Ok(c) => {
|
||||
log::debug!("screensaver inhibited (cookie {c})");
|
||||
self.cookie = Some(c);
|
||||
}
|
||||
Err(e) => warn_once(
|
||||
&mut self.warned_screensaver,
|
||||
format_args!("org.freedesktop.ScreenSaver inhibit failed: {e:#}"),
|
||||
),
|
||||
}
|
||||
}
|
||||
if self.request.is_none() {
|
||||
match portal_inhibit(&conn).await {
|
||||
Ok(r) => {
|
||||
log::debug!("portal inhibit requested ({})", r.as_str());
|
||||
self.request = Some(r);
|
||||
}
|
||||
Err(e) => warn_once(&mut self.warned_portal, format_args!("portal inhibit failed: {e:#}")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn release(&mut self) {
|
||||
let Some(conn) = self.conn.clone() else { return };
|
||||
if let Some(c) = self.cookie.take() {
|
||||
let r = conn
|
||||
.call_method(
|
||||
Some("org.freedesktop.ScreenSaver"),
|
||||
"/org/freedesktop/ScreenSaver",
|
||||
Some("org.freedesktop.ScreenSaver"),
|
||||
"UnInhibit",
|
||||
&(c,),
|
||||
)
|
||||
.await;
|
||||
match r {
|
||||
Ok(_) => log::debug!("screensaver released (cookie {c})"),
|
||||
Err(e) => log::warn!("org.freedesktop.ScreenSaver uninhibit failed: {e}"),
|
||||
}
|
||||
}
|
||||
if let Some(r) = self.request.take()
|
||||
&& let Err(e) = conn
|
||||
.call_method(
|
||||
Some("org.freedesktop.portal.Desktop"),
|
||||
r.as_str(),
|
||||
Some("org.freedesktop.portal.Request"),
|
||||
"Close",
|
||||
&(),
|
||||
)
|
||||
.await
|
||||
{
|
||||
if gone(&e) {
|
||||
// Some portal backends drop the request at once, for example
|
||||
// when they do not implement Inhibit, so there is nothing to close.
|
||||
log::debug!("portal inhibit was not held any more: {e}");
|
||||
} else {
|
||||
log::warn!("portal inhibit release failed: {e}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn screensaver_inhibit(conn: &Connection) -> Result<u32> {
|
||||
let reply = conn
|
||||
.call_method(
|
||||
Some("org.freedesktop.ScreenSaver"),
|
||||
"/org/freedesktop/ScreenSaver",
|
||||
Some("org.freedesktop.ScreenSaver"),
|
||||
"Inhibit",
|
||||
&(APP, REASON),
|
||||
)
|
||||
.await?;
|
||||
Ok(reply.body().deserialize::<u32>()?)
|
||||
}
|
||||
|
||||
async fn portal_inhibit(conn: &Connection) -> Result<OwnedObjectPath> {
|
||||
let options: HashMap<&str, Value<'_>> = HashMap::from([("reason", Value::from(REASON))]);
|
||||
let reply = conn
|
||||
.call_method(
|
||||
Some("org.freedesktop.portal.Desktop"),
|
||||
"/org/freedesktop/portal/desktop",
|
||||
Some("org.freedesktop.portal.Inhibit"),
|
||||
"Inhibit",
|
||||
// No parent window identifier: the inhibit is for the whole app.
|
||||
&("", PORTAL_FLAGS, options),
|
||||
)
|
||||
.await?;
|
||||
Ok(reply.body().deserialize::<OwnedObjectPath>()?)
|
||||
}
|
||||
|
||||
/// The object being called no longer exists.
|
||||
fn gone(e: &zbus::Error) -> bool {
|
||||
const GONE: [&str; 2] = [
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
"org.freedesktop.DBus.Error.UnknownObject",
|
||||
];
|
||||
match e {
|
||||
zbus::Error::MethodError(name, ..) => GONE.contains(&name.as_str()),
|
||||
zbus::Error::FDO(f) => {
|
||||
matches!(
|
||||
**f,
|
||||
zbus::fdo::Error::UnknownMethod(_) | zbus::fdo::Error::UnknownObject(_)
|
||||
)
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn warn_once(warned: &mut bool, msg: std::fmt::Arguments<'_>) {
|
||||
if std::mem::replace(warned, true) {
|
||||
log::debug!("{msg}");
|
||||
} else {
|
||||
log::warn!("{msg}");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use super::*;
|
||||
|
||||
#[derive(Clone, Default)]
|
||||
struct Fake {
|
||||
calls: Arc<Mutex<Vec<&'static str>>>,
|
||||
held: Arc<Mutex<bool>>,
|
||||
}
|
||||
|
||||
impl Backend for Fake {
|
||||
async fn acquire(&mut self) {
|
||||
self.calls.lock().unwrap().push("acquire");
|
||||
*self.held.lock().unwrap() = true;
|
||||
}
|
||||
async fn release(&mut self) {
|
||||
self.calls.lock().unwrap().push("release");
|
||||
*self.held.lock().unwrap() = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Sends each state and lets the loop act on it before the next.
|
||||
async fn drive(states: &[bool]) -> Fake {
|
||||
let fake = Fake::default();
|
||||
let (tx, rx) = watch::channel(false);
|
||||
let task = tokio::spawn(run(fake.clone(), rx));
|
||||
for &s in states {
|
||||
tx.send_if_modified(|v| std::mem::replace(v, s) != s);
|
||||
tokio::task::yield_now().await;
|
||||
}
|
||||
drop(tx);
|
||||
task.await.unwrap();
|
||||
fake
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn follows_play_and_pause() {
|
||||
let fake = drive(&[true, false, true]).await;
|
||||
assert_eq!(
|
||||
*fake.calls.lock().unwrap(),
|
||||
["acquire", "release", "acquire", "release"]
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn repeated_state_does_not_call_again() {
|
||||
let fake = drive(&[true, true, true]).await;
|
||||
assert_eq!(*fake.calls.lock().unwrap(), ["acquire", "release"]);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn releases_when_dropped_while_held() {
|
||||
let fake = drive(&[true]).await;
|
||||
assert!(!*fake.held.lock().unwrap());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn nothing_held_when_never_played() {
|
||||
let fake = drive(&[false]).await;
|
||||
assert_eq!(*fake.calls.lock().unwrap(), ["release"]);
|
||||
assert!(!*fake.held.lock().unwrap());
|
||||
}
|
||||
|
||||
/// Against the real session bus: `cargo test live_inhibit -- --ignored`.
|
||||
/// Prints which routes this session serves rather than failing on a
|
||||
/// missing one, since a desktop may serve only one of them.
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn live_inhibit() {
|
||||
let conn = Connection::session().await.expect("session bus");
|
||||
let ss = screensaver_inhibit(&conn).await;
|
||||
let portal = portal_inhibit(&conn).await;
|
||||
println!("org.freedesktop.ScreenSaver: {ss:?}");
|
||||
println!("portal: {portal:?}");
|
||||
assert!(ss.is_ok() || portal.is_ok(), "neither route is served");
|
||||
|
||||
let mut bus = DBus {
|
||||
conn: Some(conn),
|
||||
cookie: ss.ok(),
|
||||
request: portal.ok(),
|
||||
..DBus::default()
|
||||
};
|
||||
bus.release().await;
|
||||
assert!(bus.cookie.is_none() && bus.request.is_none());
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ slint::include_modules!();
|
||||
mod app;
|
||||
mod config;
|
||||
mod devscript;
|
||||
mod inhibit;
|
||||
mod input;
|
||||
mod palette;
|
||||
mod player;
|
||||
|
||||
@@ -641,6 +641,7 @@ component LoginView inherits Rectangle {
|
||||
in property <string> error;
|
||||
in property <bool> busy;
|
||||
callback submit;
|
||||
callback exit;
|
||||
callback field-clicked(int);
|
||||
public function focus-field(i: int) {
|
||||
if (i == 0) {
|
||||
@@ -665,7 +666,7 @@ component LoginView inherits Rectangle {
|
||||
spacing: 20px * Theme.s;
|
||||
|
||||
HorizontalLayout {
|
||||
alignment: start;
|
||||
alignment: center;
|
||||
Image {
|
||||
source: @image-url("../branding/svg/remus-logo.svg");
|
||||
height: 68px * Theme.s;
|
||||
@@ -711,6 +712,21 @@ component LoginView inherits Rectangle {
|
||||
clicked => { root.submit(); }
|
||||
}
|
||||
}
|
||||
// Secondary to Connect: outlined, no fill, and only lit when focused.
|
||||
Rectangle {
|
||||
height: 46px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: root.focus-index == 4 ? Theme.focus : Theme.line;
|
||||
Text {
|
||||
text: "Exit";
|
||||
font-size: 17px * Theme.s;
|
||||
color: root.focus-index == 4 ? Theme.text : Theme.muted;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.exit(); }
|
||||
}
|
||||
}
|
||||
if root.error != "": Text {
|
||||
text: root.error;
|
||||
font-size: 15px * Theme.s;
|
||||
@@ -740,6 +756,9 @@ component NowPlayingView inherits Rectangle {
|
||||
in property <string> duration;
|
||||
in property <bool> paused;
|
||||
in property <bool> has-track;
|
||||
// True while the cover turns away; the app swaps the cover at edge-on and
|
||||
// sets it back to false to turn the new one in.
|
||||
in property <bool> flip-out;
|
||||
in property <[Item]> queue;
|
||||
in property <int> queue-count;
|
||||
in property <int> queue-selected;
|
||||
@@ -770,9 +789,11 @@ component NowPlayingView inherits Rectangle {
|
||||
spacing: 10px * Theme.s;
|
||||
width: root.art-size;
|
||||
|
||||
Art {
|
||||
art := Art {
|
||||
width: root.art-size;
|
||||
height: root.art-size;
|
||||
// Set here so the turned state below has a value to return to.
|
||||
transform-scale-x: 100%;
|
||||
source: root.cover;
|
||||
has-image: root.has-cover;
|
||||
tint: root.tint;
|
||||
@@ -857,6 +878,20 @@ component NowPlayingView inherits Rectangle {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A flip around the vertical axis, faked by squashing the width: Slint has
|
||||
// no perspective. The turn back overshoots a little and settles.
|
||||
states [
|
||||
turned when root.flip-out: {
|
||||
art.transform-scale-x: 0%;
|
||||
in {
|
||||
animate art.transform-scale-x { duration: 170ms; easing: ease-in; }
|
||||
}
|
||||
out {
|
||||
animate art.transform-scale-x { duration: 380ms; easing: cubic-bezier(0.34, 1.5, 0.64, 1); }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
export component AppWindow inherits Window {
|
||||
@@ -920,6 +955,7 @@ export component AppWindow inherits Window {
|
||||
in property <string> np-position;
|
||||
in property <string> np-duration;
|
||||
in property <bool> np-paused;
|
||||
in property <bool> np-flip-out;
|
||||
in property <[Item]> queue-items;
|
||||
in property <int> queue-count;
|
||||
in property <int> queue-selected;
|
||||
@@ -999,6 +1035,7 @@ export component AppWindow inherits Window {
|
||||
error: root.login-error;
|
||||
busy: root.login-busy;
|
||||
submit => { root.login-submit(); }
|
||||
exit => { root.action(Action.quit); }
|
||||
field-clicked(i) => { root.login-field-clicked(i); }
|
||||
}
|
||||
|
||||
@@ -1080,6 +1117,7 @@ export component AppWindow inherits Window {
|
||||
duration: root.np-duration;
|
||||
paused: root.np-paused;
|
||||
has-track: root.np-has-track;
|
||||
flip-out: root.np-flip-out;
|
||||
queue: root.queue-items;
|
||||
queue-count: root.queue-count;
|
||||
queue-selected: root.queue-selected;
|
||||
|
||||