python-mpv-jsonipc 1.2.1__tar.gz → 1.2.3__tar.gz

{python-mpv-jsonipc-1.2.1 → python_mpv_jsonipc-1.2.3}/PKG-INFO

@@ -1,17 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-mpv-jsonipc
-Version: 1.2.1
+Version: 1.2.3
 Summary: Python API to MPV using JSON IPC
-Home-page: https://github.com/iwalton3/python-mpv-jsonipc
-Author: Izzie Walton
-Author-email: izzie@iwalton.com
-License: Apache-2.0
+Author-email: Izzie Walton <izzie@iwalton.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/iwalton3/python-mpv-jsonipc
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Dynamic: license-file
 
 # Python MPV JSONIPC
 

python_mpv_jsonipc-1.2.3/pyproject.toml

@@ -0,0 +1,25 @@
+[build-system]
+requires = ["setuptools>=77.0.3"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-mpv-jsonipc"
+version = "1.2.3"
+description = "Python API to MPV using JSON IPC"
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE.md"]
+authors = [
+    { name = "Izzie Walton", email = "izzie@iwalton.com" },
+]
+requires-python = ">=3.6"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+
+[project.urls]
+Homepage = "https://github.com/iwalton3/python-mpv-jsonipc"
+
+[tool.setuptools]
+py-modules = ["python_mpv_jsonipc"]

{python-mpv-jsonipc-1.2.1 → python_mpv_jsonipc-1.2.3}/python_mpv_jsonipc.egg-info/PKG-INFO

@@ -1,17 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-mpv-jsonipc
-Version: 1.2.1
+Version: 1.2.3
 Summary: Python API to MPV using JSON IPC
-Home-page: https://github.com/iwalton3/python-mpv-jsonipc
-Author: Izzie Walton
-Author-email: izzie@iwalton.com
-License: Apache-2.0
+Author-email: Izzie Walton <izzie@iwalton.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/iwalton3/python-mpv-jsonipc
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Dynamic: license-file
 
 # Python MPV JSONIPC
 

{python-mpv-jsonipc-1.2.1 → python_mpv_jsonipc-1.2.3}/python_mpv_jsonipc.egg-info/SOURCES.txt

@@ -1,7 +1,7 @@
 LICENSE.md
 README.md
+pyproject.toml
 python_mpv_jsonipc.py
-setup.py
 python_mpv_jsonipc.egg-info/PKG-INFO
 python_mpv_jsonipc.egg-info/SOURCES.txt
 python_mpv_jsonipc.egg-info/dependency_links.txt

{python-mpv-jsonipc-1.2.1 → python_mpv_jsonipc-1.2.3}/python_mpv_jsonipc.py

@@ -52,6 +52,7 @@ class WindowsSocket(threading.Thread):
         ipc_socket = "\\\\.\\pipe\\" + ipc_socket
         self.callback = callback
         self.quit_callback = quit_callback
+        self._stopping = False
 
         access = _winapi.GENERIC_READ | _winapi.GENERIC_WRITE
         limit = 5 # Connection may fail at first. Try 5 times.
@@ -72,9 +73,11 @@ class WindowsSocket(threading.Thread):
             self.callback = lambda data: None
 
         threading.Thread.__init__(self)
+        self.daemon = True
 
     def stop(self, join=True):
         """Terminate the thread."""
+        self._stopping = True
         if self.socket is not None:
             try:
                 self.socket.close()
@@ -116,7 +119,9 @@ class WindowsSocket(threading.Thread):
             if self.quit_callback:
                 self.quit_callback()
         except Exception as ex:
-            log.error("Pipe connection died.", exc_info=1)
+            # Only log if not intentionally stopping
+            if not self._stopping:
+                log.error("Pipe connection died.", exc_info=1)
             if self.quit_callback:
                 self.quit_callback()
 
@@ -137,6 +142,7 @@ class UnixSocket(threading.Thread):
         self.ipc_socket = ipc_socket
         self.callback = callback
         self.quit_callback = quit_callback
+        self._stopping = False
         self.socket = socket.socket(socket.AF_UNIX)
         self.socket.connect(self.ipc_socket)
 
@@ -144,9 +150,11 @@ class UnixSocket(threading.Thread):
             self.callback = lambda data: None
 
         threading.Thread.__init__(self)
+        self.daemon = True
 
     def stop(self, join=True):
         """Terminate the thread."""
+        self._stopping = True
         if self.socket is not None:
             try:
                 self.socket.shutdown(socket.SHUT_WR)
@@ -184,7 +192,9 @@ class UnixSocket(threading.Thread):
                     self.callback(json_data)
                 data = b''
         except Exception as ex:
-            log.error("Socket connection died.", exc_info=1)
+            # Only log if not intentionally stopping
+            if not self._stopping:
+                log.error("Socket connection died.", exc_info=1)
         if self.quit_callback:
             self.quit_callback()
 
@@ -258,9 +268,13 @@ class MPVProcess:
             prop_dict[key] = value
 
     def _mpv_fmt(self, data):
-        if data == True:
+        # Use identity comparison so numeric arguments are preserved. In Python
+        # ``1 == True`` and ``0 == False``, so ``==`` would convert numeric
+        # options such as ``video-scale-x=1`` into ``--video-scale-x=yes``,
+        # which MPV rejects.
+        if data is True:
             return "yes"
-        elif data == False:
+        elif data is False:
             return "no"
         else:
             return data
@@ -356,6 +370,7 @@ class EventHandler(threading.Thread):
         """Create an instance of the thread."""
         self.queue = queue.Queue()
         threading.Thread.__init__(self)
+        self.daemon = True
 
     def put_task(self, func, *args):
         """

python-mpv-jsonipc-1.2.1/setup.py

@@ -1,25 +0,0 @@
-from setuptools import setup
-import os
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setup(
-    name="python-mpv-jsonipc",
-    version="1.2.1",
-    author="Izzie Walton",
-    author_email="izzie@iwalton.com",
-    description="Python API to MPV using JSON IPC",
-    license="Apache-2.0",
-    long_description=open("README.md").read(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/iwalton3/python-mpv-jsonipc",
-    py_modules=["python_mpv_jsonipc"],
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.6",
-    install_requires=[],
-)