修改登陆提示信息

taizilongxu · Sep 18, 2015 · e6d67b9 · e6d67b9
1 parent e1c8595
commit e6d67b9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/doubanfm/API/login.py b/doubanfm/API/login.py
@@ -3,25 +3,37 @@
 import requests
 import getpass
 import json
+from termcolor import colored
 
 from doubanfm.API.json_utils import decode_dict
 
+EMAIL_INFO = colored('➔', 'red') + colored(' Email: ', 'green')
+PASS_INFO = colored('➔', 'red') + colored(' Password: ', 'green')
+ERROR = colored('(╯‵□′)╯︵┻━┻: ', 'red')
 
 def win_login():
     """登陆界面"""
-    email = raw_input('Email: ')
-    password = getpass.getpass('Password: ')
+    email = raw_input(EMAIL_INFO)
+    password = getpass.getpass(PASS_INFO)
     return email, password
 
 
 def request_token():
     """通过帐号,密码请求token,返回一个dict"""
-    email, password = win_login()
-    post_data = {
-        'app_name': 'radio_desktop_win',
-        'version': '100',
-        'email': email,
-        'password': password
-    }
-    s = requests.post('http://www.douban.com/j/app/login', post_data)
-    return json.loads(s.text, object_hook=decode_dict)
+    while True:
+        email, password = win_login()
+        post_data = {
+            'app_name': 'radio_desktop_win',
+            'version': '100',
+            'email': email,
+            'password': password
+        }
+        s = requests.post('http://www.douban.com/j/app/login', post_data)
+        login_data = json.loads(s.text, object_hook=decode_dict)
+
+        if login_data['r'] == 0:
+            login_data['volume'] = 50
+            login_data['channel'] = 0
+            login_data['theme_id'] = 0
+            return login_data
+        print ERROR + login_data['err']
diff --git a/doubanfm/config.py b/doubanfm/config.py
@@ -84,15 +84,7 @@ def get_login_data(self):
                 login_data = pickle.load(f)
         else:
             # 未登陆
-            while True:
-                login_data = request_token()
-                if login_data['r'] == 0:
-                    login_data['volume'] = 50
-                    login_data['channel'] = 0
-                    login_data['theme_id'] = 0
-                    break
-                print login_data['err']
-                logger.debug(login_data['err'])
+            login_data = request_token()
 
         print '\033[31m♥\033[0m Get local token - Username: \033[33m%s\033[0m' %\
             login_data['user_name']

diff --git a/doubanfm/controller/main_controller.py b/doubanfm/controller/main_controller.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 import functools
-import Queue
 import logging
+import Queue
 from threading import Thread
 
 from doubanfm import getch

diff --git a/doubanfm/douban.py b/doubanfm/douban.py
@@ -6,17 +6,18 @@
 from player import MPlayer       # player
 # import notification             # desktop notification
 import Queue
+
 import logging
 import os
 import subprocess
 from threading import Thread
-from .config import db_config
-from .model import Playlist, Channel
-from .colorset import theme
+from doubanfm.config import db_config
+from doubanfm.model import Playlist, Channel
+from doubanfm.colorset import theme
 
-from .controller.main_controller import MainController
-from .controller.lrc_controller import LrcController
-from .controller.help_controller import HelpController
+from doubanfm.controller.main_controller import MainController
+from doubanfm.controller.lrc_controller import LrcController
+from doubanfm.controller.help_controller import HelpController
 
 # root logger config
 logging.basicConfig(