1
0
Fork 0
mirror of https://github.com/jiriks74/presence.nvim synced 2024-12-28 11:02:34 +01:00

fix: make socket path discovery more permissive

Merge pull request #34 from andreykaipov/andrey/socketpaths
This commit is contained in:
Jiří Štefka 2024-02-28 15:54:53 +01:00 committed by GitHub
commit b43882cc60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -531,8 +531,8 @@ function Presence:get_nvim_socket_paths(on_done)
if self.os.is_wsl then if self.os.is_wsl then
-- TODO: There needs to be a better way of doing this... no support for ss/netstat? -- TODO: There needs to be a better way of doing this... no support for ss/netstat?
-- (See https://github.com/microsoft/WSL/issues/2249) -- (See https://github.com/microsoft/WSL/issues/2249)
local cmd_fmt = "for file in %s/nvim*; do echo $file/0; done" local cmd_fmt = "for file in %s/nvim*; do echo $file; done"
local shell_cmd = string.format(cmd_fmt, vim.loop.os_tmpdir() or "/tmp") local shell_cmd = string.format(cmd_fmt, vim.fn.stdpath("run") or "/tmp")
cmd = { cmd = {
"sh", "sh",
@ -558,14 +558,14 @@ function Presence:get_nvim_socket_paths(on_done)
cmd = table.concat({ cmd = table.concat({
"netstat -u", "netstat -u",
[[grep --color=never "nvim.*/0"]], [[grep -E --color=never ".+nvim.+"]],
}, "|") }, "|")
elseif self.os.name == "linux" then elseif self.os.name == "linux" then
if vim.fn.executable("ss") == 1 then if vim.fn.executable("ss") == 1 then
-- Use `ss` if available -- Use `ss` if available
cmd = table.concat({ cmd = table.concat({
"ss -lx", "ss -lx",
[[grep "nvim.*/0"]], [[grep -E ".+nvim.+"]],
}, "|") }, "|")
-- Define ss output parser -- Define ss output parser
@ -576,7 +576,7 @@ function Presence:get_nvim_socket_paths(on_done)
-- Use `netstat` if available -- Use `netstat` if available
cmd = table.concat({ cmd = table.concat({
"netstat -u", "netstat -u",
[[grep --color=never "nvim.*/0"]], [[grep -E --color=never ".+nvim.+"]],
}, "|") }, "|")
-- Define netstat output parser -- Define netstat output parser
@ -1074,15 +1074,13 @@ function Presence:register_and_sync_peer(id, socket)
end end
end end
self:call_remote_method( self:call_remote_method(socket, "sync_self", {
socket, {
"sync_self",
{ {
last_activity = self.last_activity, last_activity = self.last_activity,
peers = peers, peers = peers,
workspaces = self.workspaces, workspaces = self.workspaces,
} } },
) })
end end
-- Register self to any remote Neovim instances -- Register self to any remote Neovim instances
@ -1160,15 +1158,13 @@ function Presence:sync_self_activity()
end end
end end
self:call_remote_method( self:call_remote_method(peer.socket, "sync_peer_activity", {
peer.socket, {
"sync_peer_activity",
{ {
last_activity = self.last_activity, last_activity = self.last_activity,
peers = peers, peers = peers,
workspaces = self.workspaces, workspaces = self.workspaces,
} } },
) })
end end
end end