Fix #48: add delay before committing selected theme

Author: blopker

colorsublime/async.py colorsublime/asynclib.pycolorsublime/async.py renamed to colorsublime/asynclib.py

@@ -13,20 +13,20 @@ def _is_function(fn):
     return hasattr(fn, '__call__')
 
 
-def async(fn):
+def runasync(fn):
     """ Decorator for running functions asynchronously.
     Async functions can have a callback as the
     last argument. Returns False if uncaught exception.
 
     e.x. no callback:
-    @async
+    @runasync
     def no_callback(arg):
         chage_some_state(arg)
 
     no_callback(2)
 
     or has callback:
-    @async
+    @runasync
     def has_callback(arg):
         return arg*2
 

colorsublime/commands.py

@@ -1,20 +1,20 @@
 """
 Collection of functions the plugin can invoke. Most if not all should be
-non-blocking (@async) functions to keep the main UI thread from freezing.
+non-blocking (@runasync) functions to keep the main UI thread from freezing.
 
 These functions should catch all unexpected exceptions so the plugin does not
 have to. Unexpected exceptions should return False. Expected exceptions should
 be caught by other modules this module uses. Log all unusual behavior.
 
-All @async functions have an optional callback parameter as the last argument.
+All @runasync functions have an optional callback parameter as the last argument.
 """
 import os
 
 from . import logger
 from . import settings
 from . import http
 from . import io
-from .async import async
+from .asynclib import runasync
 from .theme import Theme
 
 log = logger.get(__name__)
@@ -37,7 +37,7 @@ def get_installed_themes():
     return themes
 
 
-@async
+@runasync
 def fetch_repo():
     """ Get current theme archive in a new thread """
     archive = http.get(settings.repo_url())
@@ -71,9 +71,7 @@ def install_theme(theme):
         return
 
     io.copy(theme.cache_path.abs, theme.install_path.abs)
-    settings.set_theme(theme.install_path.rel)
-    settings.commit()
-
+    settings.commit_theme(theme.install_path.rel)
 
 def revert_theme(path):
     log.debug('Reverting theme at path %s', path)

colorsublime/http/downloaders/urllib.py

@@ -28,8 +28,8 @@ def get(self, url):
             result = request.urlopen(url)
         except error.URLError as e:
             log.error('Urllib downloader failed: %s' % e.reason)
-            traceback.print_exc()
-            result = b''
+            raise e
         if result.getcode() >= 400:
+            log.error('Urllib downloader failed with code: %s' % result.getcode())
             return b''
         return result.read()

colorsublime/settings.py

@@ -47,8 +47,12 @@ def set_theme(path):
     return sublime.load_settings(SUBLIME_PREF).set('color_scheme', path)
 
 
-def commit():
-    sublime.save_settings(SUBLIME_PREF)
+def commit_theme(path):
+    def callback():
+        set_theme(path)
+        sublime.save_settings(SUBLIME_PREF)
+    # Timeout so sublime can get caught up with the filesystem
+    sublime.set_timeout_async(callback, 1000)
 
 
 def is_debug():

colorsublime/status.py

@@ -92,7 +92,7 @@ class Loader(Message):
 
     def _get_message(self):
         mod = len(self.chars)
-        rands = [self.chars[x % mod] for x in random.sample(range(100), 10)]
+        rands = [self.chars[x % mod] for x in random.sample(range(100), 1)]
         msg = self.message + ' [' + ''.join(rands) + '] '
         return msg