Consistent naming of constants

Jacalz · Jacalz · commit 6243199dbd58 · 2025-02-11T21:48:36.000+01:00
diff --git a/account/account.go b/account/account.go
@@ -9,8 +9,8 @@ import (
 )
 
 const (
-	accountBaseName     = apis.CallBaseName + ".Account"
-	getUserInfoCallName = accountBaseName + ".GetUserInformation"
+	interfaceName       = apis.CallBaseName + ".Account"
+	getUserInfoCallName = interfaceName + ".GetUserInformation"
 )
 
 // UserInfoOptions holds optional settings for getting user information.
diff --git a/background/background.go b/background/background.go
@@ -3,4 +3,4 @@ package background
 
 import "github.com/rymdport/portal/internal/apis"
 
-const backgroundBaseName = apis.CallBaseName + ".Background"
+const interfaceName = apis.CallBaseName + ".Background"
diff --git a/background/request.go b/background/request.go
@@ -7,7 +7,7 @@ import (
 	"github.com/rymdport/portal/internal/convert"
 )
 
-const requestCallName = backgroundBaseName + ".RequestBackground"
+const requestCallName = interfaceName + ".RequestBackground"
 
 // RequestOptions holds the options used for RequestBackground.
 type RequestOptions struct {
diff --git a/filechooser/filechooser.go b/filechooser/filechooser.go
@@ -8,7 +8,7 @@ import (
 	"github.com/rymdport/portal/internal/apis"
 )
 
-const fileChooserCallName = apis.CallBaseName + ".FileChooser"
+const interfaceName = apis.CallBaseName + ".FileChooser"
 
 func readURIFromResponse(conn *dbus.Conn, call *dbus.Call) ([]string, error) {
 	result, err := apis.ReadResponse(conn, call)
diff --git a/filechooser/open.go b/filechooser/open.go
@@ -6,7 +6,7 @@ import (
 	"github.com/rymdport/portal/internal/convert"
 )
 
-const openFileCallName = fileChooserCallName + ".OpenFile"
+const openFileCallName = interfaceName + ".OpenFile"
 
 // OpenFileOptions contains the options for how files are to be selected.
 type OpenFileOptions struct {
diff --git a/filechooser/save.go b/filechooser/save.go
@@ -7,8 +7,8 @@ import (
 )
 
 const (
-	saveFileCallName  = fileChooserCallName + ".SaveFile"
-	saveFilesCallName = fileChooserCallName + ".SaveFiles"
+	saveFileCallName  = interfaceName + ".SaveFile"
+	saveFilesCallName = interfaceName + ".SaveFiles"
 )
 
 // SaveFileOptions contains the options for how a file is saved.
diff --git a/memorymonitor/memorymonitor.go b/memorymonitor/memorymonitor.go
@@ -3,4 +3,4 @@ package memorymonitor
 
 import "github.com/rymdport/portal/internal/apis"
 
-const memorymonitorBaseName = apis.CallBaseName + ".MemoryMonitor"
+const interfaceName = apis.CallBaseName + ".MemoryMonitor"
diff --git a/memorymonitor/warning.go b/memorymonitor/warning.go
@@ -22,7 +22,7 @@ func OnSignalLowMemoryWarning(callback func(warning LowMemoryWarning)) error {
 
 	if err := conn.AddMatchSignal(
 		dbus.WithMatchObjectPath(apis.ObjectPath),
-		dbus.WithMatchInterface(memorymonitorBaseName),
+		dbus.WithMatchInterface(interfaceName),
 		dbus.WithMatchMember("LowMemoryWarning"),
 	); err != nil {
 		return err
diff --git a/notification/notification.go b/notification/notification.go
@@ -11,9 +11,9 @@ import (
 )
 
 const (
-	notificationBaseName       = apis.CallBaseName + ".Notification"
-	addNotificationCallName    = notificationBaseName + ".AddNotification"
-	removeNotificationCallName = notificationBaseName + ".RemoveNotification"
+	interfaceName              = apis.CallBaseName + ".Notification"
+	addNotificationCallName    = interfaceName + ".AddNotification"
+	removeNotificationCallName = interfaceName + ".RemoveNotification"
 )
 
 // Priority is the priroity of a notification.
diff --git a/openuri/opendir.go b/openuri/opendir.go
@@ -6,7 +6,7 @@ import (
 	"github.com/rymdport/portal/internal/convert"
 )
 
-const openDirCallName = openURIBaseName + ".OpenDirectory"
+const openDirCallName = interfaceName + ".OpenDirectory"
 
 // OpenDirOptions holds optional settings that can be passed to the OpenDir call.
 type OpenDirOptions struct {
diff --git a/openuri/openfile.go b/openuri/openfile.go
@@ -6,7 +6,7 @@ import (
 	"github.com/rymdport/portal/internal/convert"
 )
 
-const openFileCallName = openURIBaseName + ".OpenFile"
+const openFileCallName = interfaceName + ".OpenFile"
 
 // OpenFileOptions holds optional settings that can be passed to the OpenFile call.
 type OpenFileOptions struct {
diff --git a/openuri/openuri.go b/openuri/openuri.go
@@ -9,8 +9,8 @@ import (
 )
 
 const (
-	openURIBaseName = apis.CallBaseName + ".OpenURI"
-	openURICallName = openURIBaseName + ".OpenURI"
+	interfaceName   = apis.CallBaseName + ".OpenURI"
+	openURICallName = interfaceName + ".OpenURI"
 )
 
 // OpenURIOptions holds optional settings that can be passed to the OpenURI call.
diff --git a/settings/changed.go b/settings/changed.go
@@ -22,7 +22,7 @@ func OnSignalSettingChanged(callback func(changed Changed)) error {
 
 	if err := conn.AddMatchSignal(
 		dbus.WithMatchObjectPath(apis.ObjectPath),
-		dbus.WithMatchInterface(settingsCallPath),
+		dbus.WithMatchInterface(interfaceName),
 		dbus.WithMatchMember("SettingChanged"),
 	); err != nil {
 		return err
diff --git a/settings/read.go b/settings/read.go
@@ -6,9 +6,9 @@ import (
 )
 
 const (
-	readCallPath    = settingsCallPath + ".Read"
-	readOneCallPath = settingsCallPath + ".ReadOne"
-	readAllCallPath = settingsCallPath + ".ReadAll"
+	readCallPath    = interfaceName + ".Read"
+	readOneCallPath = interfaceName + ".ReadOne"
+	readAllCallPath = interfaceName + ".ReadAll"
 )
 
 // ReadAll returns all values for the corresponding namespaces passed.
diff --git a/settings/settings.go b/settings/settings.go
@@ -4,4 +4,4 @@ package settings
 
 import "github.com/rymdport/portal/internal/apis"
 
-const settingsCallPath = apis.CallBaseName + ".Settings"
+const interfaceName = apis.CallBaseName + ".Settings"
diff --git a/trash/trash.go b/trash/trash.go
@@ -3,7 +3,4 @@ package trash
 
 import "github.com/rymdport/portal/internal/apis"
 
-const (
-	trashBaseName = apis.CallBaseName + ".Trash"
-	trashCallName = trashBaseName + ".TrashFile"
-)
+const interfaceName = apis.CallBaseName + ".Trash"
diff --git a/trash/trashfile.go b/trash/trashfile.go
@@ -5,6 +5,8 @@ import (
 	"github.com/rymdport/portal/internal/apis"
 )
 
+const trashFileCallName = interfaceName + ".TrashFile"
+
 // TrashResult is the status for sending a file to the trashcan.
 type TrashResult = uint8
 
@@ -25,7 +27,7 @@ func TrashFile(fd uintptr) (TrashResult, error) {
 	}
 
 	obj := conn.Object(apis.ObjectName, apis.ObjectPath)
-	call := obj.Call(trashCallName, 0, dbus.UnixFD(fd))
+	call := obj.Call(trashFileCallName, 0, dbus.UnixFD(fd))
 	if call.Err != nil {
 		return TrashingFailed, call.Err
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const (`
`12`		`- accountBaseName = apis.CallBaseName + ".Account"`
`13`		`- getUserInfoCallName = accountBaseName + ".GetUserInformation"`
	`12`	`+ interfaceName = apis.CallBaseName + ".Account"`
	`13`	`+ getUserInfoCallName = interfaceName + ".GetUserInformation"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// UserInfoOptions holds optional settings for getting user information.`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ package background`
`3`	`3`
`4`	`4`	`import "github.com/rymdport/portal/internal/apis"`
`5`	`5`
`6`		`-const backgroundBaseName = apis.CallBaseName + ".Background"`
	`6`	`+const interfaceName = apis.CallBaseName + ".Background"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/rymdport/portal/internal/convert"`
`8`	`8`	`)`
`9`	`9`
`10`		`-const requestCallName = backgroundBaseName + ".RequestBackground"`
	`10`	`+const requestCallName = interfaceName + ".RequestBackground"`
`11`	`11`
`12`	`12`	`// RequestOptions holds the options used for RequestBackground.`
`13`	`13`	`type RequestOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/rymdport/portal/internal/apis"`
`9`	`9`	`)`
`10`	`10`
`11`		`-const fileChooserCallName = apis.CallBaseName + ".FileChooser"`
	`11`	`+const interfaceName = apis.CallBaseName + ".FileChooser"`
`12`	`12`
`13`	`13`	`func readURIFromResponse(conn dbus.Conn, call dbus.Call) ([]string, error) {`
`14`	`14`	`result, err := apis.ReadResponse(conn, call)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/rymdport/portal/internal/convert"`
`7`	`7`	`)`
`8`	`8`
`9`		`-const openFileCallName = fileChooserCallName + ".OpenFile"`
	`9`	`+const openFileCallName = interfaceName + ".OpenFile"`
`10`	`10`
`11`	`11`	`// OpenFileOptions contains the options for how files are to be selected.`
`12`	`12`	`type OpenFileOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const (`
`10`		`- saveFileCallName = fileChooserCallName + ".SaveFile"`
`11`		`- saveFilesCallName = fileChooserCallName + ".SaveFiles"`
	`10`	`+ saveFileCallName = interfaceName + ".SaveFile"`
	`11`	`+ saveFilesCallName = interfaceName + ".SaveFiles"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// SaveFileOptions contains the options for how a file is saved.`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ package memorymonitor`
`3`	`3`
`4`	`4`	`import "github.com/rymdport/portal/internal/apis"`
`5`	`5`
`6`		`-const memorymonitorBaseName = apis.CallBaseName + ".MemoryMonitor"`
	`6`	`+const interfaceName = apis.CallBaseName + ".MemoryMonitor"`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
`14`		`- notificationBaseName = apis.CallBaseName + ".Notification"`
`15`		`- addNotificationCallName = notificationBaseName + ".AddNotification"`
`16`		`- removeNotificationCallName = notificationBaseName + ".RemoveNotification"`
	`14`	`+ interfaceName = apis.CallBaseName + ".Notification"`
	`15`	`+ addNotificationCallName = interfaceName + ".AddNotification"`
	`16`	`+ removeNotificationCallName = interfaceName + ".RemoveNotification"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// Priority is the priroity of a notification.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/rymdport/portal/internal/convert"`
`7`	`7`	`)`
`8`	`8`
`9`		`-const openDirCallName = openURIBaseName + ".OpenDirectory"`
	`9`	`+const openDirCallName = interfaceName + ".OpenDirectory"`
`10`	`10`
`11`	`11`	`// OpenDirOptions holds optional settings that can be passed to the OpenDir call.`
`12`	`12`	`type OpenDirOptions struct {`