summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-03-28 00:38:29 +0100
committerwm4 <wm4@nowhere>2020-03-28 00:38:29 +0100
commit518bd4c306d50e6772c39c5d7395b9d10b9386da (patch)
tree36da8a525bbc761dac3e5bcd145f4e69437d8956 /TOOLS
parentdf0d8cda08463b291203812ec475ca185bc8e947 (diff)
downloadmpv-518bd4c306d50e6772c39c5d7395b9d10b9386da.tar.bz2
mpv-518bd4c306d50e6772c39c5d7395b9d10b9386da.tar.xz
umpv: change from legacy FIFO to socket
--input-file is deprecated, and the JSON IPC is saner anyway.
Diffstat (limited to 'TOOLS')
-rwxr-xr-xTOOLS/umpv37
1 files changed, 14 insertions, 23 deletions
diff --git a/TOOLS/umpv b/TOOLS/umpv
index 0080b44ffb..4beac03072 100755
--- a/TOOLS/umpv
+++ b/TOOLS/umpv
@@ -19,10 +19,6 @@ will typically just fill ~/.xsession-errors with garbage.
mpv will terminate if there are no more files to play, and running the umpv
script after that will start a new mpv instance.
-Note that you can control the mpv instance by writing to the command fifo:
-
- echo "cycle fullscreen" > ~/.umpv_fifo
-
Note: you can supply custom mpv path and options with the MPV environment
variable. The environment variable will be split on whitespace, and the
first item is used as path to mpv binary and the rest is passed as options
@@ -32,6 +28,7 @@ Note: you can supply custom mpv path and options with the MPV environment
import sys
import os
+import socket
import errno
import subprocess
import fcntl
@@ -57,40 +54,34 @@ def make_abs(filename):
return filename
files = [make_abs(f) for f in files]
-FIFO = os.path.join(os.getenv("HOME"), ".umpv_fifo")
+SOCK = os.path.join(os.getenv("HOME"), ".umpv_socket")
-fifo_fd = -1
+sock = None
try:
- fifo_fd = os.open(FIFO, os.O_NONBLOCK | os.O_WRONLY)
-except OSError as e:
- if e.errno == errno.ENXIO:
- pass # pipe has no writer
+ sock = socket.socket(socket.AF_UNIX)
+ sock.connect(SOCK)
+except socket.error as e:
+ if e.errno == errno.ECONNREFUSED:
+ sock = None
+ pass # abandoned socket
elif e.errno == errno.ENOENT:
+ sock = None
pass # doesn't exist
else:
raise e
-if fifo_fd >= 0:
+if sock:
# Unhandled race condition: what if mpv is terminating right now?
- fcntl.fcntl(fifo_fd, fcntl.F_SETFL, 0) # set blocking mode
- fifo = os.fdopen(fifo_fd, "w")
for f in files:
# escape: \ \n "
f = f.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n")
f = "\"" + f + "\""
- fifo.write("raw loadfile " + f + " append\n")
+ sock.send("raw loadfile " + f + " append\n")
else:
- # Recreate pipe if it doesn't already exist.
- # Also makes sure it's safe, and no other user can create a bogus pipe
- # that breaks security.
- try:
- os.unlink(FIFO)
- except OSError as e:
- pass
- os.mkfifo(FIFO, 0o600)
+ # Let mpv recreate socket if it doesn't already exist.
opts = (os.getenv("MPV") or "mpv").split()
- opts.extend(["--no-terminal", "--force-window", "--input-file=" + FIFO,
+ opts.extend(["--no-terminal", "--force-window", "--input-ipc-server=" + SOCK,
"--"])
opts.extend(files)