Terminate self when mpv closes by default.

iwalton3 · iwalton3 · commit e35114c7228a · 2020-05-12T14:05:50.000-04:00
diff --git a/python_mpv_jsonipc.py b/python_mpv_jsonipc.py
@@ -73,11 +73,12 @@ def __init__(self, ipc_socket, callback=None, quit_callback=None):
 
         threading.Thread.__init__(self)
 
-    def stop(self):
+    def stop(self, join=True):
         """Terminate the thread."""
         if self.socket is not None:
             self.socket.close()
-        self.join()
+        if join:
+            self.join()
 
     def send(self, data):
         """Send *data* to the pipe, encoded as JSON."""
@@ -132,12 +133,17 @@ def __init__(self, ipc_socket, callback=None, quit_callback=None):
 
         threading.Thread.__init__(self)
 
-    def stop(self):
+    def stop(self, join=True):
         """Terminate the thread."""
         if self.socket is not None:
-            self.socket.shutdown(socket.SHUT_WR)
-            self.socket.close()
-        self.join()
+            try:
+                self.socket.shutdown(socket.SHUT_WR)
+                self.socket.close()
+                self.socket = None
+            except OSError:
+                pass # Ignore socket close failure.
+        if join:
+            self.join()
 
     def send(self, data):
         """Send *data* to the socket, encoded as JSON."""
@@ -267,9 +273,9 @@ def __init__(self, ipc_socket, callback=None, quit_callback=None):
         self.cid_result = {}
         self.cid_wait = {}
     
-    def stop(self):
+    def stop(self, join=True):
         """Terminate the underlying connection."""
-        self.socket.stop()
+        self.socket.stop(join)
 
     def event_callback(self, data):
         """Internal callback for recieving events from MPV."""
@@ -335,10 +341,10 @@ def put_task(self, func, *args):
         """
         self.queue.put((func, args))
 
-    def stop(self):
+    def stop(self, join=True):
         """Terminate the thread."""
         self.queue.put("quit")
-        self.join()
+        self.join(join)
 
     def run(self):
         """Process socket events. Do not run this directly. Use *start*."""
@@ -381,6 +387,7 @@ def __init__(self, start_mpv=True, ipc_socket=None, mpv_location=None,
         self.property_bindings = {}
         self.mpv_process = None
         self.mpv_inter = None
+        self.quit_callback = quit_callback
         self.event_handler = EventHandler()
         self.event_handler.start()
         if ipc_socket is None:
@@ -402,7 +409,7 @@ def __init__(self, start_mpv=True, ipc_socket=None, mpv_location=None,
             else:
                 raise MPVError("MPV process retry limit reached.")
 
-        self.mpv_inter = MPVInter(ipc_socket, self._callback, quit_callback)
+        self.mpv_inter = MPVInter(ipc_socket, self._callback, self._quit_callback)
         self.properties = set(x.replace("-", "_") for x in self.command("get_property", "property-list"))
         try:
             command_list = [x["name"] for x in self.command("get_property", "command-list")]
@@ -437,6 +444,14 @@ def client_message_handler(data):
             if len(args) == 2 and args[0] == "custom-bind":
                 self.event_handler.put_task(self.key_bindings[args[1]])
 
+    def _quit_callback(self):
+        """
+        Internal handler for quit events.
+        """
+        if self.quit_callback:
+            self.quit_callback()
+        self.terminate(join=False)
+
     def bind_event(self, name, callback):
         """
         Bind a callback to an MPV event.
@@ -574,13 +589,13 @@ def play(self, url):
     def __del__(self):
         self.terminate()
 
-    def terminate(self):
+    def terminate(self, join=True):
         """Terminate the connection to MPV and process (if *start_mpv* is used)."""
         if self.mpv_process:
             self.mpv_process.stop()
         if self.mpv_inter:
-            self.mpv_inter.stop()
-        self.event_handler.stop()
+            self.mpv_inter.stop(join)
+        self.event_handler.stop(join)
 
     def command(self, command, *args):
         """
