mplug163 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b803ce89839b3d3dc4c25e36bfc815c994b2b06
-  data.tar.gz: 7668f54823b00165c6c8b25ba935de18ed587798
+  metadata.gz: 437aeb99caca66003041701b9eb00fba48932117
+  data.tar.gz: a1bb9ccf0cba4c681059712cc6ef35d81dc19607
 SHA512:
-  metadata.gz: 711b44a3e90fe1f6d2e6919515a07c1a9acb8f087aa537e6f8ab6363d524accc12a714f0af935474062338ef93d03fe6db752ad12139a25296ebcb2779b3a3fd
-  data.tar.gz: 321d42a000c67816b84775369e343dd8c77dc43467b4ddae333ed5de078e2d877b7d66dfb9e2a8aa538e9745768ea7d17e3f5a0e8653a450d32473672dbd7e6f
+  metadata.gz: 4d10ca1494b180e0083b1e2833c04a4092743d12d79bab3ca80ec17889bad701e3edb19710f6a54d9e07500b0ccae7b03fc7ea37c6f2a033ce1caa4be7ef1a6d
+  data.tar.gz: a3794c1f2a89126b003c9890f8e02c2b8e27294cc5c7d76fa8130fe4ecbea51e194879fceb76f3dba14ef1bfbab6412f47ff7ba5a999efd181ac3e7a4f405613

data/README.md

@@ -37,6 +37,7 @@ Sorry, I do not test Mplug163 in Linux. If you try it in Linux and catch some pr
 | t   | Playlist             | 收藏精选歌单           |
 | c   | Collection           | 收藏歌曲列表           |
 | a   | Album                | 收藏专辑              |
+| z   | DJ Channels          | 收藏 DJ 节目          |
 | r   | Remove Present Entry | 删除当前曲目           |
 | q   | Quit                 | 退出                  |
 

data/lib/mplug163/menu.rb

@@ -18,6 +18,7 @@ SHORTCUT =  [
   ['t', 'Playlist    ', '收藏精选歌单'],
   ['c', 'Collection  ', '收藏歌曲列表'],
   ['a', 'Album       ', '收藏专辑'],
+  ['z', 'DJ Channels ', '收藏 DJ 节目'],
   ['r', 'Remove      ', '删除当前曲目'],
   ['q', 'Quit        ', '退出']
 ]
@@ -26,7 +27,7 @@ class Menu
   def initialize
     @datatype = 'main'
     @title = '网易云音乐'
-    @datalist = %w(排行榜 艺术家 新碟上架 精选歌单 我的歌单 DJ节目 本地收藏 搜索 帮助)
+    @datalist = %w(排行榜 精选歌单 艺术家 新碟上架 我的歌单 DJ节目 本地收藏 搜索 帮助)
     @offset = 0
     @index = 0
     @present_songs = []
@@ -136,12 +137,14 @@ class Menu
       # Star a song, a playlist or an album.
       when 's'
         next if datalist.empty?
-        if datatype == 'songs' || datatype == 'djchannels'
+        if datatype == 'songs'
           @collection.push(datalist[idx]).uniq!
         elsif datatype == 'playlists'
           @playlists.push(datalist[idx]).uniq!
         elsif datatype == 'albums'
           @albums.push(datalist[idx]).uniq!
+        elsif datatype == 'djchannels'
+          @djs.push(datalist[idx]).uniq!
         end
 
       # Load favorite playlists.
@@ -171,6 +174,15 @@ class Menu
         @offset = 0
         @index = 0
 
+      # Load favorite dj channels
+      when 'z'
+        @stack.push([datatype, title, datalist, offset, index])
+        @datatype = 'djchannels'
+        @title = '网易云音乐 > 收藏 DJ 节目'
+        @datalist = @djs
+        @offset = 0
+        @index = 0
+
       # Remove an entry from the present list.
       when 'r'
         if (datatype != 'main') && !datalist.empty?
@@ -248,27 +260,27 @@ class Menu
       @title += ' > 排行榜'
       @datatype = 'songs'
 
-    # Artist
+    # Playlists
     when 1
+      playlists = netease.top_playlists
+      @datalist = netease.dig_info(playlists, 'playlists')
+      @title += ' > 精选歌单'
+      @datatype = 'playlists'
+
+    # Artist
+    when 2
       artists = netease.top_artists
       @datalist = netease.dig_info(artists, 'artists')
       @title += ' > 艺术家'
       @datatype = 'artists'
 
     # New album
-    when 2
+    when 3
       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.
@@ -294,7 +306,7 @@ class Menu
     # DJ channels
     when 5
       @datatype = 'djchannels'
-      @title += ' > DJ节目'
+      @title += ' > DJ 节目'
       @datalist = netease.djchannels
 
     # Favorite things.
@@ -320,7 +332,7 @@ class Menu
     ui = @ui
     x = ui.build_favorite_menu
 
-    if (1..3).include? x.to_i
+    if (1..4).include? x.to_i
       @stack.push([@datatype, @title, @datalist, @offset, @index])
       @index = 0
       @offset = 0
@@ -343,6 +355,11 @@ class Menu
       @datalist = @albums
       @title += ' > 收藏专辑'
 
+    when '4'
+      @datatype = 'djchannels'
+      @datalist = @djs
+      @title += ' > 收藏 DJ 节目'
+
     end
   end
 
@@ -396,6 +413,7 @@ class Menu
     @collection = data['collection'] || []
     @playlists = data['playlists'] || []
     @albums = data['albums'] || []
+    @djs = data['djs'] || []
   end
 
   def write_data
@@ -404,7 +422,8 @@ class Menu
       :account => @account,
       :collection => @collection,
       :playlists => @playlists,
-      :albums => @albums
+      :albums => @albums,
+      :djs => @djs
     }
 
     File.open(user_file, 'w') do |f|

data/lib/mplug163/ui.rb

@@ -209,7 +209,7 @@ class Ui
       end
 
     when 'playlists'
-      artist_name = get_param('搜索网易精选集：')
+      artist_name = get_param('搜索精选歌单：')
       data = @netease.search(artist_name, stype = 1000)
       if data['result'].include? 'playlists'
         playlists = data['result']['playlists']
@@ -222,9 +222,10 @@ class Ui
   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 + 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 + 4, PLAYER_X, '4 - DJ 节目')
     putstr(@screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
     @screen.getch
@@ -233,10 +234,10 @@ class Ui
   def build_search_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 + 4, PLAYER_X, '[4] 网易精选集')
+    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 + 4, PLAYER_X, '4 - 精选歌单')
     putstr(@screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
     @screen.getch
@@ -258,9 +259,9 @@ class Ui
 
   def build_login_error
     clear_to_bottom(@screen, PLAYER_CONTENT_Y, SCREEN_HEIGHT)
-    putstr(@screen, PLAYER_CONTENT_Y + 1, PLAYER_X, 'oh，信息好像不对……', Curses.color_pair(2))
-    putstr(@screen, PLAYER_CONTENT_Y + 2, PLAYER_X, '[1] 再试一次')
-    putstr(@screen, PLAYER_CONTENT_Y + 3, PLAYER_X, '[2] 稍后再试')
+    putstr(@screen, PLAYER_CONTENT_Y + 1, PLAYER_X, 'oh，出现错误 Orz', Curses.color_pair(2))
+    putstr(@screen, PLAYER_CONTENT_Y + 2, PLAYER_X, '1 - 再试一次')
+    putstr(@screen, PLAYER_CONTENT_Y + 3, PLAYER_X, '2 - 稍后再试')
     putstr(@screen, PLAYER_CONTENT_Y + 5, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
     @screen.getch

data/lib/mplug163/version.rb

@@ -1,3 +1,3 @@
 module Mplug163
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

metadata

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