- fixing SyntaxWarning messages

- RadioBrowser: encoding and info are read from config
- MPV _buildStartOpts options rearranged
- fixing a crash when pressing "T" in limited mode

Author: s-n-g

pyradio/browser.py

@@ -346,10 +346,8 @@ class RadioBrowser(PyRadioStationsBrowser):
 
     def __init__(self,
                  config,
-                 config_encoding,
                  session=None,
                  search=None,
-                 pyradio_info=None,
                  search_return_function=None,
                  message_function=None,
                  cannot_delete_function=None):
@@ -372,10 +370,10 @@ def __init__(self,
             self._session = session
         else:
             self._session = requests.Session()
-        self._pyradio_info = pyradio_info.strip()
+        self._pyradio_info = self._cnf.user_agent_string
         if self._pyradio_info:
-            self._headers['User-Agent'] = self._pyradio_info.replace(' ', '/')
-        self._config_encoding = config_encoding
+            self._headers['User-Agent'] = self._pyradio_info
+        self._config_encoding = self._cnf.default_encoding
         self._message_function = message_function
         self._search_return_function = search_return_function
         self._cannot_delete_function = cannot_delete_function

pyradio/client.py

@@ -10,7 +10,7 @@
 
 def format_list(a_string):
     print(a_string.replace(
-    '[', '\[').replace(']', ']').replace(
+    r'[', r'\[').replace(']', ']').replace(
     '/x,y', '/[green]x[/green],[blue]y[/blue]').replace(
     '/x', '/[green]x[/green]').replace(
     '[x]', '[[green]x[/green]]').replace(
@@ -96,12 +96,12 @@ def last_reply(self):
         server_id = ''
         if self._type >= 0:
             if self._last_command:
-                server_id = 'Server found: [green]{}[/green]:[green]{}[/green] {}\n'.format(
+                server_id = 'Server: [green]{}[/green]:[green]{}[/green] {}\n'.format(
                         self._host, self._port,
                         '([blue]headless[/blue])' if self._type == 0 else ''
                         )
             else:
-                server_id = 'Server found: {}:{} {}\n'.format(
+                server_id = 'Server: {}:{} {}\n'.format(
                         self._host, self._port,
                     '(headless)' if self._type == 0 else ''
                     )

pyradio/config.py

@@ -1185,8 +1185,6 @@ def current_playlist_index(self):
     def open_browser(self, url, search_return_function, message_function, cannot_delete_function):
         self._online_browser = probeBrowsers(url)(
             self,
-            self.default_encoding,
-            pyradio_info=self.info,
             search_return_function=search_return_function,
             message_function=message_function,
             cannot_delete_function=cannot_delete_function
@@ -1819,6 +1817,7 @@ def get_pyradio_version(self):
         '''
         ret = None
         self.info = " PyRadio {0} ".format(version)
+        self.user_agent_string = r'PyRadio/{}'.format(version)
         ''' git_description can be set at build time
             if so, revision will be shown along with the version
         '''

pyradio/config_window.py

@@ -1189,7 +1189,7 @@ def __init__(self,
         self._widgets[0]._use_paste_mode = True
         self._widgets[0]._mode_changed = self._show_alternative_modes
         self._widgets[0].set_global_functions(self._global_functions)
-        ''' enables direct insersion of ? and \ '''
+        ''' enables direct insersion of ? and \\ '''
         self._widgets[0]._paste_mode = False
         self._line_editor = self._widgets[0]
 

pyradio/edit.py

@@ -557,7 +557,7 @@ def show(self, item=None):
                 self._line_editor[ed].show(self._win, opening=False)
 
             if self._focus == 1:
-                ''' Tip: Press \p before pasting here '''
+                ''' Tip: Press \\p before pasting here '''
                 self._win.addstr(6, self.maxX - 41, 'Tip: ', curses.color_pair(4))
                 self._win.addstr('Press ', curses.color_pair(5))
                 self._win.addstr(r'\p', curses.color_pair(4))
@@ -568,7 +568,7 @@ def show(self, item=None):
                 self._win.addstr('Group Header', curses.color_pair(4))
                 self._win.refresh()
             elif self._focus == 2:
-                ''' Tip: Press \p before pasting here '''
+                ''' Tip: Press \\p before pasting here '''
                 self._win.addstr(9, self.maxX - 41, 'Tip: ', curses.color_pair(4))
                 self._win.addstr('Press ', curses.color_pair(5))
                 self._win.addstr(r'\p', curses.color_pair(4))

pyradio/player.py

@@ -2509,16 +2509,8 @@ def _buildStartOpts(self, streamUrl, playList=False):
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('--input-ipc-server is not supported.')
             newerMpv = False
-        if playList:
-            if newerMpv:
-                opts = [self.PLAYER_CMD, '--no-video', '--quiet', '--playlist=' + self._url_to_use(streamUrl), '--input-ipc-server=' + self.mpvsocket]
-            else:
-                opts = [self.PLAYER_CMD, '--no-video', '--quiet', '--playlist=' + self._url_to_use(streamUrl), '--input-unix-socket=' + self.mpvsocket]
-        else:
-            if newerMpv:
-                opts = [self.PLAYER_CMD, '--no-video', '--quiet', self._url_to_use(streamUrl), '--input-ipc-server=' + self.mpvsocket]
-            else:
-                opts = [self.PLAYER_CMD, '--no-video', '--quiet', self._url_to_use(streamUrl), '--input-unix-socket=' + self.mpvsocket]
+        logger.error('\n\nself._cnf.user_agent_string = {}\n\n'.format(self._cnf.user_agent_string))
+        opts = [self.PLAYER_CMD, '--no-video', '--quiet']
 
         if self._cnf.buffering_data:
             opts.extend(self._cnf.buffering_data)
@@ -2561,6 +2553,27 @@ def _buildStartOpts(self, streamUrl, playList=False):
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('---=== Starting Recording: "{}" ===---',format(self.recording_filename))
 
+        # ##################################################################
+        # if streamUrl == r'https://player-culturaam.stream.uol.com.br/live/culturaam.m3u8' or \
+        #         streamUrl == r'http://player-culturaam.stream.uol.com.br/live/culturaam.m3u8':
+        #     opts.append(r'--http-header-fields="User-Agent: PyRadio,Referer: https://cultura.uol.com.br/aovivo/67_ao-vivo-radio-cultura-brasil.html"')
+        # ##################################################################
+
+        if playList:
+            if newerMpv:
+                        opts.append('--input-ipc-server=' + self.mpvsocket)
+                        opts.append('--playlist=' + self._url_to_use(streamUrl))
+            else:
+                        opts.append('--input-unix-socket=' + self.mpvsocket)
+                        opts.append('--playlist=' + self._url_to_use(streamUrl))
+        else:
+            if newerMpv:
+                        opts.append('--input-ipc-server=' + self.mpvsocket)
+                        opts.append(self._url_to_use(streamUrl))
+            else:
+                        opts.append('--input-unix-socket=' + self.mpvsocket)
+                        opts.append(self._url_to_use(streamUrl))
+
         ''' check if buffering '''
         self.buffering = self._player_is_buffering(opts, self.buffering_tokens)
         with self.buffering_lock:

pyradio/radio.py

@@ -1670,8 +1670,8 @@ def __displayBodyLine(self, lineNum, pad, station, return_line=False):
                 ''' return empty line '''
                 return line
 
-            self.bodyWin.hline(lineNum, 0, ' ', self.bodyMaxX, col)
             try:
+                self.bodyWin.hline(lineNum, 0, ' ', self.bodyMaxX, col)
                 # logger.error('line: "{}"'.format(line))
                 self.bodyWin.addstr(lineNum, 0, line, col)
                 if column_num > 0:
@@ -4334,10 +4334,13 @@ def _toggle_transparency(
         if self.ws.operation_mode == self.ws.THEME_MODE:
             self._theme_selector.transparent = self._cnf.use_transparency
             logger.error('self._theme_selector.transparent = {}\n=========================='.format(self._theme_selector.transparent))
-        self.headWin.refresh()
-        self.outerBodyWin.refresh()
-        self.bodyWin.refresh()
-        self.footerWin.refresh()
+        if not self._limited_height_mode and \
+                not self._limited_width_mode:
+            self.headWin.refresh()
+            self.outerBodyWin.refresh()
+            self.bodyWin.refresh()
+        if self.footerWin:
+            self.footerWin.refresh()
         if self._config_win:
             self._config_win._config_options['use_transparency'][1] = self._cnf.use_transparency
             if not changed_from_config_window:
@@ -9196,10 +9199,15 @@ def _exit_browser_config(self):
 
     def _can_display_help_msg(self, msg):
         ''' len("Press ? for help") = 16 '''
-        if msg is None:
+        if (not self._limited_height_mode and \
+                not self._limited_width_mode) or \
+                msg is None:
             ret = False
         else:
-            ret = self.outerBodyMaxX - len(msg) - 16 > 10 if msg else True
+            if self.outerBodyWin:
+                ret = self.outerBodyMaxX - len(msg) - 16 > 10 if msg else True
+            else:
+                ret = False
         # if logger.isEnabledFor(logging.DEBUG):
         #     logger.debug('Display "Press ? for help": {}'.format(ret))
         return ret