python-mpv-jsonipc 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

{python_mpv_jsonipc-1.2.0.dist-info → python_mpv_jsonipc-1.2.2.dist-info}/METADATA

@@ -1,17 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-mpv-jsonipc
-Version: 1.2.0
+Version: 1.2.2
 Summary: Python API to MPV using JSON IPC
-Home-page: https://github.com/iwalton3/python-mpv-jsonipc
-Author: Ian Walton
-Author-email: iwalton3@gmail.com
-License: Apache-2.0
-Platform: UNKNOWN
+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
 
@@ -69,5 +68,3 @@ def handle_eof(name, value):
 # Or simply wait for the value to change once.
 mpv.wait_for_property("duration")
 ```
-
-

python_mpv_jsonipc-1.2.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+python_mpv_jsonipc.py,sha256=McfALK21Mp48Ekpg8wszSnHlSExtlrpsrw90i9syvng,24041
+python_mpv_jsonipc-1.2.2.dist-info/licenses/LICENSE.md,sha256=7GQBUOA3dNG1Jk-yaPOCncNnRVURCRMev23QpZ1ew-s,10495
+python_mpv_jsonipc-1.2.2.dist-info/METADATA,sha256=AjVHMMb5-bKwYuf89xM3J9jLRPX17v-iXkMvuft8AF0,2277
+python_mpv_jsonipc-1.2.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_mpv_jsonipc-1.2.2.dist-info/top_level.txt,sha256=nGk4yjpVHKmIrL39XdGD2PhCeWF0oMjwey0nsNOd2TM,19
+python_mpv_jsonipc-1.2.2.dist-info/RECORD,,

{python_mpv_jsonipc-1.2.0.dist-info → python_mpv_jsonipc-1.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_mpv_jsonipc.py

@@ -38,7 +38,7 @@ class MPVError(Exception):
 class WindowsSocket(threading.Thread):
     """
     Wraps a Windows named pipe in a high-level interface. (Internal)
-    
+
     Data is automatically encoded and decoded as JSON. The callback
     function will be called for each inbound message.
     """
@@ -52,7 +52,8 @@ 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.
         for _ in range(limit):
@@ -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,14 +119,16 @@ 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()
 
 class UnixSocket(threading.Thread):
     """
     Wraps a Unix/Linux socket in a high-level interface. (Internal)
-    
+
     Data is automatically encoded and decoded as JSON. The callback
     function will be called for each inbound message.
     """
@@ -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()
 
@@ -206,7 +216,7 @@ class MPVProcess:
                 mpv_location = "mpv.exe"
             else:
                 mpv_location = "mpv"
-        
+
         log.debug("Staring MPV from {0}.".format(mpv_location))
         ipc_socket_name = ipc_socket
         if os.name == 'nt':
@@ -248,7 +258,7 @@ class MPVProcess:
         else:
             self.process.terminate()
             raise MPVError("MPV start timed out.")
-        
+
         if not ipc_exists or self.process.returncode is not None:
             self.process.terminate()
             raise MPVError("MPV not started.")
@@ -290,7 +300,7 @@ class MPVInter:
         self.quit_callback = quit_callback
         if self.callback is None:
             self.callback = lambda event, data: None
-        
+
         self.socket = Socket(ipc_socket, self.event_callback, self.quit_callback)
         self.socket.start()
         self.command_id = 1
@@ -298,7 +308,7 @@ class MPVInter:
         self.socket_lock = threading.Lock()
         self.cid_result = {}
         self.cid_wait = {}
-    
+
     def stop(self, join=True):
         """Terminate the underlying connection."""
         self.socket.stop(join)
@@ -310,11 +320,11 @@ class MPVInter:
             self.cid_wait[data["request_id"]].set()
         elif "event" in data:
             self.callback(data["event"], data)
-    
+
     def command(self, command, *args):
         """
         Issue a command to MPV. Will block until completed or timeout is reached.
-        
+
         *command* is the name of the MPV command
 
         All further arguments are forwarded to the MPV command.
@@ -356,13 +366,14 @@ 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):
         """
         Put a new task to the thread.
-        
+
         *func* is the function to call
-        
+
         All further arguments are forwarded to *func*.
         """
         self.queue.put((func, args))
@@ -386,15 +397,15 @@ class EventHandler(threading.Thread):
 class MPV:
     """
     The main MPV interface class. Use this to control MPV.
-    
+
     This will expose all mpv commands as callable methods and all properties.
     You can set properties and call the commands directly.
-    
+
     Please note that if you are using a really old MPV version, a fallback command
     list is used. Not all commands may actually work when this fallback is used.
     """
     def __init__(self, start_mpv=True, ipc_socket=None, mpv_location=None,
-                 log_handler=None, loglevel=None, quit_callback=None, **kwargs):
+                 log_handler=None, loglevel=None, quit_callback=None, start_retries=5, start_retry_delay_ms=1000, **kwargs):
         """
         Create the interface to MPV and process instance.
 
@@ -424,13 +435,14 @@ class MPV:
                 ipc_socket = "/tmp/{0}".format(rand_file)
 
         if start_mpv:
-            # Attempt to start MPV 3 times.
-            for i in range(3):
+            # Attempt to start MPV multiple times.
+            for i in range(start_retries):
                 try:
                     self.mpv_process = MPVProcess(ipc_socket, mpv_location, **kwargs)
                     break
                 except MPVError:
                     log.warning("MPV start failed.", exc_info=1)
+                    time.sleep(start_retry_delay_ms / 1000)
                     continue
             else:
                 raise MPVError("MPV process retry limit reached.")
@@ -455,7 +467,7 @@ class MPV:
         self.observer_lock = threading.Lock()
         self.keybind_id = 1
         self.keybind_lock = threading.Lock()
-        
+
         if log_handler is not None and loglevel is not None:
             self.command("request_log_messages", loglevel)
             @self.on_event("log-message")
@@ -582,7 +594,7 @@ class MPV:
             self.bind_property_observer(name, func)
             return func
         return wrapper
-    
+
     def wait_for_property(self, name):
         """
         Waits for the value of a property to change.
@@ -630,11 +642,11 @@ class MPV:
         """
         Send a command to MPV. All commands are bound to the class by default,
         except JSON IPC specific commands. This may also be useful to retain
-        compatibility with python-mpv, as it does not bind all of the commands. 
+        compatibility with python-mpv, as it does not bind all of the commands.
 
         *command* is the command name.
 
-        All further arguments are forwarded to the MPV command. 
+        All further arguments are forwarded to the MPV command.
         """
         return self.mpv_inter.command(command, *args)
 

python_mpv_jsonipc-1.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-python_mpv_jsonipc.py,sha256=F6rSnv0QKkqR1XKYkao0aXFqsXGr-22EV9gkXU7dHCA,23629
-python_mpv_jsonipc-1.2.0.dist-info/LICENSE.md,sha256=7GQBUOA3dNG1Jk-yaPOCncNnRVURCRMev23QpZ1ew-s,10495
-python_mpv_jsonipc-1.2.0.dist-info/METADATA,sha256=1gom4VqEf_32RzxScob2OuXe3cAnNAeDHktQwjLK-eA,2295
-python_mpv_jsonipc-1.2.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-python_mpv_jsonipc-1.2.0.dist-info/top_level.txt,sha256=nGk4yjpVHKmIrL39XdGD2PhCeWF0oMjwey0nsNOd2TM,19
-python_mpv_jsonipc-1.2.0.dist-info/RECORD,,