Skip to content
Snippets Groups Projects

use XDG_RUNTIME_DIR instead of /tmp

Merged Johannes Knödtel requested to merge feature-xdg-dirs into main
1 file
+ 12
1
Compare changes
  • Side-by-side
  • Inline
+ 12
1
@@ -11,6 +11,8 @@ import time
@@ -11,6 +11,8 @@ import time
import logging
import logging
import argparse
import argparse
import websockets
import websockets
 
import pathlib
 
import tempfile
class MPV:
class MPV:
@@ -159,7 +161,14 @@ running""",
@@ -159,7 +161,14 @@ running""",
del args.start_mpv
del args.start_mpv
if args.mpv_socket is None:
if args.mpv_socket is None:
args.mpv_socket = "/tmp/mpvsocket"
if "XDG_RUNTIME_DIR" in os.environ:
 
args.tmp_dir = None
 
xdg_runtime_dir = os.environ["XDG_RUNTIME_DIR"]
 
else:
 
args.tmp_dir = tempfile.TemporaryDirectory(dir="/tmp", prefix="mpvsync-")
 
xdg_runtime_dir = args.tmp_dir.name
 
 
args.mpv_socket = pathlib.Path(xdg_runtime_dir) / "mpvsocket"
elif not is_socket(args.mpv_socket):
elif not is_socket(args.mpv_socket):
parser.error(
parser.error(
f"""The given socket path {args.mpv_socket} is not a UNIX socket"""
f"""The given socket path {args.mpv_socket} is not a UNIX socket"""
@@ -183,6 +192,8 @@ def main():
@@ -183,6 +192,8 @@ def main():
asyncio.run(async_main(args))
asyncio.run(async_main(args))
except KeyboardInterrupt:
except KeyboardInterrupt:
logging.info("Got KeyboardInterrupt. Terminating gracefully.")
logging.info("Got KeyboardInterrupt. Terminating gracefully.")
 
if args.tmp_dir is not None:
 
args.tmp_dir.cleanup()
sys.exit(0)
sys.exit(0)
Loading