From 86241b00c28152917c5e91482b43b3eb575b452b Mon Sep 17 00:00:00 2001
From: Alberto Sottile <alby128@gmail.com>
Date: Fri, 4 Dec 2020 23:26:21 +0100
Subject: [PATCH] Move python_mpv_jsonipc in our vendor folder (#369)

* Move python_mpv_jsonipc to the vendor folder

* Adapt players code to the new path
---
 syncplay/players/ipc_iina.py                                 | 2 +-
 syncplay/players/mpv.py                                      | 5 ++---
 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
 .../python_mpv_jsonipc/python_mpv_jsonipc.py                 | 0
 syncplay/{players => vendor}/python_mpv_jsonipc/setup.py     | 0
 8 files changed, 3 insertions(+), 4 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/ipc_iina.py b/syncplay/players/ipc_iina.py
index a91e8ff..3c16fb6 100755
--- a/syncplay/players/ipc_iina.py
+++ b/syncplay/players/ipc_iina.py
@@ -2,7 +2,7 @@ import os.path
 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 cebc63d..678eda0 100755
--- a/syncplay/players/mpv.py
+++ b/syncplay/players/mpv.py
@@ -9,11 +9,10 @@ import ast
 
 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+.*')
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