add trend

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index ec0e47e5114dd278a561cf19ce1c3163913a7b25..bc2112e02fc85f6bc27b0c2fcd30cf67cd9dc439 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -24,20 +24,24 @@ def pixel_print(ansicolor):
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path):
+def image_to_display(path,start=None,length=None):
+    rows, columns = os.popen('stty size', 'r').read().split()
+    if not start:
+        start = IMAGE_SHIFT
+    if not length:
+        length = int(columns) - 2 * start
     i = Image.open(path)
     i = i.convert('RGBA')
     w, h = i.size
     i.load()
-    rows, columns = os.popen('stty size', 'r').read().split()
-    width = min(w, int(columns) - 2 * IMAGE_SHIFT)
+    width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
     height //= 2
     i = i.resize((width, height), Image.ANTIALIAS)
     height = min(height, IMAGE_MAX_HEIGHT)
 
     for y in xrange(height):
-        print ' ' * IMAGE_SHIFT,
+        print ' ' * start,
         for x in xrange(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index ed9b348f7187764ef38ce4c8b8b9aaa2bac3307a..27b01cc77378b017b72b075d08bbb65c7e339993 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -4,6 +4,8 @@ SEARCH_MAX_RECORD = 5
 HOME_TWEET_NUM = 5
 # Default direct message's number
 MESSAGES_DISPLAY = 5
+# Max trending topics display
+TREND_MAX = 5
 # Autocomplete history
 HISTORY_FILENAME = 'completer.hist'
 

diff --git a/rainbowstream/pure_image.py b/rainbowstream/pure_image.py
index 8e76c95a11d7e37718ec6bb0e6984fe286a35259..87b9f1bf1e5c6d4383629ab3eab551362207d513 100644 (file)
--- a/rainbowstream/pure_image.py
+++ b/rainbowstream/pure_image.py
@@ -316,20 +316,24 @@ def rgb2short(r, g, b):
     return RGB2SHORT_DICT[rgb_to_hex(m)]
 
 
-def image_to_display(path):
+def image_to_display(path,start=None,length=None):
+    rows, columns = os.popen('stty size', 'r').read().split()
+    if not start:
+        start = IMAGE_SHIFT
+    if not length:
+        length = int(columns) - 2 * start
     i = Image.open(path)
     i = i.convert('RGBA')
     w, h = i.size
     i.load()
-    rows, columns = os.popen('stty size', 'r').read().split()
-    width = min(w, int(columns) - 2 * IMAGE_SHIFT)
+    width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
     height //= 2
     i = i.resize((width, height), Image.BICUBIC)
     height = min(height, IMAGE_MAX_HEIGHT)
 
     for y in xrange(height):
-        print ' ' * IMAGE_SHIFT,
+        print ' ' * start,
         for x in xrange(width):
             p = i.getpixel((x, y))
             r, g, b = p[:3]

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 12254e882ef0bed6e00a7d1de331931d55a25d6a..c0929b4d77a657c8ed02cfaee2d6663b6d201d8c 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -31,6 +31,7 @@ g = {}
 db = RainbowDB()
 cmdset = [
     'switch',
+    'trend',
     'home',
     'view',
     'mentions',
@@ -227,20 +228,23 @@ def show_profile(u):
     followers_count = green(str(followers_count) + ' followers')
     count = statuses_count + '  ' + friends_count + '  ' + followers_count
     user = cycle_color(name) + grey(' ' + screen_name + ' : ') + count
-    profile_image_url = 'Profile photo: ' + cyan(profile_image_url)
+    profile_image_raw_url = 'Profile photo: ' + cyan(profile_image_url)
     description = ''.join(map(lambda x: x+' '*4 if x=='\n' else x,description))
     description = yellow(description)
     location = 'Location : ' + magenta(location)
     url = 'URL : ' + (cyan(url) if url else '')
-    created_at = 'Join at ' + white(created_at)
+    date = parser.parse(created_at)
+    date = date - datetime.timedelta(seconds=time.timezone)
+    clock = date.strftime('%Y/%m/%d %H:%M:%S')
+    clock = 'Join at ' + white(clock)
     # Format
     line1 = u"{u:>{uw}}".format(
         u=user,
         uw=len(user) + 2,
     )
     line2 = u"{p:>{pw}}".format(
-        p=profile_image_url,
-        pw=len(profile_image_url) + 4,
+        p=profile_image_raw_url,
+        pw=len(profile_image_raw_url) + 4,
     )
     line3 = u"{d:>{dw}}".format(
         d=description,
@@ -254,17 +258,35 @@ def show_profile(u):
         u=url,
         uw=len(url) + 4,
     )
-    line6 = u"{j:>{jw}}".format(
-        j=created_at,
-        jw=len(created_at) + 4,
+    line6 = u"{c:>{cw}}".format(
+        c=clock,
+        cw=len(clock) + 4,
     )
     # Display
     printNicely('')
-    for line in [line1,line2,line3,line4,line5,line6]:
+    printNicely(line1)
+    if g['iot']:
+        response = requests.get(profile_image_url)
+        image_to_display(StringIO(response.content),2,20)
+    else:
+        printNicely(line2)
+    for line in [line3,line4,line5,line6]:
         printNicely(line)
     printNicely('')
 
 
+def print_trends(trends):
+    """
+    Display topics
+    """
+    for topic in trends[:TREND_MAX]:
+        name = topic['name']
+        url = topic['url']
+        line = cycle_color("#" + name) + ': ' + cyan(url)
+        printNicely(line)
+    printNicely('')
+    
+
 def parse_arguments():
     """
     Parse the arguments
@@ -400,6 +422,22 @@ def switch():
         printNicely(red('Sorry I can\'t understand.'))
 
 
+def trend():
+    """
+    Trend
+    """
+    t = Twitter(auth=authen())
+    avail = t.trends.available()
+    try:
+        country = g['stuff'].split()[0]
+    except:
+        country = ''
+    for location in avail:
+        if location['country'] == country:
+            trends = t.trends.place(_id=location['woeid'])[0]['trends']
+            print_trends(trends)
+
+
 def home():
     """
     Home
@@ -845,6 +883,7 @@ def help():
     usage += s * 3 + '(see ' + grey('rainbowstream/config.py') + ').\n'
 
     usage += s + 'For more action: \n'
+    usage += s * 2 + green('trend') + ' will show closet trending topic.\n'
     usage += s * 2 + green('home') + ' will show your timeline. ' + \
         green('home 7') + ' will show 7 tweets.\n'
     usage += s * 2 + green('view @mdo') + \
@@ -940,6 +979,7 @@ def process(cmd):
         cmdset,
         [
             switch,
+            trend,
             home,
             view,
             mentions,
@@ -977,6 +1017,7 @@ def listen():
         cmdset,
         [
             ['public', 'mine'],  # switch
+            [],  # trend
             [],  # home
             ['@'],  # view
             [],  # mentions