- disabling theme editing (#141)

- trying to change install.py description per command line

Author: s-n-g

pyradio/config.py

@@ -1435,10 +1435,10 @@ def get_pyradio_version(self):
             # if revision is not 0
             git_description = ''
             if git_description:
-                if git_description.endswith('-dev'):
+                if git_description.endswith('-git'):
                     if 'rdev' in git_description:
                         ''' failed to get it on linux '''
-                        git_description = 'PyRadio-dev'
+                        git_description = 'PyRadio-git'
                     self.info = ' ' + git_description
                     ret = self.info + " (development version)"
                 else:

pyradio/install.py

@@ -31,6 +31,8 @@
 VERSION = ''
 
 PY3 = sys.version[0] == '3'
+# import logging
+# logger = logging.getLogger(__name__)
 
 def print_pyradio_on():
     print('''
@@ -93,7 +95,18 @@ def isRunning():
     print('')
 
 def version_string_to_list(this_version):
-    a_v = this_version.replace('-', '.').lower()
+    # logger.error('DE this_version = "{}"'.format(this_version))
+    poped = False
+    tokens = ('sng', 'dev', 'git')
+    sp = this_version.split('-')
+    while sp[-1] in tokens:
+        p = sp.pop()
+        if p != 'git':
+            poped = True
+    if poped:
+        sp.pop()
+    a_v = '.'.join(sp).lower()
+    # a_v = this_version.replace('-', '.').lower()
     a_l = a_v.split('.')
     while len(a_l) < 4:
         a_l.append('0')
@@ -186,7 +199,10 @@ def get_github_long_description(
         #         print(n, '\n\n')
 
     if ret is None:
-        return 'Pyradio-dev', 'Pyradio-dev'
+        if only_tag_name:
+            return 'PyRadio-git'
+        else:
+            return 'PyRadio-git', 'PyRadio-git'
 
     if only_tag_name:
         return returns[0][0]['name']
@@ -210,9 +226,9 @@ def get_github_long_description(
     # print('this_version = ' + this_version)
     return tag_name, this_version
 
-def get_github_tag():
+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)
+    return get_github_long_description(only_tag_name=True, do_not_exit=do_not_exit)
 
 def get_next_release():
     r = get_github_long_description()
@@ -225,10 +241,10 @@ def get_next_release():
 
 def get_devel_version():
     long_descpr = get_github_long_description(do_not_exit=True)
-    if long_descpr == ('PyRadio-dev', 'PyRadio-dev'):
-        return 'PyRadio-dev'
+    if long_descpr == ('PyRadio-git', 'PyRadio-git'):
+        return 'PyRadio-git'
     else:
-        return 'PyRadio ' + long_descpr[1].replace('-', '-r', 1) + '-dev'
+        return 'PyRadio ' + long_descpr[1].replace('-', '-r', 1) + '-git'
 
 def windows_put_devel_version():
     long_descr = get_devel_version()
@@ -773,11 +789,13 @@ 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'
     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'
     elif args.devel:
         ''' official devel '''
         package = 3

pyradio/radio.py

@@ -981,8 +981,7 @@ def run(self):
                 pass
         else:
             ''' start update detection and notification thread '''
-            if CAN_CHECK_FOR_UPDATES and \
-                    not self._cnf.current_pyradio_version.endswith('-dev'):
+            if CAN_CHECK_FOR_UPDATES:
                 if self._cnf.locked:
                     if logger.isEnabledFor(logging.INFO):
                         logger.info('(detectUpdateThread): session locked. Not starting!!!')
@@ -3792,14 +3791,16 @@ def to_time(secs):
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('detectUpdateThread: Asked to stop. Stoping...')
                 break
-            last_tag = get_github_tag()
+            last_tag = get_github_tag(do_not_exit=True)
             if stop():
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('detectUpdateThread: Asked to stop. Stoping...')
                 break
 
+            logger.error('DE last_tag = "{}"'.format(last_tag))
             if self._force_update:
                 last_tag = self._force_update
+            logger.error('DE last_tag = "{}"'.format(last_tag))
 
             if last_tag:
                 connection_fail_count = 0
@@ -3812,6 +3813,7 @@ def to_time(secs):
                         logger.info('detectUpdateThread: No update found. Will check again in {} days. Terminating...'.format(check_days))
                     break
                 else:
+                    logger.error('DE 1 this_version = {}'.format(this_version))
                     existing_version = version_string_to_list(this_version)
                     new_version = version_string_to_list(last_tag)
                     if logger.isEnabledFor(logging.DEBUG):

pyradio/themes.py

@@ -832,12 +832,13 @@ def keypress(self, char):
             return -1, False
         if char in (ord('e'), ):
             ''' edit theme '''
-            if self._themes[self._selection][1] == '' or \
-                    self._is_theme_read_only(self._themes[self._selection][1]):
-                ''' display question to create theme instead '''
-                return -2, False
-            else:
-                pass
+            pass
+            # if self._themes[self._selection][1] == '' or \
+            #         self._is_theme_read_only(self._themes[self._selection][1]):
+            #     ''' display question to create theme instead '''
+            #     return -2, False
+            # else:
+            #     pass
         elif char in (ord('a'), ):
             ''' new theme '''
             pass