storm/cthulhu
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report wine-access version if available in version commands.

Browse Source
This commit is contained in:
Storm Dragon committed 2026-10-24 15:19:43 -04:00
1 parent 7c032a5f6e
commit 133953e972
10 files changed
+144 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/version/version.go
+4 -1
View File
@@ -30,11 +30,14 @@ func String() string {
return Name + " screen reader version " + Build + "-" + Channel
}
func Details(atspiVersion, sessionType, sessionDesktop string) string {
func Details(atspiVersion, sessionType, sessionDesktop, wineVersion string) string {
details := String() + ", AT-SPI2 version: " + atspiVersion
session := strings.TrimSpace(sessionType + " " + sessionDesktop)
if session != "" {
details += ", Session: " + session
}
if wineVersion != "" {
details += ", wine-access " + wineVersion
}
return details
}
internal/version/version_test.go
+12 -2
View File
@@ -42,12 +42,22 @@ func TestStringUsesCurrentVersionByDefault(t *testing.T) {
}
func TestDetailsIncludesATSPIAndSession(t *testing.T) {
got := Details("2.58.0", "x11", "GNOME")
got := Details("2.58.0", "x11", "GNOME", "")
want := "Cthulhu screen reader version " + Version + "-" + Channel + ", AT-SPI2 version: 2.58.0, Session: x11 GNOME"
if got != want {
t.Fatalf("Details() = %q, want %q", got, want)
}
if Details("2.58.0", " ", "") != strings.TrimSuffix(got, ", Session: x11 GNOME") {
if Details("2.58.0", " ", "", "") != strings.TrimSuffix(got, ", Session: x11 GNOME") {
t.Fatal("empty session information was included")
}
}
func TestDetailsIncludesOptionalWineAccess(t *testing.T) {
base := Details("2.58.0", "x11", "GNOME", "")
if got := Details("2.58.0", "x11", "GNOME", "2026.10.24"); got != base+", wine-access 2026.10.24" {
t.Fatalf("Details() = %q", got)
}
if got := Details("2.58.0", "x11", "GNOME", ""); got != base {
t.Fatalf("missing helper changed details: %q", got)
}
}