mdisc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f5547a564f2f00c77ae5e07ab4f343553ad39d
-  data.tar.gz: ae58b382a6e761fbf450c7f9777f74aae550d04b
+  metadata.gz: acbc08f6f64182d057b78a6234572c33b09d65a4
+  data.tar.gz: d6ba36291042a95a9623a044894632523e680d15
 SHA512:
-  metadata.gz: 05887319f06a3465625493599c567434b43a663085902e42fb1b6bdd2feba05e29722ebc9f72577c8ebc488dc76d66fda73633efd2889eb3b4d656c2a874b3a3
-  data.tar.gz: b58337cc0d810e8e08bf7ce9cd8b8abc4e199346e818ba2357a0147d6908e0aae38fdbd8fe8fe85b64534024baed77a103fda2ff3c62c67b88b5d241516e6779
+  metadata.gz: 1e2841dd8b0cea3d0bc97409972624aed93409e0923fce9193acabc7d564ba7d8b487e688977a127158d9fe2fdb3c464d8eb6dc6b247ddc371d251a0fa3a91dc
+  data.tar.gz: d45dcb453da9a6c249ad90dc05894074bb73e02e6cdb8e80275bacb436f157bf154760f79f52e3b7423ab13468ba655163a697d79ce9a19a1ee2ee78e0856c05

data/README.md

@@ -1,5 +1,7 @@
 # Mdisc
 
+![Mdisc](http://cl.ly/Y6Qz/mdisc.png)
+
 Mdisc, built with Ruby 2.1, is a command line music player that wirelessly plugs in Netease music(http://music.163.com).
 
 ## Installation
@@ -17,7 +19,7 @@ After finishing the installation, open your terminal and input `mdisc`. Music's
 
 Sorry, I do not test Mdisc in Linux. If you try it in Linux and catch some problem, please issue me. Thanks!
 
-## Shortcuts
+## Shortcut
 
 | Key | Explanation          | 中文释义              |
 | :---|:---------------------|:---------------------|
@@ -45,13 +47,13 @@ Sorry, I do not test Mdisc in Linux. If you try it in Linux and catch some probl
 
 Mdisc will make a new directory `~/.mdisc` and touch a file to store user's data for the first time.
 
-## Big Thanks
+## Thanks
 
 [NetEase-MusicBox](https://github.com/bluetomlee/NetEase-MusicBox)
 
 [网易云音乐API分析](https://github.com/yanunon/NeteaseCloudMusic/wiki/网易云音乐API分析)
 
-Their great projects inspire me. Thanks!
+Their great projects inspired me. Thanks!
 
 ## License
 

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 

data/bin/mdisc

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path('../../lib/mdisc', __FILE__)
+require_relative '../lib/mdisc'
 
 main = Menu.new
 main.start

data/lib/mdisc.rb

@@ -1,5 +1,6 @@
-require "mdisc/version"
-require File.expand_path('../mdisc/menu', __FILE__)
-require File.expand_path('../mdisc/api', __FILE__)
-require File.expand_path('../mdisc/player', __FILE__)
-require File.expand_path('../mdisc/ui', __FILE__)
+require_relative 'mdisc/version'
+require_relative 'mdisc/menu'
+require_relative 'mdisc/api'
+require_relative 'mdisc/player'
+require_relative 'mdisc/ui'
+require_relative 'mdisc/screen'

data/lib/mdisc/api.rb

@@ -3,63 +3,48 @@ require 'json'
 require 'digest'
 
 class NetEase
+  TIMEOUT = 10
+
   def initialize
     @header = {
-      "Accept" => "*/*",
+      "Accept"          => "*/*",
       "Accept-Encoding" => "gzip,deflate,sdch",
       "Accept-Language" => "zh-CN,zh;q=0.8,gl;q=0.6,zh-TW;q=0.4",
-      "Connection" => "keep-alive",
-      "Content-Type" => "application/x-www-form-urlencoded",
-      "Host" => "music.163.com",
-      "Referer" => "http://music.163.com/",
-      "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.152 Safari/537.36"
-    }
-
-    @cookies = {
-      "appver" => "2.0.2"
+      "Connection"      => "keep-alive",
+      "Content-Type"    => "application/x-www-form-urlencoded",
+      "Host"            => "music.163.com",
+      "Referer"         => "http://music.163.com/",
+      "User-Agent"      => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.152 Safari/537.36"
     }
 
-    @default_timeout = 10
-    Unirest.timeout @default_timeout
-  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
+    Unirest.timeout TIMEOUT
   end
 
   # Log in
   def login(username, password)
-    action = "http://music.163.com/api/login/"
+    action = 'http://music.163.com/api/login/'
     query = {
       "username" => username,
       "password" => Digest::MD5.hexdigest(password),
       "rememberLogin" => "true"
     }
-    begin
-      return http_request('POST', action, query)
-    rescue => e
-      return {"code" => 501}
-    end
+
+    http_request('POST', action, query)
+  rescue => e
+    {"code" => 501}
   end
 
   # 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}"
     data = http_request('GET', action)
+
     data['playlist']
   end
 
   # 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"
+    action = 'http://music.163.com/api/search/get/web'
     query = {
       "s" => s,
       "type" => stype,
@@ -67,6 +52,7 @@ class NetEase
       "total" => true,
       "limit" => limit
     }
+
     http_request('POST', action, query)
   end
 
@@ -75,25 +61,27 @@ class NetEase
   def new_albums(offset=0, limit=50)
     action = "http://music.163.com/api/album/new?area=ALL&offset=#{offset}&total=true&limit=#{limit}"
     data = http_request('GET', action)
+
     data['albums']
   end
 
   # 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 = 100)
-    flag = (offset > 0 ? true : false)
+    flag = offset > 0 ? true : false
     action = "http://music.163.com/api/playlist/list?cat=#{category}&order=#{order}&offset=#{offset}&total=#{flag}&limit=#{limit}"
     data = http_request('GET', action)
-    return data['playlists']
+
+    data['playlists']
   end
 
   # Playlist's details
   def playlist_detail(playlist_id)
     action = "http://music.163.com/api/playlist/detail?id=#{playlist_id}"
     data = http_request('GET', action)
-    return data['result']['tracks']
+
+    data['result']['tracks']
   end
 
   # Top artists
@@ -101,61 +89,70 @@ class NetEase
   def top_artists(offset = 0, limit = 100)
     action = "http://music.163.com/api/artist/top?offset=#{offset}&total=false&limit=#{limit}"
     data = http_request('GET', action)
-    return data['artists']
+
+    data['artists']
   end
 
   # Top songlist
   # http://music.163.com/#/discover/toplist 100
   def top_songlist
-    action = "http://music.163.com/discover/toplist"
+    action = 'http://music.163.com/discover/toplist'
     connection = http_request('GET', action)
-    songids = connection.scan(/\/song\?id=(\d+)/)
-    return [] if songids == []
-    return songs_detail(songids.uniq)
+    songids = connection.scan(/\/song\?id=(\d+)/).uniq
+
+    songs_detail songids
   end
 
   # Songs to which a artist belongs.
   def artists(artist_id)
     action = "http://music.163.com/api/artist/#{artist_id}"
     data = http_request('GET', action)
-    return data['hotSongs']
+
+    data['hotSongs']
   end
 
   # album id -> song id set
   def album(album_id)
     action = "http://music.163.com/api/album/#{album_id}"
     data = http_request('GET', action)
-    return data['album']['songs']
+
+    data['album']['songs']
   end
 
   # song ids -> song urls (details)
-  def songs_detail(ids, offset=0)
+  def songs_detail(ids, offset = 0)
+    return [] if ids.empty?
+
     tmpids = ids[offset, 100]
     action = "http://music.163.com/api/song/detail?ids=[#{tmpids.join(',')}]"
     data = http_request('GET', action)
-    return data['songs']
+
+    data['songs']
   end
 
   # song id -> song url (details)
-  def song_detail(music_id)
-    id = music_id.join(',')
+  def song_detail(song_id)
+    id = song_id.join(',')
     action = "http://music.163.com/api/song/detail/?id=#{id}&ids=[#{id}]"
     data = http_request('GET', action)
-    return data['songs']
+
+    data['songs']
   end
 
   # 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}"
     connection = http_request('GET', action)
-    channelids = connection.scan(/\/dj\?id=(\d+)/) || []
-    return [] if channelids.empty?
-    return channel_detail(channelids.uniq)
+    channelids = connection.scan(/\/dj\?id=(\d+)/).uniq || []
+
+    channel_detail channelids
   end
 
   # DJchannel (id, channel_name) ids -> song urls (details)
   # channels -> songs
   def channel_detail(channelids)
+    return [] if channelids.empty?
+
     channels = []
 
     # ["xxxxxx"] -> "xxxxxx"
@@ -164,7 +161,7 @@ class NetEase
       begin
         data = http_request('GET', action)
         channel = dig_info(data['program']['mainSong'], 'channels')
-        channels.push(channel)
+        channels.push channel
       rescue => e
         next
       end
@@ -175,6 +172,7 @@ class NetEase
 
   def dig_info(data, dig_type)
     tmp = []
+
     case dig_type
     when 'songs'
       data.each do |song|
@@ -190,9 +188,8 @@ class NetEase
           song_info['artist'] = song['artist'].join('')
         elsif song.include? 'artists'
           song['artists'].each do |artist|
-            song_info['artist'].push(artist['name'].strip)
+            song_info['artist'].push artist['name'].strip
           end
-          song_info['artist'].join(',')
         else
           song_info['artist'] = '未知艺术家'
         end
@@ -244,4 +241,19 @@ class NetEase
 
     tmp
   end
+
+  private
+
+  def http_request(method, action, query = nil)
+    connection =
+      if method == 'GET'
+        Unirest.get(action, headers: @header)
+      elsif method == 'POST'
+        Unirest.post(action, headers: @header, parameters: query)
+      end
+
+    connection.body
+  rescue => e
+    []
+  end
 end

data/lib/mdisc/menu.rb

@@ -24,6 +24,8 @@ SHORTCUT =  [
 ]
 
 class Menu
+  WAIT_TIME = 0.1
+
   attr_accessor :player, :ui, :netease, :screen
 
   def initialize
@@ -44,8 +46,6 @@ class Menu
     @collection = []
     @playlists = []
     @account = {}
-
-    @wait = 0.1
     @carousel = ->(left, right, x){x < left ? right : (x > right ? left : x)}
 
     read_data
@@ -53,7 +53,7 @@ class Menu
 
   def start
     ui.build_menu(@datatype, @title, @datalist, @offset, @index, @step)
-    @stack.push([@datatype, @title, @datalist, @offset, @index, @step])
+    @stack.push [@datatype, @title, @datalist, @offset, @index, @step]
 
     loop do
       datatype = @datatype
@@ -92,7 +92,8 @@ class Menu
         @offset = @offset + step
         @index = (index + step).divmod(step)[0] * step
 
-      # Forward
+      # If highlighted item is a menu or playlists, just enter it.
+      # If highlighted item is a song or an dj channel, just play it.
       when 'l'
         next if @datatype == 'help'
         if @datatype == 'songs' || @datatype == 'djchannels'
@@ -100,7 +101,7 @@ class Menu
           @present_songs = [datatype, title, datalist, offset, index]
         else
           ui.build_loading
-          dispatch_enter(idx)
+          dispatch_enter idx
           @index = 0
           @offset = 0
         end
@@ -118,22 +119,22 @@ class Menu
       # Next song
       when ']'
         player.next
-        sleep @wait
+        sleep WAIT_TIME
 
       # Previous song
       when '['
         player.prev
-        sleep @wait
+        sleep WAIT_TIME
 
       # Play or pause a song.
       when ' '
         player.play(datatype, datalist, idx)
-        sleep @wait
+        sleep WAIT_TIME
 
       # Load present playlist.
       when 'p'
         next if @present_songs.empty?
-        @stack.push([datatype, title, datalist, offset, index])
+        @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]
 
       # Star a song, a playlist or an album.
@@ -151,7 +152,7 @@ class Menu
 
       # Load favorite playlists.
       when 't'
-        @stack.push([datatype, title, datalist, offset, index])
+        @stack.push [datatype, title, datalist, offset, index]
         @datatype = 'playlists'
         @title = '网易云音乐 > 收藏精选歌单'
         @datalist = @playlists
@@ -160,25 +161,25 @@ class Menu
 
       # Load favorite songs.
       when 'c'
-        @stack.push([datatype, title, datalist, offset, index])
+        @stack.push [datatype, title, datalist, offset, index]
         @datatype = 'songs'
         @title = '网易云音乐 > 收藏歌曲列表'
         @datalist = @collection
         @offset = 0
         @index = 0
 
-      # Load favorite albums
+      # Load favorite albums.
       when 'a'
-        @stack.push([datatype, title, datalist, offset, index])
+        @stack.push [datatype, title, datalist, offset, index]
         @datatype = 'albums'
         @title = '网易云音乐 > 收藏专辑'
         @datalist = @albums
         @offset = 0
         @index = 0
 
-      # Load favorite dj channels
+      # Load favorite dj channels.
       when 'z'
-        @stack.push([datatype, title, datalist, offset, index])
+        @stack.push [datatype, title, datalist, offset, index]
         @datatype = 'djchannels'
         @title = '网易云音乐 > 收藏 DJ 节目'
         @datalist = @djs
@@ -187,19 +188,17 @@ class Menu
 
       # 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
+        next if datatype == 'main' || datalist.empty?
+        @datalist.delete_at idx
+        @index = @carousel[@offset, [datalist.size, offset+step].min - 1, idx]
 
-      # Main menu.
+      # Main menu
       when 'm'
-        if datatype != 'main'
-          @stack.push([datatype, title, datalist, offset, index])
-          @datatype, @title, @datalist = @stack[0][0], @stack[0][1], @stack[0][2]
-          @offset = 0
-          @index = 0
-        end
+        next if datatype == 'main'
+        @stack.push [datatype, title, datalist, offset, index]
+        @datatype, @title, @datalist = @stack[0][0], @stack[0][1], @stack[0][2]
+        @offset = 0
+        @index = 0
 
       end
 
@@ -212,13 +211,12 @@ class Menu
   end
 
   def dispatch_enter(idx)
-    # netease = @netease
     datatype = @datatype
     title = @title
     datalist = @datalist
     offset = @offset
     index = @index
-    @stack.push([datatype, title, datalist, offset, index])
+    @stack.push [datatype, title, datalist, offset, index]
 
     case datatype
     when 'main'
@@ -226,24 +224,24 @@ class Menu
 
     # Hot songs to which a artist belongs.
     when 'artists'
-      artist_id = datalist[idx]['artist_id']
-      songs = netease.artists(artist_id)
+      id = datalist[idx]['artist_id']
+      songs = netease.artists id
       @datatype = 'songs'
       @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)
+      id = datalist[idx]['album_id']
+      songs = netease.album id
       @datatype = 'songs'
       @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)
+      id = datalist[idx]['playlist_id']
+      songs = netease.playlist_detail id
       @datatype = 'songs'
       @datalist = netease.dig_info(songs, 'songs')
       @title += " > #{datalist[idx]['playlists_name']}"
@@ -251,10 +249,7 @@ class Menu
   end
 
   def choice_channel(idx)
-    # netease = @netease
-
     case idx
-
     # Top
     when 0
       songs = netease.top_songlist
@@ -286,21 +281,10 @@ class Menu
     # My playlist
     when 4
       # Require user's account before fetching his playlists.
-      if !@userid
-        user_info = netease.login(@account[0], @account[1]) unless @account.empty?
-
-        if @account == {} || user_info['code'] != 200
-          data = ui.build_login
-          return if data == -1
-          user_info, @account = data[0], data[1]
-        end
-
-        @username = user_info['profile']['nickname']
-        @userid = user_info['account']['id']
-      end
+      check_user_id
 
       # Fetch this user's all playlists while he logs in successfully.
-      my_playlist = netease.user_playlists(@userid)
+      my_playlist = netease.user_playlists @userid
       @datalist = netease.dig_info(my_playlist, 'playlists')
       @datatype = 'playlists'
       @title += " > #{@username} 的歌单"
@@ -311,7 +295,7 @@ class Menu
       @title += ' > DJ 节目'
       @datalist = netease.djchannels
 
-    # Favorite things.
+    # Favorite things
     when 6
       favorite
 
@@ -331,17 +315,15 @@ class Menu
   end
 
   def favorite
-    # ui = @ui
     x = ui.build_favorite_menu
 
     if (1..4).include? x.to_i
-      @stack.push([@datatype, @title, @datalist, @offset, @index])
+      @stack.push [@datatype, @title, @datalist, @offset, @index]
       @index = 0
       @offset = 0
     end
 
     case x
-
     when '1'
       @datatype = 'songs'
       @datalist = @collection
@@ -366,48 +348,50 @@ class Menu
   end
 
   def search
-    # ui = @ui
     x = ui.build_search_menu
 
     if (1..4).include? x.to_i
-      @stack.push([@datatype, @title, @datalist, @offset, @index])
+      @stack.push [@datatype, @title, @datalist, @offset, @index]
       @index = 0
       @offset = 0
     end
 
     case x
-
     when '1'
       @datatype = 'songs'
-      @datalist = ui.build_search('songs')
+      @datalist = ui.build_search @datatype
       @title = '歌曲搜索列表'
 
     when '2'
       @datatype = 'artists'
-      @datalist = ui.build_search('artists')
+      @datalist = ui.build_search @datatype
       @title = '艺术家搜索列表'
 
     when '3'
       @datatype = 'albums'
-      @datalist = ui.build_search('albums')
+      @datalist = ui.build_search @datatype
       @title = '专辑搜索列表'
 
     when '4'
       @datatype = 'playlists'
-      @datalist = ui.build_search('playlists')
+      @datalist = ui.build_search @datatype
       @title = '精选歌单搜索列表'
     end
   end
 
   private
 
-  def check_mdisc_dir
-    Dir.mkdir File.expand_path("~/.mdisc") unless Dir.exist? File.expand_path("~/.mdisc")
+  def check_dir
+    dir = "#{ENV['HOME']}/.mdisc"
+    unless Dir.exist? dir
+      Dir.mkdir dir
+    end
   end
 
   def read_data
-    check_mdisc_dir
-    user_file = File.expand_path("~/.mdisc/flavor.json")
+    check_dir
+
+    user_file = "#{ENV['HOME']}/.mdisc/flavor.json"
     return unless File.exist? user_file
 
     data = JSON.parse(File.read(user_file))
@@ -419,7 +403,10 @@ class Menu
   end
 
   def write_data
-    user_file = File.expand_path("~/.mdisc/flavor.json")
+    check_dir
+
+    user_file = "#{ENV['HOME']}/.mdisc/flavor.json"
+
     data = {
       :account => @account,
       :collection => @collection,
@@ -432,4 +419,19 @@ class Menu
       f.write(JSON.generate(data))
     end
   end
+
+  def check_user_id
+    if !@userid
+      user_info = netease.login(@account[0], @account[1]) unless @account.empty?
+
+      if @account == {} || user_info['code'] != 200
+        data = ui.build_login
+        return if data == -1
+        user_info, @account = data[0], data[1]
+      end
+
+      @username = user_info['profile']['nickname']
+      @userid = user_info['account']['id']
+    end
+  end
 end

data/lib/mdisc/player.rb

@@ -1,6 +1,8 @@
 require 'open4'
 
 class Player
+  WAIT_TIME = 0.5
+
   attr_accessor :ui
 
   def initialize
@@ -12,7 +14,6 @@ class Player
     @pause_flag = false
     @songs = []
     @idx = 0
-    @wait = 0.5
     @carousel = ->(left, right, x){x < left ? right : (x > right ? left : x)}
   end
 
@@ -48,7 +49,7 @@ class Player
 
   def switch
     stop
-    sleep @wait
+    sleep WAIT_TIME
     recall
   end
 
@@ -83,7 +84,7 @@ class Player
 
   def next
     stop
-    sleep @wait
+    sleep WAIT_TIME
 
     @idx = @carousel[0, @songs.size - 1, @idx + 1]
     recall
@@ -91,7 +92,7 @@ class Player
 
   def prev
     stop
-    sleep @wait
+    sleep WAIT_TIME
 
     @idx = @carousel[0, @songs.size - 1, @idx - 1]
     recall

data/lib/mdisc/screen.rb

@@ -0,0 +1,46 @@
+require 'curses'
+
+# The curses library only provides limit functions.
+# Thus we need to add more wrapper functions based on curses.
+
+class Screen
+  def initialize(height = 25, width = 80)
+    Curses.init_screen
+    Curses.start_color
+    Curses.cbreak
+    Curses.stdscr.keypad true
+    Curses.init_pair(1, Curses::COLOR_BLUE, Curses::COLOR_BLACK)
+    Curses.init_pair(2, Curses::COLOR_CYAN, Curses::COLOR_BLACK)
+    Curses.init_pair(3, Curses::COLOR_RED, Curses::COLOR_BLACK)
+    Curses.init_pair(4, Curses::COLOR_MAGENTA, Curses::COLOR_BLACK)
+    # height, width, top, left
+    @draw = Curses::Window.new(height, width, 0, 0)
+  end
+
+  def line(y, x, string, num = 0)
+    color = Curses.color_pair num
+    @draw.setpos(y, x)
+    @draw.clrtoeol
+    @draw.attrset(color)
+    @draw.addstr(string)
+  end
+
+  def clear(top, bottom)
+    (top..bottom).each do |i|
+      @draw.setpos(i, 0)
+      @draw.clrtoeol
+    end
+  end
+
+  def refresh
+    @draw.refresh
+  end
+
+  def getch
+    @draw.getch
+  end
+
+  def setpos(*args)
+    @draw.setpos *args
+  end
+end

data/lib/mdisc/ui.rb

@@ -44,132 +44,86 @@ class Ui
   PLAYER_POINTER_X     = PLAYER_X - 3
 
   def initialize
-    Curses.init_screen
-    Curses.start_color
-    Curses.cbreak
-    Curses.stdscr.keypad(true)
-    Curses.init_pair(1, Curses::COLOR_BLUE, Curses::COLOR_BLACK)
-    Curses.init_pair(2, Curses::COLOR_CYAN, Curses::COLOR_BLACK)
-    Curses.init_pair(3, Curses::COLOR_RED, Curses::COLOR_BLACK)
-    Curses.init_pair(4, Curses::COLOR_MAGENTA, Curses::COLOR_BLACK)
-
-    # height, width, top, left
-    self.screen = Curses::Window.new(SCREEN_HEIGHT, SCREEN_WIDTH, 0, 0)
-
+    self.screen = Screen.new(SCREEN_HEIGHT, SCREEN_WIDTH)
     self.netease = NetEase.new
   end
 
   def build_playinfo(song_name, artist, pause = false)
     if pause
-      putstr(screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '■', Curses.color_pair(3))
+      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, '■', 3)
     else
-      putstr(screen, PLAYER_STATUS_Y, PLAYER_NOTE_X, '▶', Curses.color_pair(3))
+      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, '▶', 3)
     end
 
-    sn = pretty_format(song_name, 0, 32)
-    at = pretty_format(artist, 0, 28)
+    sn = pretty(song_name, 0, 32)
+    at = pretty(artist, 0, 28)
     info = "#{sn} - #{at}"
-    putstr(screen, PLAYER_STATUS_Y, PLAYER_X, info, Curses.color_pair(4))
+    screen.line(PLAYER_STATUS_Y, PLAYER_X, info, 4)
     screen.refresh
   end
 
   def build_loading
-    clear_to_bottom(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
-    putstr(screen, PLAYER_CONTENT_Y, PLAYER_X, 'loading...', Curses.color_pair(1))
+    screen.clear(PLAYER_CONTENT_Y, SCREEN_HEIGHT)
+    screen.line(PLAYER_CONTENT_Y, PLAYER_X, 'loading...', 1)
     screen.refresh
   end
 
   def build_menu(datatype, title, datalist, offset, index, step)
-    title = pretty_format(title, 0, 52)
+    title = pretty(title, 0, 52)
 
-    clear_to_bottom(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
-    putstr(screen, PLAYER_TITLE_Y, PLAYER_X, title, Curses.color_pair(1))
+    screen.clear(PLAYER_CONTENT_Y, SCREEN_HEIGHT)
+    screen.line(PLAYER_TITLE_Y, PLAYER_X, title, 1)
 
     if datalist.size == 0
-      putstr(screen, PLAYER_CONTENT_Y, PLAYER_X, '没有内容 Orz')
+      screen.line(PLAYER_CONTENT_Y, PLAYER_X, '没有内容 Orz')
     else
+      entries = offset...[datalist.length, offset + step].min
+
       case datatype
       when 'main'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          if i == index
-            info = "♩ #{i}. #{datalist[i]}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{datalist[i]}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          "#{i}. #{datalist[i]}"
         end
 
-        putstr(screen, PLAYER_INFO_Y, PLAYER_X, 'Crafted with ❤ by cosmtrek', Curses.color_pair(3))
+        screen.line(PLAYER_INFO_Y, PLAYER_X, 'Crafted with ❤ by cosmtrek', 3)
 
       when 'songs'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          sn = pretty_format(datalist[i]['song_name'], 0, 32)
-          at = pretty_format(datalist[i]['artist'], 0, 28)
-
-          if i == index
-            info = "♩ #{i}. #{sn} - #{at}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{sn} - #{at}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          sn = pretty(datalist[i]['song_name'], 0, 32)
+          at = pretty(datalist[i]['artist'], 0, 28)
+          "#{i}. #{sn} - #{at}"
         end
 
       when 'artists'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          an = pretty_format(datalist[i]['artists_name'], 0, 32)
-          if i == index
-            info = "♩ #{i}. #{an}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{an}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          an = pretty(datalist[i]['artists_name'], 0, 32)
+          "#{i}. #{an}"
         end
 
       when 'albums'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          al = pretty_format(datalist[i]['albums_name'], 0, 32)
-          an = pretty_format(datalist[i]['artists_name'], 0, 28)
-          if i == index
-            info = "♩ #{i}. #{al} - #{an}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{al} - #{an}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          al = pretty(datalist[i]['albums_name'], 0, 32)
+          an = pretty(datalist[i]['artists_name'], 0, 28)
+          "#{i}. #{al} - #{an}"
         end
 
       when 'playlists'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          pn = pretty_format(datalist[i]['playlists_name'], 0, 32);
-          cn = pretty_format(datalist[i]['creator_name'], 0, 28);
-          if i == index
-            info = "♩ #{i}. #{pn} - #{cn}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{pn} - #{cn}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          pn = pretty(datalist[i]['playlists_name'], 0, 32);
+          cn = pretty(datalist[i]['creator_name'], 0, 28);
+          "#{i}. #{pn} - #{cn}"
         end
 
       when 'djchannels'
-        (offset...[datalist.length, offset + step].min).each do |i|
-          sn = pretty_format(datalist[i][0]['song_name'], 0, 32)
-          if i == index
-            info = "♩ #{i}. #{sn}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, info, Curses.color_pair(2))
-          else
-            info = "#{i}. #{sn}"
-            putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
-          end
+        show(entries, index, offset, datalist) do |i, datalist|
+          sn = pretty(datalist[i][0]['song_name'], 0, 32)
+          "#{i}. #{sn}"
         end
 
       when 'help'
-        (offset...[datalist.length, offset + step].min).each do |i|
+        entries.each do |i|
           info = "#{i}. #{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
-          putstr(screen, i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
+          screen.line(i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
         end
       end
     end
@@ -219,28 +173,31 @@ class Ui
       end
 
     end
+
+    # If no results, then just return empty array.
+    []
   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 + 4, PLAYER_X, '4 - DJ 节目')
-    putstr(screen, PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', Curses.color_pair(2))
+    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.line(PLAYER_CONTENT_Y, PLAYER_X, '选择收藏条目类型：', 1)
+    screen.line(PLAYER_CONTENT_Y + 1, PLAYER_X, '1 - 歌曲')
+    screen.line(PLAYER_CONTENT_Y + 2, PLAYER_X, '2 - 精选歌单')
+    screen.line(PLAYER_CONTENT_Y + 3, PLAYER_X, '3 - 专辑')
+    screen.line(PLAYER_CONTENT_Y + 4, PLAYER_X, '4 - DJ 节目')
+    screen.line(PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', 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))
-    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.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.line(PLAYER_CONTENT_Y, PLAYER_X, '选择搜索类型：', 1)
+    screen.line(PLAYER_CONTENT_Y + 1, PLAYER_X, '1 - 歌曲')
+    screen.line(PLAYER_CONTENT_Y + 2, PLAYER_X, '2 - 艺术家')
+    screen.line(PLAYER_CONTENT_Y + 3, PLAYER_X, '3 - 专辑')
+    screen.line(PLAYER_CONTENT_Y + 4, PLAYER_X, '4 - 精选歌单')
+    screen.line(PLAYER_CONTENT_Y + 6, PLAYER_X, '请键入对应数字：', 2)
     screen.refresh
     screen.getch
   end
@@ -260,18 +217,18 @@ class Ui
   end
 
   def build_login_error
-    clear_to_bottom(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
-    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.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.line(PLAYER_CONTENT_Y + 1, PLAYER_X, 'oh，出现错误 Orz', 2)
+    screen.line(PLAYER_CONTENT_Y + 2, PLAYER_X, '1 - 再试一次')
+    screen.line(PLAYER_CONTENT_Y + 3, PLAYER_X, '2 - 稍后再试')
+    screen.line(PLAYER_CONTENT_Y + 5, PLAYER_X, '请键入对应数字：', 2)
     screen.refresh
     screen.getch
   end
 
   def get_param(prompt_str)
-    clear_to_bottom(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
-    putstr(screen, PLAYER_CONTENT_Y, PLAYER_X, prompt_str, Curses.color_pair(1))
+    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.line(PLAYER_CONTENT_Y, PLAYER_X, prompt_str, 1)
     screen.setpos(PLAYER_CONTENT_Y + 2, PLAYER_X)
     params = screen.getstr
     if params.strip.nil?
@@ -283,25 +240,27 @@ class Ui
 
   private
 
-  def putstr(screen, y, x, string, color = Curses.color_pair(0))
-   screen.setpos(y, x)
-   screen.clrtoeol
-   screen.attrset(color)
-   screen.addstr(string)
+  def pretty(info, start, length)
+    if info.size >= length
+      "#{info[start, length]}..."
+    else
+      info
+    end
   end
 
-  def clear_to_bottom(screen, top, bottom)
-    (top..bottom).each do |i|
-     screen.setpos(i, 0)
-     screen.clrtoeol
+  def highlight_or_not(i, index, offset, info)
+    if i == index
+      highlight = "♩ #{info}"
+      screen.line(i-offset+PLAYER_CONTENT_Y, PLAYER_POINTER_X, highlight, 2)
+    else
+      screen.line(i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
     end
   end
 
-  def pretty_format(info, start, length)
-    if info.size >= length
-      "#{info[start, length]}..."
-    else
-      info
+  def show(entries, index, offset, datalist)
+    entries.each do |i|
+      info = yield(i, datalist) # Get custom info.
+      highlight_or_not(i, index, offset, info)
     end
   end
 end

data/lib/mdisc/version.rb

@@ -1,3 +1,3 @@
 module Mdisc
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'
 end

data/mdisc.gemspec

@@ -1,23 +1,24 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mdisc/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mdisc"
+  spec.name          = 'mdisc'
   spec.version       = Mdisc::VERSION
-  spec.authors       = ["Rick Yu"]
-  spec.email         = ["cosmtrek@gmail.com"]
+  spec.authors       = ['Rick Yu']
+  spec.email         = ['cosmtrek@gmail.com']
   spec.summary       = %q{A local music player based on Netease music.}
   spec.description   = %q{}
-  spec.homepage      = "https://github.com/cosmtrek/mdisc"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/cosmtrek/mdisc'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdisc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rick Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - lib/mdisc/api.rb
 - lib/mdisc/menu.rb
 - lib/mdisc/player.rb
+- lib/mdisc/screen.rb
 - lib/mdisc/ui.rb
 - lib/mdisc/version.rb
 - mdisc.gemspec