fixing (#147)

Author: s-n-g

Changelog

@@ -1,3 +1,9 @@
+2022-01-25 s-n-g
+    * version 0.8.9.11 (0.9-beta8)
+    * Fixing (#147): Cannot type "t" in RadioBrowser Search window
+    * Trying to fix install.py crash
+    * Adding MPV support on Windows
+
 2022-01-17 s-n-g
     * version 0.8.9.10 (0.9-beta7)
     * RadioBrowser config window almost finished

README.html

@@ -121,12 +121,12 @@ <h2 id="features">Features <span style="padding-left: 10px;"><sup style="font-si
 <li>Station editor (add/edit) with <a href="#cjk-characters-support">CJK characters support</a></li>
 <li>Configuration editor</li>
 <li>Multiple playlist support</li>
-<li>vi like station ragisters</li>
+<li>vi like station registers</li>
 <li>Search function</li>
 <li>Theming support</li>
 <li><a href="radio-browser.html">RadioBrowser</a> support</li>
 <li>Easy installation / updating</li>
-<li>Runs on Linux. MacOS and Windows</li>
+<li>Runs on Linux, MacOS and Windows</li>
 </ul>
 <p>and much more…</p>
 <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
@@ -143,6 +143,12 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <pre style="height: 200px;">
 
+2022-01-25 s-n-g
+    * version 0.8.9.11 (0.9-beta8)
+    * Fixing (#147): Cannot type "t" in RadioBrowser Search window
+    * Trying to fix install.py crash
+    * Adding MPV support on Windows
+
 2022-01-17 s-n-g
     * version 0.8.9.10 (0.9-beta7)
     * RadioBrowser config window almost finished

README.md

@@ -69,12 +69,12 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
  - Station editor (add/edit) with [CJK characters support](#cjk-characters-support)
  - Configuration editor
  - Multiple playlist support
- - vi like station ragisters
+ - vi like station registers
  - Search function
  - Theming support
  - [RadioBrowser](radio-browser.md) support
  - Easy installation / updating
- - Runs on Linux. MacOS and Windows
+ - Runs on Linux, MacOS and Windows
 
 and much more...
 

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 9, 10)
+version_info = (0, 8, 9, 11)
 
 # Application state:
 # New stable version:  ''

pyradio/config.py

@@ -1444,16 +1444,16 @@ def get_pyradio_version(self):
                     ret = self.info + " (development version)"
                 else:
                     git_info = git_description.split('-')
-                    if git_info[1] != '0':
-                        try:
+                    try:
+                        if git_info[1] != '0':
                             if 'beta' in git_info[1] or 'rc' in git_info[1].lower():
                                 self.info = " PyRadio {1}-{1}".format(git_info[0], git_info[1])
                                 ret = "RyRadio built from git: https://github.com/coderholic/pyradio/commit/{0} (rev. {1})".format(git_info[-1], git_info[2])
                             else:
                                 self.info = " PyRadio {0}-r{1} ".format(version, git_info[1])
                                 ret = "RyRadio built from git: https://github.com/coderholic/pyradio/commit/{0} (rev. {1})".format(git_info[-1], git_info[1])
-                        except:
-                            pass
+                    except:
+                        pass
         self.current_pyradio_version = self.info.replace(' PyRadio ', '').replace(' ', '')
         # if self._distro != 'None':
         #     self.info += '({})'.format(self._distro)

pyradio/install.py

@@ -178,22 +178,27 @@ def get_github_long_description(
     returns = []
     for n in points:
         ret = None
-        url = 'https://api.github.com/repos/' + user + '/pyradio/' + n
-        if sys.version_info < (3, 0):
-            try:
-                ret = urlopen(url).read()
-            except:
-                ret = None
+        if n == 'tags':
+            url = 'https://api.github.com/repos/coderholic/pyradio/tags'
         else:
-            try:
+            url = 'https://api.github.com/repos/' + user + '/pyradio/' + n
+            if use_sng_repo and not sng_branch:
+                url += '?sha=devel'
+            else:
+                url += '?sha=master'
+            url += '&per_page=50'
+        try:
+            if sys.version_info < (3, 0):
+                ret = urlopen(url).read()
+            else:
                 with urlopen(url) as https_response:
                     ret = https_response.read()
-            except:
-                if do_not_exit:
-                    ret = None
-                else:
-                    print('Error: Cannot contact GitHub!\n       Please make sure your internet connection is up and try again.')
-                    sys.exit(1)
+        except:
+            if do_not_exit:
+                ret = None
+            else:
+                print('Error: Cannot contact GitHub!\n       Please make sure your internet connection is up and try again.')
+                sys.exit(1)
 
         try:
             returns.append(json.loads(ret))
@@ -210,9 +215,9 @@ def get_github_long_description(
 
     if ret is None:
         if only_tag_name:
-            return 'PyRadio-git'
+            return None
         else:
-            return 'PyRadio-git', 'PyRadio-git'
+            return None, None
 
     if only_tag_name:
         return returns[0][0]['name']
@@ -231,35 +236,45 @@ def get_github_long_description(
     # print(tag_hash)
     # print(revision)
 
-    this_version = tag_name + '-' + str(revision) + '-' + returns[0][0]['sha'][:7] if revision > 0 else None
+    if revision > 0:
+        this_version = tag_name + '-r' + str(revision) + '-' + returns[0][0]['sha'][:7]
+        if use_sng_repo:
+            this_version += '-sng'
+        if not sng_branch:
+            this_version += '-dev'
+    else:
+        this_version = None
 
-    # print('this_version = ' + this_version)
+    # if this_version:
+    #     print('this_version = ' + this_version)
     return tag_name, this_version
 
 def get_github_tag(do_not_exit=False):
     ''' get the name of the latest PyRadio tag on GitHub '''
     return get_github_long_description(only_tag_name=True, do_not_exit=do_not_exit)
 
 def get_next_release():
+    ''' not used '''
     r = get_github_long_description()
-    print('Descriptyion: {}'.format(r))
+    print('Description: {}'.format(r))
 
     sp = r[1].split('-')
     print('sp = {}'.format(sp))
     x = int(sp[1]) + 1
-    return sp[0] + '-r{}'.format(x)
+    return sp[0] + '-{}'.format(x)
 
 def get_devel_version():
     long_descpr = get_github_long_description(do_not_exit=True)
-    if long_descpr == ('PyRadio-git', 'PyRadio-git'):
-        return 'PyRadio-git'
-    else:
+    if long_descpr[0]:
         if long_descpr[1]:
-            return 'PyRadio ' + long_descpr[1].replace('-', '-r', 1) + '-git'
+            return 'PyRadio ' + long_descpr[1]
         else:
-            return 'PyRadio ' + long_descpr[0] + '-0'
+            return 'PyRadio ' + long_descpr[0]
+    else:
+        return None
 
 def windows_put_devel_version():
+    ''' not used '''
     long_descr = get_devel_version()
     from shutil import copyfile
     cur_dir = os.getcwd()
@@ -795,10 +810,10 @@ def _do_it(self, mode='update'):
 
 
 if __name__ == '__main__':
-    # l=get_github_long_description()
-    # print(l)
-    # get_devel_version()
-    # sys.exit()
+    l=get_github_long_description(use_sng_repo=True)
+    print(l)
+    print(get_devel_version())
+    sys.exit()
     print_pyradio_on()
     print_python3() if PY3 else print_python2()
     # print(get_devel_version())
@@ -860,15 +875,19 @@ def _do_it(self, mode='update'):
         args.force = True
         package = 1
         VERSION, github_long_description = get_github_long_description(use_sng_repo=True, sng_branch=True)
-        github_long_description += '-sng'
+        if not github_long_description:
+            github_long_description = 'PyRadio'
         github_long_description = github_long_description.replace('-', '-r', 1)
+        # github_long_description += '-sng'
     elif args.sng_devel:
         '''' sng devel '''
         args.force = True
         package = 2
         VERSION, github_long_description = get_github_long_description(use_sng_repo=True)
-        github_long_description += '-sng-dev'
+        if not github_long_description:
+            github_long_description = 'PyRadio'
         github_long_description = github_long_description.replace('-', '-r', 1)
+        # github_long_description += '-sng-dev'
     elif args.devel:
         ''' official devel '''
         package = 3

pyradio/radio.py

@@ -4714,6 +4714,12 @@ def _return_from_server_selection(self, a_server):
         self.ws.close_window()
         self.refreshBody()
 
+    def _can_show_theme_window_in_browser_search(self):
+        if self.ws.operation_mode == self.ws.BROWSER_SEARCH_MODE:
+            return not self._cnf._online_browser.line_editor_has_focus()
+        else:
+            return True
+
     def keypress(self, char):
         if self._system_asked_to_terminate:
             ''' Make sure we exit when signal received '''
@@ -5061,7 +5067,8 @@ def keypress(self, char):
                     self.ws.RENAME_PLAYLIST_MODE, self.ws.CREATE_PLAYLIST_MODE,) and \
                 self.ws.operation_mode not in self.ws.PASSIVE_WINDOWS and \
                 not self.is_search_mode(self.ws.operation_mode) and \
-                self.ws.window_mode not in (self.ws.CONFIG_MODE, ):
+                self.ws.window_mode not in (self.ws.CONFIG_MODE, ) and \
+                self._can_show_theme_window_in_browser_search():
             self._reset_status_bar_right()
             self._config_win = None
             self.theme_forced_selection = None