mplug163 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5143da5494049d78f55d76a98a1b91b79655c641
-  data.tar.gz: 4694b7e9a9316f81ff7e90c834679cc8ac7c7410
+  metadata.gz: 74c850695c2de63dc5ac9391709ead803c5014b4
+  data.tar.gz: c70748299cddc82dada1423a2f1d6a276ea91780
 SHA512:
-  metadata.gz: fb56f92dea87f05ac93efca90321ebd325f2d4c257904a18c0e15ca3d31dfde7455d4ec433cd80de737b3136458478a84a48bc8d147810ee39e8c6e299fdb1e9
-  data.tar.gz: 72c48c42edc713db334409dfbe2cc4999554bc1338da24860a08281f04296f218bed5af08d84f44e39b4330ff4d0ece19394db41f18f15754fe190a1304e54d6
+  metadata.gz: 192868550cb7aa2e5022ce9b77c00158597fa2988298157dcc79f368d2c24fe9ee6f10770dc253cd738d9384181372bba2fecec81d58dac61127132bd7f7ac01
+  data.tar.gz: dd8d3cc2a8af14adc75783a23b73a7565f18e662b8e93f549d5a92abd22212fe72f9566bab9ec0cf0d387ee2ec8a952095c15eda67242cfa92d90ad03d3d7582

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/README.md

@@ -1,22 +1,48 @@
 # Mplug163
 
-A local music player based on Netease music.
+Mplug163, built with Ruby 2.1, is a command line music player that wirelessly plugs in Netease music(http://music.163.com).
 
-## Requirements
+## Installation
 
-```bash
-brew install mpg123
-```
+My MacBook Pro is running Mavericks(10.9), Mplug163 runs smoothly with Ruby 2.1.
 
-## Installation
+You're lucky if you use Mac OS X. Just follow:
 
-```ruby
-gem install mplug163
 ```
+$ brew install mpg123
+$ gem install mplug163
+```
+
+After finishing the installation, open your terminal and input `mplug163`. Music's coming!
+
+Sorry, I do not test Mplug163 in Linux. If you try it in Linux and catch some problem, please issue me. Thanks!
+
+## Shortcuts
+
+| Key | Explanation          | 中文释义       |
+| :---|:---------------------|:--------------|
+| j   | Down                 | 向下           |
+| k   | Up                   | 向上           |
+| h   | Back                 | 后退           |
+| l   | Forward              | 前进           |
+| [   | Prev 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            | 收藏歌曲       |
+| c   | Collection           | 收藏歌曲列表    |
+| r   | Remove Present Entry | 删除当前曲目    |
+| q   | Quit                 | 退出           |
 
-## Usage
+## Attention
 
-Open your terminal and input `mplug163`. Music's coming!
+Mplug163 will make a new directory `~/.mplug163` and touch a file to store user's data for the first time.
 
 ## Big Thanks
 
@@ -32,7 +58,7 @@ MIT License.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/mplug163/fork )
+1. Fork it ( https://github.com/rippleyui/mplug163/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/mplug163/menu.rb

@@ -2,24 +2,24 @@ require 'curses'
 require 'json'
 
 SHORTCUT =  [
-  ['j', 'Down      ', '下移'],
-  ['k', 'Up        ', '上移'],
-  ['h', 'Back      ', '后退'],
-  ['l', 'Forward   ', '前进'],
-  ['u', 'Prev page ', '上一页'],
-  ['d', 'Next page ', '下一页'],
-  ['f', 'Search    ', '快速搜索'],
-  ['[', 'Prev song ', '上一曲'],
-  [']', 'Next song ', '下一曲'],
-  [' ', 'Play/Pause', '播放/暂停'],
-  ['m', 'Menu      ', '主菜单'],
-  ['p', 'Present   ', '当前播放列表'],
-  ['a', 'Add       ', '添加曲目到打碟'],
-  ['z', 'DJ list   ', '打碟列表'],
-  ['s', 'Star      ', '添加到收藏'],
-  ['c', 'Collection', '收藏列表'],
-  ['r', 'Remove    ', '删除当前条目'],
-  ['q', 'Quit      ', '退出']
+  ['j', 'Down        ', '向下'],
+  ['k', 'Up          ', '向上'],
+  ['h', 'Back        ', '后退'],
+  ['l', 'Forward     ', '前进'],
+  ['[', 'Prev song   ', '上一首歌曲'],
+  [']', 'Next song   ', '下一首歌曲'],
+  [' ', 'Play / Pause', '播放 / 暂停'],
+  ['u', 'Prev page   ', '上一页列表'],
+  ['d', 'Next page   ', '下一页列表'],
+  ['f', 'Search      ', '搜索'],
+  ['m', 'Menu        ', '主菜单'],
+  ['p', 'Present     ', '当前播放列表'],
+  ['a', 'Add         ', '添加歌曲到打碟'],
+  ['z', 'DJ list     ', '打碟列表'],
+  ['s', 'Star        ', '收藏歌曲'],
+  ['c', 'Collection  ', '收藏歌曲列表'],
+  ['r', 'Remove      ', '删除当前曲目'],
+  ['q', 'Quit        ', '退出']
 ]
 
 class Menu

data/lib/mplug163/ui.rb

@@ -34,13 +34,13 @@ class Ui
   SCREEN_TOP           = 0
   SCREEN_LEFT          = 0
 
-  PLAYER_X             = 10
+  PLAYER_X             = 8
   PLAYER_TITLE_Y       = 4
   PLAYER_STATUS_Y      = 5
   PLAYER_CONTENT_Y     = 7
   PLAYER_INFO_Y        = 19
 
-  PLAYER_NOTE_X        = PLAYER_X - 6
+  PLAYER_NOTE_X        = PLAYER_X - 2
   PLAYER_POINTER_X     = PLAYER_X - 3
 
   def initialize
@@ -61,12 +61,13 @@ class Ui
 
   def build_playinfo(song_name, artist, album_name, pause=false)
     if pause
-      putstr(@screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, 'z Zzz', Curses.color_pair(3))
+      putstr(@screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '■', Curses.color_pair(3))
     else
-      putstr(@screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '♫ ♪ ♫ ', Curses.color_pair(3))
+      putstr(@screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '▶', Curses.color_pair(3))
     end
 
-    song_info = "#{song_name} - #{artist} <#{album_name}>"
+    info = "#{song_name} - #{artist}"
+    song_info = pretty_format(info, 0, 50)
     putstr(@screen, PLAYER_STATUS_Y, PLAYER_X, song_info, Curses.color_pair(4))
     @screen.refresh
   end
@@ -82,31 +83,31 @@ class Ui
     putstr(@screen, PLAYER_TITLE_Y, PLAYER_X, title, Curses.color_pair(1))
 
     if datalist.size == 0
-      putstr(@screen, PLAYER_CONTENT_Y, PLAYER_X, '还没有内容 - -||')
+      putstr(@screen, PLAYER_CONTENT_Y, PLAYER_X, '没有内容 Orz')
     else
       case datatype
       when 'main'
         (offset...[datalist.length, offset+step].min).each do |i|
           if i == index
-            line_info = "-> #{i}.#{datalist[i]}"
+            line_info = "♩ #{i}. #{datalist[i]}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, line_info, Curses.color_pair(2))
           else
-            line_info = "#{i}.#{datalist[i]}"
+            line_info = "#{i}. #{datalist[i]}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
 
-        putstr(@screen, PLAYER_INFO_Y, PLAYER_X, 'Mplug163 built by Ripple Yui', Curses.color_pair(3))
+        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|
           if i == index
-            info = "-> #{i}.#{datalist[i]['song_name']} - #{datalist[i]['artist']} <#{datalist[i]['album_name']}>"
-            line_info = pretty_format(info, 0, 63)
+            info = "♩ #{i}. #{datalist[i]['song_name']} - #{datalist[i]['artist']} - #{datalist[i]['album_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
-            info = "#{i}.#{datalist[i]['song_name']} - #{datalist[i]['artist']} <#{datalist[i]['album_name']}>"
-            line_info = pretty_format(info, 0, 60)
+            info = "#{i}. #{datalist[i]['song_name']} - #{datalist[i]['artist']} - #{datalist[i]['album_name']}"
+            line_info = pretty_format(info, 0, 50)
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
@@ -114,10 +115,10 @@ class Ui
       when 'artists'
         (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']}"
+            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))
           else
-            line_info = "#{i}.#{datalist[i]['artists_name']} - #{datalist[i]['artist']} #{datalist[i]['alias']}"
+            line_info = "#{i}. #{datalist[i]['artists_name']} - #{datalist[i]['artist']} #{datalist[i]['alias']}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
@@ -125,10 +126,10 @@ class Ui
       when 'albums'
         (offset...[datalist.length, offset+step].min).each do |i|
           if i == index
-            line_info = "-> #{i}.#{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
+            line_info = "♩ #{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
             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']}"
+            line_info = "#{i}. #{datalist[i]['albums_name']} - #{datalist[i]['artists_name']}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
@@ -136,10 +137,10 @@ class Ui
       when 'playlists'
         (offset...[datalist.length, offset+step].min).each do |i|
           if i == index
-            line_info = "-> #{i}.#{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
+            line_info = "♩ #{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
             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']}"
+            line_info = "#{i}. #{datalist[i]['playlists_name']} - #{datalist[i]['creator_name']}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
@@ -147,17 +148,17 @@ class Ui
       when 'djchannels'
         (offset...[datalist.length, offset+step].min).each do |i|
           if i == index
-            line_info = "-> #{i}.#{datalist[i][0]['song_name']}"
+            line_info = "♩ #{i}. #{datalist[i][0]['song_name']}"
             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']}"
+            line_info = "#{i}. #{datalist[i][0]['song_name']}"
             putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
           end
         end
 
       when 'help'
         (offset...[datalist.length, offset+step].min).each do |i|
-          line_info = "#{i}.#{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
+          line_info = "#{i}. #{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
           putstr(@screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, line_info)
         end
       end
@@ -227,18 +228,18 @@ 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, 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 + 6, PLAYER_X, '请键入对应数字:', Curses.color_pair(2))
+    putstr(@screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
     x = @screen.getch
   end
 
   def build_login
-    params = get_param('请输入登录信息: (e.g. foobar@163.com foobar)')
+    params = get_param('请输入登录信息：(e.g. foobar@163.com foobar)')
     account = params.split(' ')
     return build_login if account.size != 2
 
@@ -253,10 +254,10 @@ class Ui
 
   def build_login_error
     clear_to_bottom(@screen, PLAYER_CONTENT_Y, SCREEN_HEIGHT)
-    putstr(@screen, PLAYER_CONTENT_Y + 1, PLAYER_X, 'oh，登录信息好像不对 (O_O)#', Curses.color_pair(1))
+    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 + 5, PLAYER_X, '请键入对应数字:', Curses.color_pair(2))
+    putstr(@screen, PLAYER_CONTENT_Y + 5, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
     @screen.refresh
     x = @screen.getch
   end

data/lib/mplug163/version.rb

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

metadata

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