check config and little refactoring

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 6aad12c1a91785b994a24a447c56d5aaf8aae109..ff2d17df7e51db45591898f5ca442f46d5e853de 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -46,7 +46,7 @@ try:
     for d in data:
         c[d] = data[d]
 except:
-    pass
+    print('It seems that ~/.rainbow_config.json has wrong format :(')
 
 # Load default theme
 theme_file = os.path.dirname(

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index f543b35e417ae67912bb3d7b28dbc80300ed5d1a..94440877f32f09b14add6703ad3dad1a3344159b 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -797,6 +797,23 @@ def report():
         printNicely(red('Sorry I can\'t understand.'))
 
 
+def get_slug():
+    """
+    Get Slug Decorator
+    """
+     # Get list name
+    list_name = raw_input(light_magenta('Give me the list\'s name: '))
+    # Get list name and owner
+    try:
+        owner, slug = list_name.split('/')
+        if slug.startswith('@'):
+            slug = slug[1:]
+        return owner, slug
+    except:
+        printNicely(light_magenta('List name should follow "@owner/list_name" format.'))
+        raise Exception('Wrong list name')
+
+
 def show_lists(t):
     """
     List list
@@ -812,16 +829,7 @@ def list_home(t):
     """
     List home
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     res = t.lists.statuses(
         slug=slug,
         owner_screen_name=owner,
@@ -836,16 +844,7 @@ def list_members(t):
     """
     List members
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Get members
     rel = {}
     next_cursor = -1
@@ -869,16 +868,7 @@ def list_subscribers(t):
     """
     List subscribers
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Get subscribers
     rel = {}
     next_cursor = -1
@@ -902,16 +892,7 @@ def list_add(t):
     """
     Add specific user to a list
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Add
     user_name = raw_input(light_magenta('Give me name of the newbie: '))
     if user_name.startswith('@'):
@@ -930,16 +911,7 @@ def list_remove(t):
     """
     Remove specific user from a list
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Remove
     user_name = raw_input(light_magenta('Give me name of the unlucky one: '))
     if user_name.startswith('@'):
@@ -958,16 +930,7 @@ def list_subscribe(t):
     """
     Subscribe to a list
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Subscribe
     try:
         t.lists.subscribers.create(
@@ -983,16 +946,7 @@ def list_unsubscribe(t):
     """
     Unsubscribe a list
     """
-    # Get list name
-    list_name = raw_input(light_magenta('Give me the list\'s name: '))
-    # Get list name and owner
-    try:
-        owner, slug = list_name.split('/')
-        if slug.startswith('@'):
-            slug = slug[1:]
-    except:
-        printNicely(light_magenta('Please follow "@owner/list_name" format.'))
-        return
+    owner, slug = get_slug()
     # Subscribe
     try:
         t.lists.subscribers.destroy(
@@ -1108,7 +1062,7 @@ def list():
     try:
         return action_ary[g['list_action']](t)
     except:
-        printNicely(red('Sorry I can\'t understand.'))
+        printNicely(red('Please try again.'))
 
 
 def cal():

diff --git a/setup.py b/setup.py
index f90a549f522c7d93541749013573887e4374cb9d..501457c33aa1c643839cd60281b9fb49071d371c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os, sys
 
 # Bumped version
-version = '0.3.8'
+version = '0.3.9'
 
 # Require
 install_requires = [