- PyRadio will not crush with mpv 0.30.0

  Changing mpv's volume is still possible, but no info will be
  presented on the Status Bar.
  Furthermore, saving mpv's volume will not be possible
  ( mpv issue #7153: mpv-player/mpv#7153 )
- Keep working on www.radio-browser.info integration

Author: s-n-g

Changelog

@@ -1,3 +1,10 @@
+2019-11-15
+    * PyRadio will not crush with mpv 0.30.0
+      Changing mpv's volume is still possible, but no info will be
+      presented on the Status Bar.
+      Furthermore, saving mpv's volume will not be possible
+      ( mpv issue #7153: https://github.com/mpv-player/mpv/issues/7153 )
+
 2019-11-12
     * When default played is changed in the config, a message to restart
       the application is presented to the user

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 4)
+version_info = (0, 8, 5)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pyradio/browser.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 # http://www.radio-browser.info/webservice#Advanced_station_search
 import json
-import requests
+try:
+    import requests
+except ImportError:
+    pass
 import threading
 import logging
 from .widechar import cjklen, PY3

pyradio/log.py

@@ -35,15 +35,17 @@ def write(self, msg, thread_lock=None, help_msg=False):
                 self.msg = msg.strip()[0: self.width].replace("\r", "").replace("\n", "")
                 self.cursesScreen.addstr(0, 1, self.msg)
             except:
-                logger.error('DE **** status update python 2 ****')
                 try:
                     self.msg = msg.encode('utf-8', 'replace').strip()[0: self.width].replace("\r", "").replace("\n", "")
                     self.cursesScreen.addstr(0, 1, self.msg)
                 except:
-                    logger.error('DE **** status update ERROR ****')
-                    pass
+                    if logger.isEnabledFor(logging.ERROR):
+                        logger.error('Cannot update the Status Bar...')
             if logger.isEnabledFor(logging.DEBUG):
-                logger.debug('Status: "{}"'.format(self.msg))
+                try:
+                    logger.debug('Status: "{}"'.format(msg))
+                except:
+                    pass
             self.cursesScreen.refresh()
             if thread_lock is not None:
                 thread_lock.release()

pyradio/player.py

@@ -66,15 +66,21 @@ def _do_save_volume(self, config_string):
             return 'Volume not saved!!!'
         ret_strings = ('Volume: already saved...',
                     'Volume: {}% saved',
-                    'Volume: {}% NOT saved (Error writing file)')
+                    'Volume: {}% NOT saved (Error writing file)',
+                    'Volume: NOT saved!')
         log_strings = ('Volume is -1. Aborting...',
                     'Volume is {}%. Saving...',
-                    'Error saving profile "{}"')
+                    'Error saving profile "{}"',
+                    'Error saving volume...')
         if self.volume == -1:
             """ inform no change """
             if (logger.isEnabledFor(logging.DEBUG)):
                 logger.debug(log_strings[0])
             return ret_strings[0]
+        elif self.volume == -2:
+            if (logger.isEnabledFor(logging.DEBUG)):
+                logger.debug(log_strings[3])
+            return ret_strings[3]
         else:
             """ change volume """
             if (logger.isEnabledFor(logging.DEBUG)):
@@ -197,7 +203,6 @@ def updateStatus(self, *args):
                     subsystemOut = subsystemOutRaw.decode("utf-8", "replace")
                 if subsystemOut == '':
                     break
-                logger.error('DE subsystemOut = "{}"'.format(subsystemOut))
                 if not self._is_accepted_input(subsystemOut):
                     continue
                 subsystemOut = subsystemOut.strip()
@@ -347,14 +352,10 @@ def play(self, name, streamUrl, encoding = ''):
                 logger.error("playback detection thread start failed")
         if logger.isEnabledFor(logging.INFO):
             logger.info("Player started")
-        if self.process and self.PLAYER_CMD == 'mpv':
-            self._sendCommand('{ "command": ["observe_property", 1, "volume"] }')
 
     def _sendCommand(self, command):
         """ send keystroke command to player """
 
-        logger.error('DE command to execute: "{}"'.format(command))
-
         if(self.process is not None):
             try:
                 if logger.isEnabledFor(logging.DEBUG):
@@ -433,7 +434,6 @@ def _get_volume(self):
     def volumeUp(self):
         """ increase volume """
         if self.muted is not True:
-            logger.error('DE self._volumeUp')
             self._volume_up()
 
     def _volume_up(self):
@@ -502,6 +502,8 @@ class MpvPlayer(Player):
     def save_volume(self):
         """ Saving Volume in Windows does not work;
             Profiles not supported... """
+        if int(self.volume) > 999:
+            self.volume = -2
         return self._do_save_volume("[pyradio]\nvolume={}\n")
 
     def _configHasProfile(self):
@@ -572,9 +574,7 @@ def _stop(self):
 
     def _volume_up(self):
         """ increase mpv's volume """
-        logger.error('DE mpv volume up')
         os.system("echo 'cycle volume' | socat - " + self.mpvsocket + " 2>/dev/null");
-        os.system("echo '{ \"command\": [\"get_property\", \"volume\"] }' | socat - " + self.mpvsocket + " 2>/dev/null");
 
     def _volume_down(self):
         """ decrease mpv's volume """

pyradio/radio.py

@@ -3305,14 +3305,11 @@ def keypress(self, char):
                         self.refreshBody()
 
     def _volume_up(self):
-        logger.error('DE entering radio._volume_up')
         self.jumpnr = ''
         self._random_requested = False
         if self.player.isPlaying():
-            logger.error('DE isPlaying radio._volume_up')
             if self.player.playback_is_on:
                 self.player.volumeUp()
-                logger.error('DE playback_is_on radio._volume_up')
         else:
             if self.ws.operation_mode in self.ws.PASSIVE_WINDOWS:
                 self.ws.close_window()