mplug163 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c850695c2de63dc5ac9391709ead803c5014b4
-  data.tar.gz: c70748299cddc82dada1423a2f1d6a276ea91780
+  metadata.gz: 6e33bc56dcd83e31ebfdc4f491d5fe3681382a66
+  data.tar.gz: ac87072c527579dd5c70ea215ad09195a58d2d19
 SHA512:
-  metadata.gz: 192868550cb7aa2e5022ce9b77c00158597fa2988298157dcc79f368d2c24fe9ee6f10770dc253cd738d9384181372bba2fecec81d58dac61127132bd7f7ac01
-  data.tar.gz: dd8d3cc2a8af14adc75783a23b73a7565f18e662b8e93f549d5a92abd22212fe72f9566bab9ec0cf0d387ee2ec8a952095c15eda67242cfa92d90ad03d3d7582
+  metadata.gz: 51c848df5edb40fa2b9994c6f36b0240a8a0042be1ec2bb357c413ed799bb38df8e4d6f0e58140969d7f8efdad3c7fd40c06f7f660ad91d05af64155c3e33194
+  data.tar.gz: 768999fd9f74f558310dcae7143200f74e99ffc9a49d3cf4461af5b9efcc9082d5b55932daddf3e6c8f9a1152b083f73feb2a56f05d88cc93e0ed3c642b75804

data/README.md

@@ -26,16 +26,15 @@ Sorry, I do not test Mplug163 in Linux. If you try it in Linux and catch some pr
 | h   | Back                 | 后退           |
 | l   | Forward              | 前进           |
 | [   | Prev Song            | 上一首歌曲      |
-| ]   | Next Song            | 上一首歌曲      |
+| ]   | Next Song            | 下一首歌曲      |
 | ' ' | Play / Pause         | 播放 / 暂停     |
 | u   | Prev Page            | 上一页列表      |
 | d   | Next Page            | 下一页列表      |
 | f   | Search               | 搜索           |
 | m   | Main Menu            | 主菜单         |
 | p   | Present Playlist     | 当前播放列表    |
-| a   | Add                  | 添加歌曲到打碟  |
-| z   | DJ List              | 打碟列表       |
-| s   | Star Song            | 收藏歌曲       |
+| s   | Star                 | 收藏歌曲或精选歌单|
+| t   | Playlist             | 收藏精选歌单    |
 | c   | Collection           | 收藏歌曲列表    |
 | r   | Remove Present Entry | 删除当前曲目    |
 | q   | Quit                 | 退出           |

data/lib/mplug163/api.rb

@@ -23,18 +23,19 @@ class NetEase
     Unirest.timeout @default_timeout
   end
 
-  def http_request(method, action, query=nil, urlencoded=nil, callback=nil, timeout=nil)
-    if method == 'GET'
-      url = (query == nil ? action : "#{action}?#{query}")
-      connection = Unirest.get(url, headers: @header)
-    elsif method == 'POST'
-      connection = Unirest.post(action, headers: @header, parameters: query)
-    end
+  def http_request(method, action, query = nil)
+    connection =
+      if method == 'GET'
+        url = (query.nil? ? action : "#{action}?#{query}")
+        Unirest.get(url, headers: @header)
+      elsif method == 'POST'
+        Unirest.post(action, headers: @header, parameters: query)
+      end
 
     connection.body
   end
 
-  # 登录
+  # Log in
   def login(username, password)
     action = "http://music.163.com/api/login/"
     query = {
@@ -44,24 +45,20 @@ class NetEase
     }
     begin
       return http_request('POST', action, query)
-    rescue Exception => e
+    rescue => e
       return {"code" => 501}
     end
   end
 
-  # 用户歌单
-  def user_playlists(uid, offset=0, limit=100)
+  # User's playlists
+  def user_playlists(uid, offset = 0, limit = 100)
     action = "http://music.163.com/api/user/playlist/?offset=#{offset}&limit=#{limit}&uid=#{uid}"
-    begin
-      data = http_request('GET', action)
-      return data['playlist']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    data['playlist']
   end
 
-  # 搜索单曲(1)，歌手(100)，专辑(10)，歌单(1000)，用户(1002)
-  def search(s, stype=1, offset=0, total='true', limit=100)
+  # Search song(1)，artist(100)，album(10)，playlist(1000)，user(1002)
+  def search(s, stype = 1, offset = 0, limit = 100)
     action = "http://music.163.com/api/search/get/web"
     query = {
       "s" => s,
@@ -73,128 +70,92 @@ class NetEase
     http_request('POST', action, query)
   end
 
-  # 新碟上架 http://music.163.com/#/discover/album/
+  # New albums
+  # http://music.163.com/#/discover/album/
   def new_albums(offset=0, limit=50)
     action = "http://music.163.com/api/album/new?area=ALL&offset=#{offset}&total=true&limit=#{limit}"
-    begin
-      data = http_request('GET', action)
-      return data['albums']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    data['albums']
   end
 
-  # 歌单（网友精选碟） hot||new http://music.163.com/#/discover/playlist/
+  # Top playlists
+  # hot||new http://music.163.com/#/discover/playlist/
 
   # '全部' => '%E5%85%A8%E9%83%A8'
-  def top_playlists(category='%E5%85%A8%E9%83%A8', order='hot', offset=0, limit=50)
+  def top_playlists(category = '%E5%85%A8%E9%83%A8', order = 'hot', offset = 0, limit = 100)
     flag = (offset > 0 ? true : false)
     action = "http://music.163.com/api/playlist/list?cat=#{category}&order=#{order}&offset=#{offset}&total=#{flag}&limit=#{limit}"
-    begin
-      data = http_request('GET', action)
-      return data['playlists']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['playlists']
   end
 
-  # 歌单详情
+  # Playlist's details
   def playlist_detail(playlist_id)
     action = "http://music.163.com/api/playlist/detail?id=#{playlist_id}"
-    begin
-      data = http_request('GET', action)
-      return data['result']['tracks']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['result']['tracks']
   end
 
-  # 热门歌手 http://music.163.com/#/discover/artist/
-  def top_artists(offset=0, limit=100)
+  # Top artists
+  # http://music.163.com/#/discover/artist/
+  def top_artists(offset = 0, limit = 100)
     action = "http://music.163.com/api/artist/top?offset=#{offset}&total=false&limit=#{limit}"
-    begin
-      data = http_request('GET', action)
-      return data['artists']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['artists']
   end
 
-  # 热门单曲 http://music.163.com/#/discover/toplist 50
-  def top_songlist(offset=0, limit=100)
+  # Top songlist
+  # http://music.163.com/#/discover/toplist 100
+  def top_songlist
     action = "http://music.163.com/discover/toplist"
-    begin
-      connection = http_request('GET', action)
-      songids = connection.scan(/\/song\?id=(\d+)/)
-      return [] if songids == []
-      return songs_detail(songids.uniq)
-    rescue Exception => e
-      return []
-    end
+    connection = http_request('GET', action)
+    songids = connection.scan(/\/song\?id=(\d+)/)
+    return [] if songids == []
+    return songs_detail(songids.uniq)
   end
 
-  # 歌手单曲
+  # Songs to which a artist belongs.
   def artists(artist_id)
     action = "http://music.163.com/api/artist/#{artist_id}"
-    begin
-      data = http_request('GET', action)
-      return data['hotSongs']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['hotSongs']
   end
 
   # album id -> song id set
   def album(album_id)
     action = "http://music.163.com/api/album/#{album_id}"
-    begin
-      data = http_request('GET', action)
-      return data['album']['songs']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['album']['songs']
   end
 
   # song ids -> song urls (details)
   def songs_detail(ids, offset=0)
     tmpids = ids[offset, 100]
     action = "http://music.163.com/api/song/detail?ids=[#{tmpids.join(',')}]"
-    begin
-      data = http_request('GET', action)
-      return data['songs']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['songs']
   end
 
   # song id -> song url (details)
   def song_detail(music_id)
     id = music_id.join(',')
     action = "http://music.163.com/api/song/detail/?id=#{id}&ids=[#{id}]"
-    begin
-      data = http_request('GET', action)
-      return data['songs']
-    rescue Exception => e
-      return []
-    end
+    data = http_request('GET', action)
+    return data['songs']
   end
 
-  # 今日最热（0）, 本周最热（10），历史最热（20），最新节目（30）
-  def djchannels(stype=0, offset=0, limit=30)
+  # DJ channels: hot today(0), week(10), history(20), new(30)
+  def djchannels(stype = 0, offset = 0, limit = 50)
     action = "http://music.163.com/discover/djchannel?type=#{stype}&offset=#{offset}&limit=#{limit}"
-    begin
-      connection = http_request('GET', action)
-      channelids = connection.scan(/\/dj\?id=(\d+)/) || []
-      return [] if channelids.empty?
-      return channel_detail(channelids.uniq)
-    rescue Exception => e
-      return []
-    end
+    connection = http_request('GET', action)
+    channelids = connection.scan(/\/dj\?id=(\d+)/) || []
+    return [] if channelids.empty?
+    return channel_detail(channelids.uniq)
   end
 
   # DJchannel (id, channel_name) ids -> song urls (details)
-  # channels 整理为 songs 类型
-  def channel_detail(channelids, offset=0)
+  # channels -> songs
+  def channel_detail(channelids)
     channels = []
 
     # ["xxxxxx"] -> "xxxxxx"
@@ -204,7 +165,7 @@ class NetEase
         data = http_request('GET', action)
         channel = dig_info(data['program']['mainSong'], 'channels')
         channels.push(channel)
-      rescue Exception => e
+      rescue => e
         next
       end
     end

data/lib/mplug163/menu.rb

@@ -14,10 +14,10 @@ SHORTCUT =  [
   ['f', 'Search      ', '搜索'],
   ['m', 'Menu        ', '主菜单'],
   ['p', 'Present     ', '当前播放列表'],
-  ['a', 'Add         ', '添加歌曲到打碟'],
-  ['z', 'DJ list     ', '打碟列表'],
-  ['s', 'Star        ', '收藏歌曲'],
+  ['s', 'Star        ', '收藏歌曲或精选歌单或专辑'],
+  ['t', 'Playlist    ', '收藏精选歌单'],
   ['c', 'Collection  ', '收藏歌曲列表'],
+  ['a', 'Album       ', '收藏专辑'],
   ['r', 'Remove      ', '删除当前曲目'],
   ['q', 'Quit        ', '退出']
 ]
@@ -26,7 +26,7 @@ class Menu
   def initialize
     @datatype = 'main'
     @title = '网易云音乐'
-    @datalist =  ['排行榜', '艺术家', '新碟上架', '精选歌单', '我的歌单', 'DJ节目', '打碟', '收藏', '搜索', '帮助']
+    @datalist = %w(排行榜 艺术家 新碟上架 精选歌单 我的歌单 DJ节目 本地收藏 搜索 帮助)
     @offset = 0
     @index = 0
     @present_songs = []
@@ -36,10 +36,10 @@ class Menu
     @screen = @ui.screen
     @step = 10
     @stack = []
-    @djstack = []
     @userid = nil
     @username = nil
     @collection = []
+    @playlists = []
     @account = {}
 
     @wait = 0.1
@@ -60,65 +60,69 @@ class Menu
       idx = index = @index
       step = @step
       stack = @stack
-      djstack = @djstack
       key = @screen.getch
       @screen.refresh
 
       case key
 
-      # 退出
+      # Quit
       when 'q'
         break
 
-      # 上移
+      # Up
       when 'k'
         @index = @carousel[@offset, [datalist.size, offset+step].min - 1, idx - 1]
 
-      # 下移
+      # Down
       when 'j'
         @index = @carousel[@offset, [datalist.size, offset+step].min - 1, idx + 1]
 
-      # 向上翻页
+      # Previous page
       when 'u'
         next if offset == 0
         @offset = @offset - step
         @index = (index - step).divmod(step)[0] * step
 
-      # 向下翻页
+      # Next page
       when 'd'
         next if offset + step >= datalist.size
         @offset = @offset + step
         @index = (index + step).divmod(step)[0] * step
 
-      # 前进
+      # Forward
       when 'l'
-        next if @datatype == 'songs' || @datatype == 'djchannels' || @datatype == 'help'
-        @ui.build_loading
-        dispatch_enter(idx)
-        @index = 0
-        @offset = 0
+        next if @datatype == 'help'
+        if @datatype == 'songs' || @datatype == 'djchannels'
+          @player.play(@datatype, datalist, @index, true)
+          sleep @wait
+        else
+          @ui.build_loading
+          dispatch_enter(idx)
+          @index = 0
+          @offset = 0
+        end
 
-      # 回退
+      # Back
       when 'h'
         next if @stack.size == 1
         up = stack.pop
         @datatype, @title, @datalist, @offset, @index = up[0], up[1], up[2], up[3], up[4]
 
-      # 搜索
+      # Search
       when 'f'
         search
 
-      # 下一曲
+      # Next song
       when ']'
         @player.next
         sleep @wait
 
-      # 上一曲
+      # Previous song
       when '['
         @player.prev
         sleep @wait
 
-      # 播放、暂停
+      # Play or pause a song.
       when ' '
         if datatype == 'songs'
           @present_songs = ['songs', title, datalist, offset, index]
@@ -128,50 +132,59 @@ class Menu
         @player.play(datatype, datalist, idx)
         sleep @wait
 
-      # 加载当前播放列表
+      # Load present playlist.
       when 'p'
         next if @present_songs.empty?
         @stack.push([datatype, title, datalist, offset, index])
         @datatype, @title, @datalist, @offset, @index = @present_songs[0], @present_songs[1], @present_songs[2], @present_songs[3], @present_songs[4]
 
-      # 添加到打碟歌单
-      when 'a'
-        if datatype == 'songs' && !datalist.empty?
-          @djstack.push(datalist[idx])
+
+      # Star a song, a playlist or an album.
+      when 's'
+        next if datalist.empty?
+        if datatype == 'songs' || datatype == 'djchannels'
+          @collection.push(datalist[idx]).uniq!
+        elsif datatype == 'playlists'
+          @playlists.push(datalist[idx]).uniq!
+        elsif datatype == 'albums'
+          @albums.push(datalist[idx]).uniq!
         end
 
-      # 加载打碟歌单
-      when 'z'
+      # Load favorite playlists.
+      when 't'
         @stack.push([datatype, title, datalist, offset, index])
-        @datatype = 'songs'
-        @title = '网易云音乐 > 打碟'
-        @datalist = @djstack
+        @datatype = 'playlists'
+        @title = '网易云音乐 > 收藏精选歌单'
+        @datalist = @playlists
         @offset = 0
         @index = 0
 
-      # 添加到收藏歌曲
-      when 's'
-        if (datatype == 'songs' || datatype == 'djchannels') && !datalist.empty?
-          @collection.push(datalist[idx]).uniq!
-        end
-
-      # 加载收藏歌曲
+      # Load favorite songs.
       when 'c'
         @stack.push([datatype, title, datalist, offset, index])
         @datatype = 'songs'
-        @title = '网易云音乐 > 打碟'
+        @title = '网易云音乐 > 收藏歌曲列表'
         @datalist = @collection
         @offset = 0
         @index = 0
 
-      # 从当前列表移除
+      # Load favorite albums
+      when 'a'
+        @stack.push([datatype, title, datalist, offset, index])
+        @datatype = 'albums'
+        @title = '网易云音乐 > 收藏专辑'
+        @datalist = @albums
+        @offset = 0
+        @index = 0
+
+      # Remove an entry from the present list.
       when 'r'
         if (datatype != 'main') && !datalist.empty?
           @datalist.delete_at(idx)
           @index = @carousel[@offset, [datalist.size, offset+step].min - 1, idx]
         end
 
-      # 主菜单
+      # Main menu.
       when 'm'
         if datatype != 'main'
           @stack.push([datatype, title, datalist, offset, index])
@@ -203,7 +216,7 @@ class Menu
     when 'main'
       choice_channel idx
 
-    # 该艺术家的热门歌曲
+    # Hot songs to which a artist belongs.
     when 'artists'
       artist_id = datalist[idx]['artist_id']
       songs = netease.artists(artist_id)
@@ -211,7 +224,7 @@ class Menu
       @datalist = netease.dig_info(songs, 'songs')
       @title += " > #{datalist[idx]['aritsts_name']}"
 
-    # 该专辑包含的歌曲
+    # All songs to which an album belongs.
     when 'albums'
       album_id = datalist[idx]['album_id']
       songs = netease.album(album_id)
@@ -219,7 +232,7 @@ class Menu
       @datalist = netease.dig_info(songs, 'songs')
       @title += " > #{datalist[idx]['albums_name']}"
 
-    # 该歌单包含的歌曲
+    # All songs to which a playlist belongs.
     when 'playlists'
       playlist_id = datalist[idx]['playlist_id']
       songs = netease.playlist_detail(playlist_id)
@@ -234,41 +247,39 @@ class Menu
 
     case idx
 
-    # 排行榜
+    # Top
     when 0
       songs = netease.top_songlist
       @datalist = netease.dig_info(songs, 'songs')
       @title += ' > 排行榜'
       @datatype = 'songs'
 
-    # 艺术家
+    # Artist
     when 1
       artists = netease.top_artists
       @datalist = netease.dig_info(artists, 'artists')
       @title += ' > 艺术家'
       @datatype = 'artists'
 
-    # 新碟上架
+    # New album
     when 2
       albums = netease.new_albums
       @datalist = netease.dig_info(albums, 'albums')
       @title += ' > 新碟上架'
       @datatype = 'albums'
 
-    # 精选歌单
+    # Playlists
     when 3
       playlists = netease.top_playlists
       @datalist = netease.dig_info(playlists, 'playlists')
       @title += ' > 精选歌单'
       @datatype = 'playlists'
 
-    # 我的歌单
+    # My playlist
     when 4
-      # 未登录
+      # Require user's account before fetching his playlists.
       if !@userid
-        if !@account.empty?
-          user_info = netease.login(@account[0], @account[1])
-        end
+        user_info = netease.login(@account[0], @account[1]) unless @account.empty?
 
         if @account == {} || user_info['code'] != 200
           data = @ui.build_login
@@ -280,36 +291,28 @@ class Menu
         @userid = user_info['account']['id']
       end
 
-      # 读取登录之后的用户歌单
+      # Fetch this user's all playlists while he logs in successfully.
       my_playlist = netease.user_playlists(@userid)
       @datalist = netease.dig_info(my_playlist, 'playlists')
       @datatype = 'playlists'
       @title += " > #{@username} 的歌单"
 
-    # DJ节目
+    # DJ channels
     when 5
       @datatype = 'djchannels'
       @title += ' > DJ节目'
       @datalist = netease.djchannels
 
-    # 打碟
+    # Favorite things.
     when 6
-      @datatype = 'songs'
-      @title += ' > 打碟'
-      @datalist = @djstack
+      favorite
 
-    # 收藏
+    # Search
     when 7
-      @datatype = 'songs'
-      @title += ' > 收藏'
-      @datalist = @collection
-
-    # 搜索
-    when 8
       search
 
-    # 帮助
-    when 9
+    # Help
+    when 8
       @datatype = 'help'
       @title += ' > 帮助'
       @datalist = SHORTCUT
@@ -319,11 +322,41 @@ class Menu
     @index = 0
   end
 
+  def favorite
+    ui = @ui
+    x = ui.build_favorite_menu
+
+    if (1..3).include? x.to_i
+      @stack.push([@datatype, @title, @datalist, @offset, @index])
+      @index = 0
+      @offset = 0
+    end
+
+    case x
+
+    when '1'
+      @datatype = 'songs'
+      @datalist = @collection
+      @title += ' > 收藏歌曲'
+
+    when '2'
+      @datatype = 'playlists'
+      @datalist = @playlists
+      @title += ' > 收藏歌单'
+
+    when '3'
+      @datatype = 'albums'
+      @datalist = @albums
+      @title += ' > 收藏专辑'
+
+    end
+  end
+
   def search
     ui = @ui
     x = ui.build_search_menu
 
-    if (1...5).include? x.to_i
+    if (1..4).include? x.to_i
       @stack.push([@datatype, @title, @datalist, @offset, @index])
       @index = 0
       @offset = 0
@@ -356,30 +389,28 @@ class Menu
   private
 
   def check_mplug163_dir
-    Dir.mkdir File.expand_path("~/.mplug163") unless Dir.exists? File.expand_path("~/.mplug163")
-
+    Dir.mkdir File.expand_path("~/.mplug163") unless Dir.exist? File.expand_path("~/.mplug163")
   end
 
   def read_data
     check_mplug163_dir
     user_file = File.expand_path("~/.mplug163/flavor.json")
-    if File.exists? user_file
-      begin
-        data = JSON.parse(File.read(user_file))
-        @collection = data['collection']
-        @account = data['account']
-      rescue Exception => e
-        @collection = []
-        @account = {}
-      end
-    end
+    return unless File.exist? user_file
+
+    data = JSON.parse(File.read(user_file))
+    @account = data['account'] || {}
+    @collection = data['collection'] || []
+    @playlists = data['playlists'] || []
+    @albums = data['albums'] || []
   end
 
   def write_data
     user_file = File.expand_path("~/.mplug163/flavor.json")
     data = {
       :account => @account,
-      :collection => @collection
+      :collection => @collection,
+      :playlists => @playlists,
+      :albums => @albums
     }
 
     File.open(user_file, 'w') do |f|

data/lib/mplug163/player.rb

@@ -19,36 +19,36 @@ class Player
     @pause_flag = false
 
     item = @songs[@idx]
-    @ui.build_playinfo(item['song_name'], item['artist'], item['album_name'])
+    @ui.build_playinfo(item['song_name'], item['artist'])
 
     @thread = Thread.new do
       @mp3id, stdin, stdout, stderr = Open4::popen4('mpg123', item['mp3_url'])
       Process::waitpid2 @mp3id
 
       if @playing_flag
-        @idx = @carousel[0, @songs.size-1, @idx+1]
+        @idx = @carousel[0, @songs.size - 1, @idx + 1]
         recall
       end
     end
   end
 
-  def play(datatype, songs, idx)
+  def play(datatype, songs, idx, switch_flag = false)
     @datatype = datatype
 
     if datatype == 'songs' || datatype == 'djchannels'
-      if @idx == idx && @songs == songs
-        @pause_flag ? resume : pause
-      else
-        if datatype == 'songs' || datatype == 'djchannels'
-          @songs = songs
-          @idx = idx
-        end
+
+      if !switch_flag
+        @pause_flag ? resume : pause if @songs == songs
+      elsif switch_flag
+        @songs = songs
+        @idx = idx
         @playing_flag ? switch : recall
       end
+
     else
-      if @playing_flag
-        @pause_flag ? resume : pause
-      end
+
+      @pause_flag ? resume : pause if @playing_flag
+
     end
   end
 
@@ -59,41 +59,47 @@ class Player
   end
 
   def stop
-    if @playing_flag && @thread && @mp3id
-      @playing_flag = false
-      # kill this process and thread
-      Process.kill(:SIGKILL, @mp3id)
-      Thread.kill @thread
-    end
+    return unless @playing_flag
+    return unless @thread
+    return unless @mp3id
+
+    @playing_flag = false
+    # kill this process and thread
+    Process.kill(:SIGKILL, @mp3id)
+    Thread.kill @thread
   end
 
   def pause
     @pause_flag = true
     # send SIGSTOP to pipe
     Process.kill(:SIGSTOP, @mp3id)
+
     item = @songs[@idx]
-    @ui.build_playinfo(item['song_name'], item['artist'], item['album_name'], true)
+    @ui.build_playinfo(item['song_name'], item['artist'], true)
   end
 
   def resume
     @pause_flag = false
     # send SIGCONT to pipe
     Process.kill(:SIGCONT, @mp3id)
+
     item = @songs[@idx]
-    @ui.build_playinfo(item['song_name'], item['artist'], item['album_name'])
+    @ui.build_playinfo(item['song_name'], item['artist'])
   end
 
   def next
     stop
     sleep @wait
-    @idx = @carousel[0, @songs.size-1, @idx+1]
+
+    @idx = @carousel[0, @songs.size - 1, @idx + 1]
     recall
   end
 
   def prev
     stop
     sleep @wait
-    @idx = @carousel[0, @songs.size-1, @idx-1]
+
+    @idx = @carousel[0, @songs.size - 1, @idx - 1]
     recall
   end
 end

data/lib/mplug163/ui.rb

@@ -59,7 +59,7 @@ class Ui
     @netease = NetEase.new
   end
 
-  def build_playinfo(song_name, artist, album_name, pause=false)
+  def build_playinfo(song_name, artist, pause = false)
     if pause
       putstr(@screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '■', Curses.color_pair(3))
     else
@@ -79,6 +79,8 @@ class Ui
   end
 
   def build_menu(datatype, title, datalist, offset, index, step)
+    title = pretty_format(title, 0, 52)
+
     clear_to_bottom(@screen, PLAYER_CONTENT_Y, SCREEN_HEIGHT)
     putstr(@screen, PLAYER_TITLE_Y, PLAYER_X, title, Curses.color_pair(1))
 
@@ -87,7 +89,7 @@ class Ui
     else
       case datatype
       when 'main'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
             line_info = "♩ #{i}. #{datalist[i]}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
@@ -100,7 +102,7 @@ class Ui
         putstr(@screen, PLAYER_INFO_Y, PLAYER_X, 'Crafted with ❤ by Ripple Yui', Curses.color_pair(3))
 
       when 'songs'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
             info = "♩ #{i}. #{datalist[i]['song_name']} - #{datalist[i]['artist']} - #{datalist[i]['album_name']}"
             line_info = pretty_format(info, 0, 52)
@@ -113,7 +115,7 @@ class Ui
         end
 
       when 'artists'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
             line_info = "♩ #{i}. #{datalist[i]['artists_name']} - #{datalist[i]['artist']} #{datalist[i]['alias']}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
@@ -124,40 +126,46 @@ class Ui
         end
 
       when 'albums'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
-            line_info = "♩ #{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
+            info = "♩ #{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
+            line_info = pretty_format(info, 0, 52)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
           else
-            line_info = "#{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
+            info = "#{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
+            line_info = pretty_format(info, 0, 50)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
 
       when 'playlists'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
-            line_info = "♩ #{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
+            info = "♩ #{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
+            line_info = pretty_format(info, 0, 52)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
           else
-            line_info = "#{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
+            info = "#{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
+            line_info = pretty_format(info, 0, 50)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
 
       when 'djchannels'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           if i == index
-            line_info = "♩ #{i}. #{datalist[i][0]['song_name']}"
+            info = "♩ #{i}. #{datalist[i][0]['song_name']}"
+            line_info = pretty_format(info, 0, 52)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
           else
-            line_info = "#{i}. #{datalist[i][0]['song_name']}"
+            info = "#{i}. #{datalist[i][0]['song_name']}"
+            line_info = pretty_format(info, 0, 50)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
 
       when 'help'
-        (offset...[datalist.length, offset+step].min).each do |i|
+        (offset...[datalist.length, offset + step].min).each do |i|
           line_info = "#{i}. #{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
           putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
         end
@@ -170,62 +178,58 @@ class Ui
     case stype
     when 'songs'
       song_name = get_param('搜索歌曲：')
-      begin
-        data = @netease.search(song_name, stype=1)
-        song_ids = []
-        if data['result'].include? 'songs'
-          if data['result']['songs'].include? 'mp3Url'
-            songs = data['result']['songs']
-          else
-            (0...data['result']['songs'].size).each do |i|
-              song_ids.push data['result']['songs'][i]['id']
-            end
-            songs = @netease.songs_detail(song_ids)
+      data = @netease.search(song_name, stype = 1)
+      song_ids = []
+      if data['result'].include? 'songs'
+        if data['result']['songs'].include? 'mp3Url'
+          songs = data['result']['songs']
+        else
+          (0...data['result']['songs'].size).each do |i|
+            song_ids.push data['result']['songs'][i]['id']
           end
-          return @netease.dig_info(songs, 'songs')
+          songs = @netease.songs_detail(song_ids)
         end
-      rescue Exception => e
-        return []
+        return @netease.dig_info(songs, 'songs')
       end
 
     when 'artists'
       artist_name = get_param('搜索艺术家：')
-      begin
-         data = @netease.search(artist_name, stype=100)
-         if data['result'].include? 'artists'
-           artists = data['result']['artists']
-           return @netease.dig_info(artists, 'artists')
-         end
-      rescue Exception => e
-        return []
+      data = @netease.search(artist_name, stype = 100)
+      if data['result'].include? 'artists'
+        artists = data['result']['artists']
+        return @netease.dig_info(artists, 'artists')
       end
 
     when 'albums'
       artist_name = get_param('搜索专辑：')
-      begin
-        data = @netease.search(artist_name, stype=10)
-        if data['result'].include? 'albums'
-          albums = data['result']['albums']
-          return @netease.dig_info(albums, 'albums')
-        end
-      rescue Exception => e
-        return []
+      data = @netease.search(artist_name, stype = 10)
+      if data['result'].include? 'albums'
+        albums = data['result']['albums']
+        return @netease.dig_info(albums, 'albums')
       end
 
     when 'playlists'
       artist_name = get_param('搜索网易精选集：')
-      begin
-        data = @netease.search(artist_name, stype=1000)
-        if data['result'].include? 'playlists'
-          playlists = data['result']['playlists']
-          return @netease.dig_info(playlists, 'playlists')
-        end
-      rescue Exception => e
-        return []
+      data = @netease.search(artist_name, stype = 1000)
+      if data['result'].include? 'playlists'
+        playlists = data['result']['playlists']
+        return @netease.dig_info(playlists, 'playlists')
       end
+
     end
   end
 
+  def build_favorite_menu
+    clear_to_bottom(@screen, PLAYER_CONTENT_Y, SCREEN_HEIGHT)
+    putstr(@screen, PLAYER_CONTENT_Y, PLAYER_X, '选择收藏条目类型：', Curses.color_pair(1))
+    putstr(@screen, PLAYER_CONTENT_Y + 1, PLAYER_X, '[1] 歌曲')
+    putstr(@screen, PLAYER_CONTENT_Y + 2, PLAYER_X, '[2] 精选歌单')
+    putstr(@screen, PLAYER_CONTENT_Y + 3, PLAYER_X, '[3] 专辑')
+    putstr(@screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
+    @screen.refresh
+    @screen.getch
+  end
+
   def build_search_menu
     clear_to_bottom(@screen, PLAYER_CONTENT_Y, SCREEN_HEIGHT)
     putstr(@screen, PLAYER_CONTENT_Y, PLAYER_X, '选择搜索类型：', Curses.color_pair(1))
@@ -235,7 +239,7 @@ class Ui
     putstr(@screen, PLAYER_CONTENT_Y + 4, PLAYER_X, '[4] 网易精选集')
     putstr(@screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
-    x = @screen.getch
+    @screen.getch
   end
 
   def build_login
@@ -259,7 +263,7 @@ class Ui
     putstr(@screen, PLAYER_CONTENT_Y + 3, PLAYER_X, '[2] 稍后再试')
     putstr(@screen, PLAYER_CONTENT_Y + 5, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
-    x = @screen.getch
+    @screen.getch
   end
 
   def get_param(prompt_str)
@@ -267,7 +271,7 @@ class Ui
     putstr(@screen, PLAYER_CONTENT_Y, PLAYER_X, prompt_str, Curses.color_pair(1))
     @screen.setpos(PLAYER_CONTENT_Y + 2, PLAYER_X)
     params = @screen.getstr
-    if params.strip == nil
+    if params.strip.nil?
       return get_param(prompt_str)
     else
       return params
@@ -276,7 +280,7 @@ class Ui
 
   private
 
-  def putstr(screen, y, x, string, color=Curses.color_pair(0))
+  def putstr(screen, y, x, string, color = Curses.color_pair(0))
     screen.setpos(y, x)
     screen.clrtoeol
     screen.attrset(color)

data/lib/mplug163/version.rb

@@ -1,3 +1,3 @@
 module Mplug163
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mplug163
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ripple Yui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler