Remote control server info will display the current search item string

if RadioBrowser is active

Author: s-n-g

docs/server.html

@@ -193,7 +193,7 @@ <h3 id="examples">Examples</h3>
 
 retry: 150
 event: /html/title
-data: &lt;b&gt;The Carpenters - No Place Like Home For The Holidays&lt;/b&gt;
+data: &lt;b&gt;Patti Page - Jingle bells&lt;/b&gt;
 </pre>
 <p>The <strong>data</strong> field will contain the HTML format of the title, which is easy to parse in a script.</p>
 <p>If the player is idle, the output will be</p>
@@ -204,13 +204,13 @@ <h3 id="examples">Examples</h3>
 <p>Several commands (such as <strong>/v</strong>, <strong>/vu</strong>, <strong>/vd</strong>, etc.) will return this info; this is a side effect of the way the server works, but provides useful info for the script issuing the command.</p>
 <p>One thing that should be made clear is that getting the above info does not mean that the command has succeeded; for example issuing the <strong>/orc</strong> (<strong>/open-radio-browser</strong>) command, will return the above info, but to make sure about the state of <strong>PyRadio</strong>, one should issue the <strong>/i</strong> (<strong>/info</strong>) command:</p>
 <pre>$ curl http://127.0.0.1:9998/i
-
 PyRadio 0.9.2.20
-Player: mpv
-Service: RadioBrowser (Austria)
-Status: In playback
-  Station (id=5): &quot;Classical Christmas FM&quot;
-Selection (id=5): &quot;Classical Christmas FM&quot;</pre>
+  Player: mpv
+  Service: RadioBrowser (Netherlands)
+    Search: Name: christmas, Order: votes, Reverse: true
+  Status: In playback
+    Station (id=5): &quot;Classical Christmas FM&quot;
+  Selection (id=5): &quot;Classical Christmas FM&quot;</pre>
 <h3 id="text-vs.-web-commands">Text vs. Web commands</h3>
 <p>On first glance, the difference between a <strong>Text</strong> and a <strong>Web</strong> command is the <em>/html</em> part that exists in the later.</p>
 <p>But things are actually more complex that that.</p>

docs/server.md

@@ -209,7 +209,7 @@ $ curl http://192.168.122.4:9998/title
 
 retry: 150
 event: /html/title
-data: <b>The Carpenters - No Place Like Home For The Holidays</b>
+data: <b>Patti Page - Jingle bells</b>
 
 ```
 
@@ -230,13 +230,13 @@ One thing that should be made clear is that getting the above info does not mean
 
 ```
 $ curl http://127.0.0.1:9998/i
-
 PyRadio 0.9.2.20
-Player: mpv
-Service: RadioBrowser (Austria)
-Status: In playback
-  Station (id=5): "Classical Christmas FM"
-Selection (id=5): "Classical Christmas FM"
+  Player: mpv
+  Service: RadioBrowser (Netherlands)
+    Search: Name: christmas, Order: votes, Reverse: true
+  Status: In playback
+    Station (id=5): "Classical Christmas FM"
+  Selection (id=5): "Classical Christmas FM"
 ```
 
 ### Text vs. Web commands

pyradio/browser.py

@@ -1234,29 +1234,31 @@ def _format_term_for_get_strings(self, aterm):
         return a_string + (' (exact)' if aterm.endswith('exact') else '')
 
     def get_strings(self):
-        strings = []
-        for i, n in enumerate(self._search_history):
-            if i > 0:
-                out = []
-                if 'type' in n:
-                    if n['type'] and 'term' in n:
-                        if n['type'] != 'search':
-                            out.append('{0}: {1}'.format(
-                                self._format_term_for_get_strings(n['type']),
-                                n['term']
-                                )
-                            )
-                if 'post_data' in n:
-                    for k in n['post_data']:
-                        out.append('{0}: {1}'.format(
-                            k.title().replace('exact', ' (exact)'),
-                            n['post_data'][k]
-                            )
+        return [self.get_a_search_string(n) for i, n in enumerate(self._search_history) if i > 0]
+
+    def get_a_search_string(self, a_search_item):
+        out = []
+        if 'type' in a_search_item:
+            if a_search_item['type'] and 'term' in a_search_item:
+                if a_search_item['type'] != 'search':
+                    out.append('{0}: {1}'.format(
+                        self._format_term_for_get_strings(a_search_item['type']),
+                        a_search_item['term']
                         )
+                    )
+        if 'post_data' in a_search_item:
+            for k in a_search_item['post_data']:
+                out.append('{0}: {1}'.format(
+                    k.title().replace('exact', ' (exact)'),
+                    a_search_item['post_data'][k]
+                    )
+                )
+        if out:
+            return ', '.join(out)
+        return None
 
-                if out:
-                    strings.append(', '.join(out))
-        return strings
+    def get_current_history_string(self):
+        return self.get_a_search_string(self._search_history[self._search_history_index])
 
     def get_history_from_search(self):
         if self._search_win:

pyradio/radio.py

@@ -807,17 +807,18 @@ def _save_colors(self):
     def _text_info(self):
         out = []
         out.append('PyRadio {}'.format(self._cnf.current_pyradio_version))
-        out.append('Player: {}'.format(self.player.PLAYER_NAME))
+        out.append('  Player: {}'.format(self.player.PLAYER_NAME))
         if self._cnf.browsing_station_service:
-            out.append('Service: ' + self._cnf.online_browser.TITLE)
+            out.append('  Service: ' + self._cnf.online_browser.TITLE)
+            out.append('    Search: ' + self._cnf.online_browser.get_current_history_string())
         else:
-            out.append('Playlist: "{}"'.format(basename(self._playlist_in_editor)[:-4]))
+            out.append('  Playlist: "{}"'.format(basename(self._playlist_in_editor)[:-4]))
         if self.player.isPlaying():
-            out.append('Status: In playback {}'.format('(muted)' if self.player.muted else ''))
-            out.append('  Station (id={0}): "{1}"'.format(self.playing+1, self.stations[self.playing][0]))
+            out.append('  Status: In playback {}'.format('(muted)' if self.player.muted else ''))
+            out.append('    Station (id={0}): "{1}"'.format(self.playing+1, self.stations[self.playing][0]))
         else:
-            out.append('Status: Idle')
-        out.append('Selection (id={0}): "{1}"'.format(self.selection+1, self.stations[self.selection][0]))
+            out.append('  Status: Idle')
+        out.append('  Selection (id={0}): "{1}"'.format(self.selection+1, self.stations[self.selection][0]))
         return '\n'.join(out)
 
     def _html_info(self):
@@ -827,6 +828,7 @@ def _html_info(self):
         out.append('<span style="padding-left: 1em;">Player: <b>{}</b></span><br>'.format(self.player.PLAYER_NAME))
         if self._cnf.browsing_station_service:
             out.append('<span style="padding-left: 1em;">Service: <b>{}</b></span><br>'.format(self._cnf.online_browser.TITLE))
+            out.append('<span style="padding-left: 2em;">Search: <b>{}</b></span><br>'.format(self._cnf.online_browser.get_current_history_string()))
         else:
             out.append('<span style="padding-left: 1em;">Playlist: <b>{}</b></span><br>'.format(basename(self._playlist_in_editor)[:-4]))
         if self.player.isPlaying():