socat is no longer needed to use mpv

Author: s-n-g

Changelog

@@ -1,5 +1,6 @@
 2019-12-22 s-n-g
     * Fixing volume issue with mpv
+    * socat is no longer needed to use mpv
 
 2019-12-14 s-n-g
     * Version 0.8.6

README.html

@@ -54,7 +54,6 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <ul>
 <li>python 2.7+/3.5+</li>
 <li>MPV, MPlayer or VLC installed and in your path.</li>
-<li><a target="_blank" href="http://www.dest-unreach.org/socat/">socat</a> (if you wish to use MPV)</li>
 </ul>
 <h2 id="installation">Installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p>The best way to install <strong>PyRadio</strong> is via a distribution package, if one exists (e.g. <em>Arch Linux</em> and derivatives can install <a target="_blank" href="https://aur.archlinux.org/packages/pyradio-git/">pyradio-git</a> from AUR).</p>
@@ -246,7 +245,6 @@ <h3 id="finding-the-right-encoding">Finding the right encoding</h3>
 <h2 id="player-detection-selection">Player detection / selection <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p><strong>PyRadio</strong> is basically built around the existence of a valid media player it can use. Thus, it will auto detect the existence of its supported players upon its execution.</p>
 <p>Currently, it supports MPV, MPlayer and VLC, and it will look for them in that order. If none of them is found, the program will terminate with an error.</p>
-<p>MPV will be used only when the <a target="_blank" href="http://www.dest-unreach.org/socat/">socat</a> multipurpose relay is also installed.</p>
 <p>Users can alter this default behavior by using the <strong><em>-u</em></strong> command line option. This option will permit the user either to specify the player to use, or change the detection order.</p>
 <p>Example:</p>
 <pre>pyradio -u vlc</pre>

README.md

@@ -30,7 +30,6 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
 * python 2.7+/3.5+
 * MPV, MPlayer or VLC installed and in your path.
-* [socat](http://www.dest-unreach.org/socat/) (if you wish to use MPV)
 
 ## Installation
 
@@ -338,8 +337,6 @@ replacing **2.7** with specific version: **3.0** up to current python version.
 
 Currently, it supports MPV, MPlayer and VLC, and it will look for them in that order. If none of them is found, the program will terminate with an error.
 
-MPV will be used only when the [socat](http://www.dest-unreach.org/socat/) multipurpose relay is also installed.
-
 Users can alter this default behavior by using the ***-u*** command line option. This option will permit the user either to specify the player to use, or change the detection order.
 
 Example:

build.html

@@ -71,7 +71,7 @@ <h3 id="macos">macOS</h3>
 <pre>brew install gnu-sed --default-names</pre>
 <p>Now it’s time to install a media player. You are free to install any one of them or even more than one…</p>
 <p>1. <strong><em>MPV</em></strong></p>
-<pre>brew install mpv socat</pre>
+<pre>brew install mpv</pre>
 <p>2. <strong><em>MPlayer</em></strong></p>
 <pre>brew install mplayer</pre>
 <p>3. <strong><em>VLC</em></strong></p>

build.md

@@ -71,7 +71,7 @@ Now it's time to install a media player. You are free to install any one of them
 1\. ***MPV***
 
 ```
-brew install mpv socat
+brew install mpv
 ```
 
 2\. ***MPlayer***

pyradio.1

@@ -392,8 +392,6 @@ A valid encoding list can be found at:
 .PP
 Currently, it supports \fIMPV\fR, \fIMPlayer\fR and \fIVLC\fR, and it will look for them in that order. If none of them is found, the program will terminate with an error.
 .PP
-MPV will be used only when the \fIsocat\fR multipurpose relay is also installed.
-.PP
 Users can alter this default behavior by using the \fB-u\fR command line option. This option will permit the user either to specify the player to use, or change the detection order.
 .PP
 Example:

pyradio/player.py

@@ -109,6 +109,7 @@ def _do_save_volume(self, config_string):
                         with open(config_file, "w") as c_file:
                             c_file.write(config_string)
                         self.volume = -1
+                        self.PROFILE_FROM_USER = True
                     except:
                         if (logger.isEnabledFor(logging.DEBUG)):
                             logger.debug(log_strings[2].format(config_file))
@@ -504,6 +505,14 @@ class MpvPlayer(Player):
     if os.path.exists(mpvsocket):
         os.system("rm " + mpvsocket + " 2>/dev/null");
 
+    commands = {
+            'volume_up':   b'{ "command": ["cycle", "volume", "up"] }\n',
+            'volume_down': b'{ "command": ["cycle", "volume", "down"] }\n',
+            'mute':        b'{ "command": ["cycle", "mute"] }\n',
+            'pause':       b'{ "command": ["pause"] }\n',
+            'quit':        b'{ "command": ["quit"]}\n',
+            }
+
     def save_volume(self):
         """ Saving Volume in Windows does not work;
             Profiles not supported... """
@@ -567,26 +576,28 @@ def _buildStartOpts(self, streamUrl, playList=False):
 
     def _mute(self):
         """ mute mpv """
-        os.system("echo 'cycle mute' | socat - " + self.mpvsocket + " 2>/dev/null");
+        ret = self._send_mpv_command('mute')
+        while not ret:
+            ret = self._send_mpv_command('mute')
 
     def pause(self):
         """ pause streaming (if possible) """
-        os.system("echo 'cycle pause' | socat - " + self.mpvsocket + " 2>/dev/null");
+        self._send_mpv_command('pause')
 
     def _stop(self):
         """ exit pyradio (and kill mpv instance) """
-        os.system("echo 'quit' | socat - " + self.mpvsocket + " 2>/dev/null");
+        self._send_mpv_command('quit')
         os.system("rm " + self.mpvsocket + " 2>/dev/null");
 
     def _volume_up(self):
         """ increase mpv's volume """
-        os.system("echo 'cycle volume' | socat - " + self.mpvsocket + " 2>/dev/null");
-        self._diaplay_mpv_volume_value()
+        self._send_mpv_command('volume_up')
+        self._display_mpv_volume_value()
 
     def _volume_down(self):
         """ decrease mpv's volume """
-        os.system("echo 'cycle volume down' | socat - " + self.mpvsocket + " 2>/dev/null");
-        self._diaplay_mpv_volume_value()
+        self._send_mpv_command('volume_down')
+        self._display_mpv_volume_value()
 
     def _format_title_string(self, title_string):
         """ format mpv's title """
@@ -605,7 +616,33 @@ def _connect_to_socket(self, server_address):
             sock.close()
             return None
 
-    def _diaplay_mpv_volume_value(self):
+    def _send_mpv_command(self, a_command):
+        """ Send a command to MPV
+
+        """
+
+        if a_command in self.commands.keys():
+            #while True:
+            #    sock = self._connect_to_socket(self.mpvsocket)
+            #    if sock:
+            #        break
+            #    sleep(.25)
+            sock = self._connect_to_socket(self.mpvsocket)
+            if sock is None:
+                return False
+
+            # Send data
+            sock.sendall(self.commands[a_command])
+            # read the responce
+            if version_info < (3, 0):
+                data = sock.recv(4096)
+            else:
+                data = sock.recvmsg(4096)
+            #logger.error('DE data = "{}"'.format(data))
+            sock.close()
+            return True
+
+    def _display_mpv_volume_value(self):
         """ Display volume for MPV
 
         Currently working with python 2 and 3
@@ -955,16 +992,6 @@ def check_player(a_player):
                              shell=False)
         p.terminate()
 
-        # for mpv to work, socat is required...
-        if a_player.PLAYER_CMD == 'mpv':
-            if logger.isEnabledFor(logging.DEBUG):
-                logger.debug("mpv found... Checking for socat...")
-            p = subprocess.Popen(['socat', "-h"],
-                                 stdout=subprocess.PIPE,
-                                 stdin=subprocess.PIPE,
-                                 shell=False)
-            p.terminate()
-
         if logger.isEnabledFor(logging.INFO):
             logger.info("{} supported.".format(str(a_player)))
         return a_player

pyradio/radio.py

@@ -436,10 +436,7 @@ def initBody(self):
                     PyRadio currently supports three players: mpv, mplayer and vlc,
                     automatically detected in this order.
 
-                    Please install any one of them and try again.
-
-                    Please keep in mind that if mpv is installed, socat must be
-                    installed as well."""
+                    Please install any one of them and try again."""
             self.refreshNoPlayerBody(txt)
         else:
             #if self.ws.operation_mode == self.ws.MAIN_HELP_MODE: