anufrievroman/waypaper
1
1
Fork 0
mirror of https://github.com/anufrievroman/waypaper.git synced 2024-11-22 07:22:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reimplementing mpvpaper launch

Browse Source 
This addresses issue #12. Now it works for all monitors at least.
This commit is contained in:
Roman 2024-11-15 16:13:42 +09:00
parent 1ade5f7745
commit 07cc7d40bc
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
waypaper/changer.py
View File

@ -35,31 +35,38 @@ def change_wallpaper(image_path: Path, cf: Config, monitor: str, txt: Chinese|En
# mpvpaper backend:
elif cf.backend == "mpvpaper":
# Kill previous mpvpaper instances:
try:
subprocess.check_output(["pgrep", "mpvpaper"], encoding='utf-8')
subprocess.Popen(["killall", ".mpvpaper-wrapp"])
time.sleep(0.5)
except subprocess.CalledProcessError:
pass
fill_types = {
"fill": "panscan=1.0",
"fit": "panscan=0.0",
"center": "",
"stretch": "--keepaspect=no",
"tile": "",
}
}
fill = fill_types[cf.fill_option.lower()]
command = ["mpvpaper"]
command.extend(["-o", f"no-audio loop {fill} --background-color='{cf.color}'"])
if monitor != "All":
command.extend([monitor])
else:
command.extend('*')
command.extend([image_path])
subprocess.Popen(command)
# If mpvpaper is already active, try to call that process in that socket:
try:
subprocess.check_output(["pgrep", "mpvpaper"], encoding='utf-8')
time.sleep(0.2)
print("Detected running mpvpaper, now trying to call mpvpaper socket")
update_command = f"echo 'loadfile \"{image_path}\"' | socat - /tmp/mpv-socket-waypaper"
subprocess.Popen(update_command, shell=True)
# Otherwise, if no mpv running, create a new process in a new socket:
except subprocess.CalledProcessError:
command = ["mpvpaper"]
command.extend(["--fork", "-o", f"input-ipc-server=/tmp/mpv-socket-waypaper no-audio loop {fill} --background-color='{cf.color}'"])
print("Detected no running mpvpaper, starting new mpvpaper process")
# Specify the monitor (does not work yet):
# if monitor != "All":
# command.extend([monitor])
# else:
# command.extend('*')
command.extend(['*'])
command.extend([image_path])
subprocess.Popen(command)
print(f"{txt.msg_setwith} {cf.backend}")
# swww backend: