From 00ead144bd8728611eb327198a44ab49c44e2743 Mon Sep 17 00:00:00 2001 From: Alberto Sottile Date: Sun, 29 Nov 2020 18:48:03 +0100 Subject: [PATCH 1/2] Move python_mpv_jsonipc to the vendor folder --- syncplay/{players => vendor}/python_mpv_jsonipc/LICENSE.md | 0 syncplay/{players => vendor}/python_mpv_jsonipc/README.md | 0 syncplay/{players => vendor}/python_mpv_jsonipc/__init__.py | 0 syncplay/{players => vendor}/python_mpv_jsonipc/docs.md | 0 .../{players => vendor}/python_mpv_jsonipc/python_mpv_jsonipc.py | 0 syncplay/{players => vendor}/python_mpv_jsonipc/setup.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename syncplay/{players => vendor}/python_mpv_jsonipc/LICENSE.md (100%) rename syncplay/{players => vendor}/python_mpv_jsonipc/README.md (100%) rename syncplay/{players => vendor}/python_mpv_jsonipc/__init__.py (100%) rename syncplay/{players => vendor}/python_mpv_jsonipc/docs.md (100%) rename syncplay/{players => vendor}/python_mpv_jsonipc/python_mpv_jsonipc.py (100%) rename syncplay/{players => vendor}/python_mpv_jsonipc/setup.py (100%) diff --git a/syncplay/players/python_mpv_jsonipc/LICENSE.md b/syncplay/vendor/python_mpv_jsonipc/LICENSE.md similarity index 100% rename from syncplay/players/python_mpv_jsonipc/LICENSE.md rename to syncplay/vendor/python_mpv_jsonipc/LICENSE.md diff --git a/syncplay/players/python_mpv_jsonipc/README.md b/syncplay/vendor/python_mpv_jsonipc/README.md similarity index 100% rename from syncplay/players/python_mpv_jsonipc/README.md rename to syncplay/vendor/python_mpv_jsonipc/README.md diff --git a/syncplay/players/python_mpv_jsonipc/__init__.py b/syncplay/vendor/python_mpv_jsonipc/__init__.py similarity index 100% rename from syncplay/players/python_mpv_jsonipc/__init__.py rename to syncplay/vendor/python_mpv_jsonipc/__init__.py diff --git a/syncplay/players/python_mpv_jsonipc/docs.md b/syncplay/vendor/python_mpv_jsonipc/docs.md similarity index 100% rename from syncplay/players/python_mpv_jsonipc/docs.md rename to syncplay/vendor/python_mpv_jsonipc/docs.md diff --git a/syncplay/players/python_mpv_jsonipc/python_mpv_jsonipc.py b/syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py similarity index 100% rename from syncplay/players/python_mpv_jsonipc/python_mpv_jsonipc.py rename to syncplay/vendor/python_mpv_jsonipc/python_mpv_jsonipc.py diff --git a/syncplay/players/python_mpv_jsonipc/setup.py b/syncplay/vendor/python_mpv_jsonipc/setup.py similarity index 100% rename from syncplay/players/python_mpv_jsonipc/setup.py rename to syncplay/vendor/python_mpv_jsonipc/setup.py From dcb891c8c07a6d4b5010c26ddbf7fcdb0993964f Mon Sep 17 00:00:00 2001 From: Alberto Sottile Date: Sun, 29 Nov 2020 18:51:23 +0100 Subject: [PATCH 2/2] Adapt players code to the new path --- syncplay/players/ipc_iina.py | 2 +- syncplay/players/mpv.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/syncplay/players/ipc_iina.py b/syncplay/players/ipc_iina.py index a91e8ff84..3c16fb6e2 100755 --- a/syncplay/players/ipc_iina.py +++ b/syncplay/players/ipc_iina.py @@ -2,7 +2,7 @@ import subprocess import time -from syncplay.players.python_mpv_jsonipc.python_mpv_jsonipc import log, MPV, MPVError, MPVProcess +from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import log, MPV, MPVError, MPVProcess from syncplay.utils import resourcespath class IINA(MPV): diff --git a/syncplay/players/mpv.py b/syncplay/players/mpv.py index cebc63de1..678eda07c 100755 --- a/syncplay/players/mpv.py +++ b/syncplay/players/mpv.py @@ -9,11 +9,10 @@ from syncplay import constants from syncplay.messages import getMessage +from syncplay.players.basePlayer import BasePlayer from syncplay.utils import isURL, findResourcePath from syncplay.utils import isMacOS, isWindows, isASCII -from syncplay.players.python_mpv_jsonipc.python_mpv_jsonipc import MPV - -from syncplay.players.basePlayer import BasePlayer +from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import MPV class MpvPlayer(BasePlayer): RE_VERSION = re.compile(r'.*mpv (\d+)\.(\d+)\.\d+.*')