Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[new_feature]增加歌词双行显示功能 #550

Merged
merged 1 commit into from
Jun 3, 2017
+40 −4
Merged

[new_feature]增加歌词双行显示功能 #550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 40 additions & 4 deletions NEMbox/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ def __init__(self):
self.update_space()
self.lyric = ''
self.now_lyric = ''
self.post_lyric = ''
self.now_lyric_index = 0
self.tlyric = ''
self.storage = Storage()
self.config = Config()
Expand Down Expand Up @@ -132,12 +134,18 @@ def build_process_bar(self, now_playing, total_length, playing_flag,
self.screen.clrtoeol()
self.screen.move(4, 1)
self.screen.clrtoeol()
self.screen.move(5, 1)
self.screen.clrtoeol()
if not playing_flag:
return
if total_length <= 0:
total_length = 1
if now_playing > total_length or now_playing <= 0:
now_playing = 0
if now_playing == 0:
self.now_lyric_index = 0
self.now_lyric = ''
self.post_lyric = ''
process = '['
for i in range(0, 33):
if i < now_playing / total_length * 33:
Expand Down Expand Up @@ -188,14 +196,23 @@ def build_process_bar(self, now_playing, total_length, playing_flag,
self.storage.database['player_info']['idx']]]
if 'lyric' not in song.keys() or len(song['lyric']) <= 0:
self.now_lyric = '暂无歌词 ~>_<~ \n'
self.post_lyric = ''
if dbus_activity and self.config.get_item('osdlyrics'):
self.now_playing = song['song_name'] + ' - ' + song[
'artist'] + '\n'

else:
key = now_minute + ':' + now_second
index = 0
for line in song['lyric']:
if key in line:
# 计算下一句歌词，判断刷新时的歌词和上一次是否相同来进行index计算
if not (self.now_lyric == re.sub('\[.*?\]', '', line)):
self.now_lyric_index = self.now_lyric_index + 1
if index < len(song['lyric']) - 1 :
self.post_lyric = song['lyric'][index + 1]
else:
self.post_lyric = ''
if 'tlyric' not in song.keys() or len(song['tlyric']) <= 0:
self.now_lyric = line
else:
Expand All @@ -204,10 +221,19 @@ def build_process_bar(self, now_playing, total_length, playing_flag,
if key in tline and self.config.get_item(
'translation'):
self.now_lyric = tline + ' || ' + self.now_lyric # NOQA
if not (self.post_lyric == ''):
self.post_lyric = tline + ' || ' + self.post_lyric
#此处已经拿到，直接break即可
break
#此处已经拿到，直接break即可
break
index += 1
self.now_lyric = re.sub('\[.*?\]', '', self.now_lyric)
self.post_lyric = re.sub('\[.*?\]', '', self.post_lyric)
if dbus_activity and self.config.get_item('osdlyrics'):
try:
bus = dbus.SessionBus().get_object('org.musicbox.Bus', '/')
#TODO 环境问题，没有试过桌面歌词，此处需要了解的人加个刷界面操作
if self.now_lyric == '暂无歌词 ~>_<~ \n':
bus.refresh_lyrics(self.now_playing,
dbus_interface='local.musicbox.Lyrics')
Expand All @@ -217,8 +243,18 @@ def build_process_bar(self, now_playing, total_length, playing_flag,
except Exception as e:
log.error(e)
pass
self.addstr(4, self.startcol - 2, str(self.now_lyric),
curses.color_pair(3))
#根据索引计算双行歌词的显示，其中当前歌词颜色为红色，下一句歌词颜色为白色；
# 当前歌词从下一句歌词刷新颜色变换，所以当前歌词和下一句歌词位置会交替
if self.now_lyric_index % 2 == 0:
self.addstr(4, self.startcol - 2, str(self.now_lyric),
curses.color_pair(3))
self.addstr(5, self.startcol + 1, str(self.post_lyric),
curses.A_DIM)
else:
self.addstr(4, self.startcol - 2, str(self.post_lyric),
curses.A_DIM)
self.addstr(5, self.startcol + 1, str(self.now_lyric),
curses.color_pair(3))
self.screen.refresh()

def build_loading(self):
Expand All @@ -231,9 +267,9 @@ def build_menu(self, datatype, title, datalist, offset, index, step,
start):
# keep playing info in line 1
curses.noecho()
self.screen.move(5, 1)
self.screen.move(7, 1)
self.screen.clrtobot()
self.addstr(5, self.startcol, title, curses.color_pair(1))
self.addstr(7, self.startcol, title, curses.color_pair(1))

if len(datalist) == 0:
self.addstr(8, self.startcol, '这里什么都没有 -，-')
Expand Down