minor fix

[rainbowstream.git] / rainbowstream / util.py

diff --git a/rainbowstream/util.py b/rainbowstream/util.py
index 1451aecdae4b441c6e13cf95ed010d5d50bd630f..292a7e5b408687f88f1f134500032302f011b810 100644 (file)
--- a/rainbowstream/util.py
+++ b/rainbowstream/util.py
@@ -21,23 +21,33 @@ def detail_twitter_error(twitterException):
         printNicely(yellow(info))
 
 
         printNicely(yellow(info))
 
 

-def format_prefix(listname = '', keyword = ''):
+def format_prefix(listname='', keyword=''):

     """
     Format the custom prefix
     """
     formattedPrefix = c['PREFIX']
     """
     Format the custom prefix
     """
     formattedPrefix = c['PREFIX']

-    username = '@' + c['original_name']
+    owner = '@' + c['original_name']

     place = ''
     place = ''

-    if keyword != '':
-        place = '/public'
-        keyword = '#' + keyword
-
-    if listname != '':
-        username, place = listname.split('/')
-        place = "/" + place
-
-    formattedPrefix = formattedPrefix.replace("#username", username)
-    formattedPrefix = formattedPrefix.replace("#place", place)
-    formattedPrefix = formattedPrefix.replace("#keyword", keyword)
+    # Public stream
+    if keyword:
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
+    # List stream
+    elif listname:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#me'))
+        owner, place = listname.split('/')
+        place = '/' + place
+    # Personal stream
+    else:
+        formattedPrefix = ''.join(formattedPrefix.split('#keyword'))
+        formattedPrefix = ''.join(formattedPrefix.split('#owner'))
+        formattedPrefix = ''.join(formattedPrefix.split('#place'))
+
+    formattedPrefix = formattedPrefix.replace('#owner', owner)
+    formattedPrefix = formattedPrefix.replace('#place', place)
+    formattedPrefix = formattedPrefix.replace('#keyword', keyword)
+    formattedPrefix = formattedPrefix.replace('#me', '@' + c['original_name'])

 
     return formattedPrefix
 
     return formattedPrefix