merge with built mute dict
authorvunhat_minh <vunhat_minh@dwango.co.jp>
Thu, 7 Aug 2014 03:37:18 +0000 (12:37 +0900)
committervunhat_minh <vunhat_minh@dwango.co.jp>
Thu, 7 Aug 2014 03:37:18 +0000 (12:37 +0900)
1  2 
docs/conf.py
rainbowstream/config.py
rainbowstream/rainbow.py
setup.py

diff --cc docs/conf.py
index 0d7fd1d3fda2fd573d95ceeea7941c9eebc768a7,1ba586b720acebfdfaca71bd4c71953087a9af2f..33c43e7f7db13010a622b6b1110a25fb64240c98
@@@ -48,9 -48,9 +48,9 @@@ copyright = u'2014, Vu Nhat Minh
  # built documents.
  #
  # The short X.Y version.
- version = '0.6.4'
 -version = '0.6.6'
++version = '0.6.7'
  # The full version, including alpha/beta/rc tags.
- release = '0.6.4'
 -release = '0.6.6'
++release = '0.6.7'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
index e468c9c1d5725625133355d1af816ce99e426838,fddc7eee029a86cc6cfe3b3cc85afe63171d1b62..c2f2d5cd9ddba696a49e2f6bfe25c1155dbbd85a
@@@ -161,11 -156,11 +161,11 @@@ def init_config()
          data = load_config(rainbow_config)
          for d in data:
              c[d] = data[d]
 -    except:
 -        pass
 +    except ValueError as e:
 +        c['USER_JSON_ERROR'] = str(e)
      # Load default theme
-     theme_file = os.path.dirname(
-         __file__) + '/colorset/' + c['THEME'] + '.json'
+     theme_file = os.path.dirname(__file__) + \
+         '/colorset/' + c['THEME'] + '.json'
      try:
          data = load_config(theme_file)
          for d in data:
index 598d367b70dafdea73be36b1eae16555f3080c08,8760e7830a228d81b221074f2e0fccf07e272318..d2caee3ac2a2a67de3faaaf41b943ff4e6e8970f
@@@ -166,7 -194,8 +193,9 @@@ def init(args)
      c['message_dict'] = []
      # Image on term
      c['IMAGE_ON_TERM'] = args.image_on_term
 +    set_config('IMAGE_ON_TERM',str(c['IMAGE_ON_TERM']))
+     # Mute dict
+     c['IGNORE_LIST'] += build_mute_dict()
  
  
  def switch():
diff --cc setup.py
index d95c41177ee7ef83cb6ccc8335efa95283e90182,642440e349dfb16a05f7135712d02f1c59c6578e..636e6aae18c5ba84e02ae953eaf941465c767921
+++ b/setup.py
@@@ -3,7 -3,7 +3,7 @@@ import o
  import os.path
  
  # Bumped version
- version = '0.6.4'
 -version = '0.6.6'
++version = '0.6.7'
  
  # Require
  install_requires = [