From: vunhat_minh <vunhat_minh@dwango.co.jp>
Date: Thu, 7 Aug 2014 03:37:18 +0000 (+0900)
Subject: merge with built mute dict
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9c37209ba97ff291a21cd7d936988c8d5b5fc1d2;p=rainbowstream.git

merge with built mute dict
---

9c37209ba97ff291a21cd7d936988c8d5b5fc1d2
diff --cc docs/conf.py
index 0d7fd1d,1ba586b..33c43e7
--- a/docs/conf.py
+++ b/docs/conf.py
@@@ -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.
diff --cc rainbowstream/config.py
index e468c9c,fddc7ee..c2f2d5c
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@@ -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:
diff --cc rainbowstream/rainbow.py
index 598d367,8760e78..d2caee3
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@@ -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 d95c411,642440e..636e6aa
--- a/setup.py
+++ 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 = [