internal/system: port connect by name
All checks were successful
Test / Create distribution (push) Successful in 38s
Test / Sandbox (push) Successful in 2m33s
Test / Sandbox (race detector) (push) Successful in 4m42s
Test / Hpkg (push) Successful in 5m1s
Test / Hakurei (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m23s
Test / Flake checks (push) Successful in 1m31s
All checks were successful
Test / Create distribution (push) Successful in 38s
Test / Sandbox (push) Successful in 2m33s
Test / Sandbox (race detector) (push) Successful in 4m42s
Test / Hpkg (push) Successful in 5m1s
Test / Hakurei (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m23s
Test / Flake checks (push) Successful in 1m31s
This behaviour is a bit messy and checks what appears to be a windows-specific environment variable for some reason. Keeping everything intact regardless to match upstream behaviour. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
d837628b4c
commit
503bfc6468
@ -18,10 +18,13 @@ import (
|
|||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"net"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"runtime"
|
"runtime"
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -769,3 +772,63 @@ func (ctx *Context) Close() (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* modules/module-protocol-native/local-socket.c */
|
||||||
|
|
||||||
|
const DEFAULT_SYSTEM_RUNTIME_DIR = "/run/pipewire"
|
||||||
|
|
||||||
|
// connectName connects to a PipeWire remote by name and returns the [net.UnixConn].
|
||||||
|
func connectName(name string, manager bool) (conn *net.UnixConn, err error) {
|
||||||
|
if manager && !strings.HasSuffix(name, "-manager") {
|
||||||
|
return connectName(name+"-manager", false)
|
||||||
|
}
|
||||||
|
|
||||||
|
if path.IsAbs(name) || (len(name) > 0 && name[0] == '@') {
|
||||||
|
return net.DialUnix("unix", nil, &net.UnixAddr{Name: name, Net: "unix"})
|
||||||
|
} else {
|
||||||
|
runtimeDir, ok := os.LookupEnv("PIPEWIRE_RUNTIME_DIR")
|
||||||
|
if !ok || !path.IsAbs(runtimeDir) {
|
||||||
|
runtimeDir, ok = os.LookupEnv("XDG_RUNTIME_DIR")
|
||||||
|
}
|
||||||
|
if !ok || !path.IsAbs(runtimeDir) {
|
||||||
|
// this is cargo culted from windows stuff and has no effect normally;
|
||||||
|
// keeping it to maintain compatibility in case someone sets this
|
||||||
|
runtimeDir, ok = os.LookupEnv("USERPROFILE")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ok || !path.IsAbs(runtimeDir) {
|
||||||
|
runtimeDir = DEFAULT_SYSTEM_RUNTIME_DIR
|
||||||
|
}
|
||||||
|
return net.DialUnix("unix", nil, &net.UnixAddr{Name: path.Join(runtimeDir, name), Net: "unix"})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConnectName connects to a PipeWire remote by name.
|
||||||
|
func ConnectName(name string, manager bool) (ctx *Context, err error) {
|
||||||
|
var props SPADict
|
||||||
|
if manager {
|
||||||
|
props = append(props, SPADictItem{Key: PW_KEY_REMOTE_INTENTION, Value: "manager"})
|
||||||
|
}
|
||||||
|
|
||||||
|
if name == "" {
|
||||||
|
if v, ok := os.LookupEnv("PIPEWIRE_REMOTE"); !ok || v == "" {
|
||||||
|
name = PW_DEFAULT_REMOTE
|
||||||
|
} else {
|
||||||
|
name = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var conn *net.UnixConn
|
||||||
|
if conn, err = connectName(name, manager); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx, err = New(SyscallConn{conn}, props); err != nil {
|
||||||
|
ctx = nil
|
||||||
|
_ = conn.Close()
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connect connects to the PipeWire remote.
|
||||||
|
func Connect(manager bool) (ctx *Context, err error) { return ConnectName("", manager) }
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user