fix cookie issue, misc

.gitignore

@@ -37,3 +37,4 @@ env
 
 # misc
 src/ui/resources/*.zip
+src/doubanfm.log

src/common/__init__.py

@@ -0,0 +1,30 @@
+# coding: UTF-8
+import os
+import logging
+index_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+favicon = os.path.join(index_dir, 'ui/resources/doubanfm-0.xpm')
+
+def get_logger():
+    logger = logging.getLogger("DoubanFMGUI")
+    logger.setLevel(logging.DEBUG)
+    formatter = logging.Formatter('%(asctime)s - %(name)s [%(levelname)s]: %(message)s')
+
+    ch = logging.StreamHandler()
+    ch.setFormatter(formatter)
+
+    fh = logging.FileHandler(os.path.join(index_dir, "douban_fm.log"))
+    fh.setFormatter(formatter)
+    fh.setLevel(logging.INFO)
+
+    logger.addHandler(ch)
+    logger.addHandler(fh)
+    return logger
+
+logger = get_logger()
+
+def ms_to_hms(time_ms):
+    s = int(round(time_ms / 1000))
+    m, s = divmod(s, 60)
+    h, m = divmod(m, 60)
+    return h, m, s
+

src/common/doubanfm.py

@@ -24,12 +24,12 @@ def __init__(self,start_url=None,debug=False):
         self._debug = debug
         self.ROOT_PATH = os.path.abspath(os.path.dirname(__file__) + '/../')
         self.COOKIE_PATH = os.path.join(self.ROOT_PATH, '.cookie')
-        self.http_cookies = {}
+        http_cookies = {}
         if os.path.exists(self.COOKIE_PATH):
             with open(self.COOKIE_PATH) as fh:
                 cookies_text = fh.read().strip()
                 try:
-                    self.http_cookies = dict(cookie.split('=',1) for cookie in cookies_text.split('; '))
+                    http_cookies = dict(cookie.split('=',1) for cookie in cookies_text.split('; '))
                 except:
                     pass
 
@@ -49,7 +49,8 @@ def __init__(self,start_url=None,debug=False):
                 , 'r':'da01a52428'
                 }
 
-        self.http_session = requests.session(cookies=self.http_cookies)
+        self.http_session = requests.session()
+        self.http_session.cookies.update(http_cookies)
         pre_request_url = start_url or ('http://%s/' % self.douban_fm_host)
         res = self.http_session.get(pre_request_url)
         try:

src/main.py

@@ -190,7 +190,7 @@ def next_song(self):
         self._play_song()
 
     def __del__(self):
-        l.info(u'DoubanFM safely exit')
+        print 'DoubanFM safely exit'
         self.mediaObject.stop()
 
 class SystemTrayIcon(QtGui.QSystemTrayIcon):