Skip to content

Commit

Permalink
Merge pull request #413 from darknessomi/pr/411
Browse files Browse the repository at this point in the history
[Release] 0.2.3.4
  • Loading branch information
darknessomi authored Oct 13, 2016
2 parents afd8faa + b081ab4 commit 760ebcb
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion NEMbox/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from .menu import Menu

version = "0.2.3.3"
version = "0.2.3.4"


def start():
Expand Down
3 changes: 2 additions & 1 deletion NEMbox/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ def start(self):
return_data = self.request_api(self.netease.fm_like,
self.player.get_playing_id())
if return_data != -1:
notify('Added successfully!', 0)
song_name = self.player.get_playing_name()
notify('Added: %s successfully!' % song_name, 0)
else:
notify('Existing song!', 0)

Expand Down
6 changes: 6 additions & 0 deletions NEMbox/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def __init__(self):
self.info = self.storage.database['player_info']
self.songs = self.storage.database['songs']
self.playing_id = -1
self.playing_name = ''
self.cache = Cache()
self.notifier = self.config.get_item('notifier')
self.mpg123_parameters = self.config.get_item('mpg123_parameters')
Expand Down Expand Up @@ -179,6 +180,9 @@ def cacheExit(song_id, path):
def get_playing_id(self):
return self.playing_id

def get_playing_name(self):
return self.playing_name

def recall(self):
if self.info['idx'] >= len(self.info[
'player_list']) and self.end_callback is not None:
Expand All @@ -199,6 +203,7 @@ def recall(self):
self.ui.notify('Now playing', item['song_name'],
item['album_name'], item['artist'])
self.playing_id = item['song_id']
self.playing_name = item['song_name']
self.popen_recall(self.recall, item)

def generate_shuffle_playing_list(self):
Expand Down Expand Up @@ -304,6 +309,7 @@ def resume(self):
item['album_name'], item['quality'],
time.time())
self.playing_id = item['song_id']
self.playing_name = item['song_name']

def _swap_song(self):
plist = self.info['playing_list']
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ Enjoy it !

### 更新日志

2016-10-13 版本 0.2.3.4 新增歌曲评论

2016-09-26 版本 0.2.3.3 keybinder 错误修复

2016-09-15 版本 0.2.3.2 已知错误修复
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

setup(
name='NetEase-MusicBox',
version='0.2.3.3',
version='0.2.3.4',
packages=find_packages(),
install_requires=[
'requests',
Expand Down

0 comments on commit 760ebcb

Please sign in to comment.