theme file watch functionality implemented

Author: s-n-g

pyradio/config.py

@@ -1428,6 +1428,10 @@ def theme(self, val):
             self.opts['auto_update_theme'][1] = False
         self.opts['dirty_config'][1] = True
 
+    @property
+    def theme_path(self):
+        return path.join(self.stations_dir, 'themes', self.opts['theme'][1] + '.pyradio-theme')
+
     @property
     def auto_update_theme(self):
         return self.opts['auto_update_theme'][1]

pyradio/radio.py

@@ -1075,11 +1075,27 @@ def _change_browser_ticks(self, lineNum, sep_col):
             for n in ticks:
                 self.bodyWin.chgat(lineNum, n, 1, sep_col)
 
-    def _watch_theme(self):
+    def _watch_theme(self, theme_path=None):
+        ''' watch a file for changes
+
+            Parameters
+            =========
+            path    the path to the file
+                    if it's None, the thread is terminated
+        '''
+        if self._watch_theme_thread:
+            self.stop_watch_theme_thread = True
+            self._watch_theme_thread.join()
+            self._watch_theme_thread = None
+            self.stop_watch_theme_thread = False
+        if theme_path is None:
+            return
+        else:
+            path = theme_path
         self._watch_theme_thread = threading.Thread(
             target=self._wait_for_theme_to_change,
             # args=(self._cnf,
-            args=(path.join(self._cnf.stations_dir, 'themes', 'auto.pyradio-theme'),
+            args=(path,
                   self._watch_theme_lock,
                   lambda: self.stop_watch_theme_thread,
                   self._auto_update_theme))
@@ -1175,7 +1191,6 @@ def _wait_for_theme_to_change(self, file, a_lock, stop, func):
             logger.debug('File watch thread stopped on: {}'.format(file))
 
     def run(self):
-        # self._watch_theme()
         self._register_signals_handlers()
         if self.ws.operation_mode == self.ws.DEPENDENCY_ERROR:
             self.log.write(msg="Dependency missing. Press any key to exit....", error_msg=True)
@@ -1252,6 +1267,9 @@ def run(self):
 
             self._cnf.setup_mouse()
 
+            ''' start theme file thread  '''
+            if self._cnf.auto_update_theme:
+                self._watch_theme(self._cnf.theme_path)
             while True:
                 try:
                     c = self.bodyWin.getch()
@@ -6185,15 +6203,23 @@ def keypress(self, char):
                 # logger.error('4 redraw')
                 curses.doupdate()
                 ''' update config window '''
-                if self._config_win:
-                    self._config_win._config_options['theme'][1] = self._theme_name
+                if self._theme_selector.theme_path(theme_id):
+                    if self._config_win:
+                        self._config_win._config_options['theme'][1] = self._theme_name
                 if self.ws.window_mode == self.ws.CONFIG_MODE:
                     save_theme = True
                 # make default
                 if save_theme:
                     self._cnf.theme = self._theme_name
                     if logger.isEnabledFor(logging.INFO):
                         logger.info('Setting default theme: {}'.format(self._theme_name))
+                    if self._theme_selector.theme_is_watched:
+                        self._cnf.opts['auto_update_theme'][1] = True
+                        self._watch_theme(self._theme_selector.theme_path(theme_id))
+                    else:
+                        self._cnf.opts['auto_update_theme'][1] = False
+                        self._watch_theme()
+
                 try:
                     self._watch_theme_lock.release()
                 except:

pyradio/themes.py

@@ -433,7 +433,7 @@ def __init__(self, parent, config, theme,
         self._applied_color_pair = applied_color_pair
         self._normal_color_pair = normal_color_pair
         self._transparent = is_transparent
-        self._is_watched = is_watched
+        self._theme_is_watched = is_watched
         self._a_lock = a_lock
         a_lock.acquire()
         if log_file:
@@ -447,6 +447,12 @@ def __init__(self, parent, config, theme,
         logger.error('applied_theme_name = {}'.format(applied_theme_name))
         logger.error('config_theme_name = {}'.format(config_theme_name))
         logger.error('========== Theme Window End\n\n')
+        for n in self._cnf.opts.keys():
+            logger.error('{0}: {1}'.format(n, self._cnf.opts[n]))
+
+    @property
+    def theme_is_watched(self):
+        return self._theme_is_watched
 
     def set_global_functions(self, global_functions):
         self._global_functions = {}
@@ -474,6 +480,12 @@ def show(self, touch_selection=True):
             self._themes.extend(themes_to_add)
             self._items = len(self._themes)
             self._get_titles_ids()
+        self._first_theme_to_watch = 0
+        for i, n in enumerate(self._themes):
+            if 'User Themes' in n[0]:
+                self._first_theme_to_watch = i
+        if self._first_theme_to_watch == 0:
+            self._first_theme_to_watch = len(self._themes)
 
         for a_theme in self._themes:
             if len(a_theme[0]) > self._max_title_width:
@@ -694,7 +706,7 @@ def refresh(self):
                     col = curses.color_pair(self._normal_color_pair)
             self._win.hline(i + 1, 1, ' ', self._max_title_width + 2, col)
             if an_item == self._config_theme:
-                if self._is_watched == self._themes[an_item][0]:
+                if self._theme_is_watched:
                     token = '+'
                 else:
                     token = '*'
@@ -832,16 +844,17 @@ def keypress(self, char):
             if not self.changed_from_config:
                 self._config_theme = self._selection
                 self._config_theme_name = self._themes[self._selection][0]
-            if char in (ord('c'), ord('C')):
-                if self._themes[self._selection][1]:
-                    self._applied_theme_is_watched = self._config_theme_is_watched = self._themes[self._selection][0]
-            else:
-                self._applied_theme_is_watched = self._config_theme_is_watched = ''
-            if char in (ord('s'), ord('C')):
-                ''' close window '''
-                curses.ungetch('q')
+            self._theme_is_watched = False
+            if char == ord('c'):
+                if self._selection > self._first_theme_to_watch and \
+                        self._themes[self._selection][1]:
+                    logger.error('first = {0}, selection = {1}'.format(self._first_theme_to_watch, self._selection))
+                    self._theme_is_watched = True
+                else:
+                    self._theme_is_watched = False
             else:
-                self.refresh()
+                self._theme_is_watched = False
+            self.refresh()
             return self._selection, True
         elif char in (curses.KEY_UP, ord('k')):
             self.jumpnr = ''