Merge pull request darknessomi#173 from darknessomi/pr/172

Pr/172
Yushenbo · Nov 9, 2015 · 6853461 · 6853461
2 parents 87c7a12 + 1170669
commit 6853461
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/NEMbox/__init__.py b/NEMbox/__init__.py
@@ -10,7 +10,7 @@
 import argparse
 import sys
 
-version = "0.2.0.1"
+version = "0.2.0.2"
 
 def start():
     nembox_menu = Menu()

diff --git a/NEMbox/api.py b/NEMbox/api.py
@@ -417,6 +417,10 @@ def songs_detail(self, ids, offset=0):
         action = 'http://music.163.com/api/song/detail?ids=[' + (',').join(tmpids) + ']'
         try:
             data = self.httpRequest('GET', action)
+
+            # the order of data['songs'] is no longer the same as tmpids, so just make the order back
+            data["songs"].sort(key=lambda song: tmpids.index(str(song["id"])))
+
             return data['songs']
         except:
             return []

diff --git a/NEMbox/menu.py b/NEMbox/menu.py
@@ -275,7 +275,7 @@ def start(self):
 
             # 前进
             elif key == ord('l') or key == 10:
-                if self.datatype == 'songs' or self.datatype == 'djchannels' or self.datatype == 'help':
+                if self.datatype == 'songs' or self.datatype == 'djchannels' or self.datatype == 'help' or len(self.datalist) <= 0:
                     continue
                 self.START = time.time()
                 self.ui.build_loading()

diff --git a/README.md b/README.md
@@ -135,6 +135,8 @@ Enjoy it !
 
 ### 更新日志
 
+2015-11-09 版本 0.2.0.2    修复崩溃错误, 优化榜单排序
+
 2015-11-05 版本 0.2.0.1    优化列表翻页功能
 
 2015-10-31 版本 0.2.0.0    新增部分操作的提醒功能

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@
 
 setup(
     name='NetEase-MusicBox',
-    version='0.2.0.1',
+    version='0.2.0.2',
     packages=find_packages(),
 
     include_package_data=True,