mdisc 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed75fdfea1e7f4a5a1e8e53feb21ccacc767523b
-  data.tar.gz: 6c7fa41ec3bcbd957468e60e242139563566d6b4
+  metadata.gz: 0ffacdc06c21ea64668d433820057b7b0badbd4e
+  data.tar.gz: 355417e17dc4b9b457e31e79642024f5c9139f7a
 SHA512:
-  metadata.gz: 43fdd6a95b7c83300128f8443575e630623bf5ed2f73d097026cf100b51547da6043c0d916910561faee508c6f2c8c80d7fe26dd783384eca0980b5f3d47a27e
-  data.tar.gz: 8097ca62dd411c64cb9cc733b7f82ced440264d828286b2b3b44599e8b4ef5ba878761ccf9eff93df62cbb4efbb63e0dce3589d0bb709ee435caa69815c20ee2
+  metadata.gz: fa69a50b93d1239aae16df330ec40263c7b9ff2cebf2344e8edd3329474549890320ed2afeca52574602ec6c9df7a0be588312017734cba71c4124333bcddd6e
+  data.tar.gz: ffb47f0891021dd3dac34b9c76ddee8e9b4f3391e9a6875cb827a83c9ab55257cf06cf370d5ec5971e1c9052edcb7479dbf6e813ad664654242b44a1580a62e9

data/lib/mdisc/screen.rb

@@ -40,6 +40,10 @@ class Screen
     @draw.getch
   end
 
+  def getstr
+    @draw.getstr
+  end
+
   def setpos(*args)
     @draw.setpos *args
   end

data/lib/mdisc/ui.rb

@@ -34,11 +34,11 @@ class Ui
   SCREEN_TOP           = 0
   SCREEN_LEFT          = 0
 
-  PLAYER_X             = 5
+  PLAYER_X             = 4
   PLAYER_TITLE_Y       = 4
   PLAYER_STATUS_Y      = 5
   PLAYER_CONTENT_Y     = 7
-  PLAYER_INFO_Y        = 19
+  PLAYER_INFO_Y        = 17
 
   PLAYER_NOTE_X        = PLAYER_X - 2
   PLAYER_POINTER_X     = PLAYER_X - 3
@@ -55,8 +55,8 @@ class Ui
       screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, '▶', 3)
     end
 
-    sn = pretty(song_name, 0, 32)
-    at = pretty(artist, 0, 28)
+    sn = pretty(song_name, 0, 28)
+    at = pretty(artist, 0, 24)
     info = "#{sn} - #{at}"
     screen.line(PLAYER_STATUS_Y, PLAYER_X, info, 4)
     screen.refresh
@@ -69,7 +69,7 @@ class Ui
   end
 
   def build_menu(datatype, title, datalist, offset, index, step)
-    title = pretty(title, 0, 52)
+    title = pretty(title, 0, 50)
 
     screen.clear(PLAYER_CONTENT_Y, SCREEN_HEIGHT)
     screen.line(PLAYER_TITLE_Y, PLAYER_X, title, 1)
@@ -89,34 +89,34 @@ class Ui
 
       when 'songs'
         show(entries, index, offset, datalist) do |i, datalist|
-          sn = pretty(datalist[i]['song_name'], 0, 32)
-          at = pretty(datalist[i]['artist'], 0, 28)
+          sn = pretty(datalist[i]['song_name'], 0, 28)
+          at = pretty(datalist[i]['artist'], 0, 24)
           "#{i}. #{sn} - #{at}"
         end
 
       when 'artists'
         show(entries, index, offset, datalist) do |i, datalist|
-          an = pretty(datalist[i]['artists_name'], 0, 32)
+          an = pretty(datalist[i]['artists_name'], 0, 28)
           "#{i}. #{an}"
         end
 
       when 'albums'
         show(entries, index, offset, datalist) do |i, datalist|
-          al = pretty(datalist[i]['albums_name'], 0, 32)
-          an = pretty(datalist[i]['artists_name'], 0, 28)
+          al = pretty(datalist[i]['albums_name'], 0, 28)
+          an = pretty(datalist[i]['artists_name'], 0, 24)
           "#{i}. #{al} - #{an}"
         end
 
       when 'playlists'
         show(entries, index, offset, datalist) do |i, datalist|
-          pn = pretty(datalist[i]['playlists_name'], 0, 32);
-          cn = pretty(datalist[i]['creator_name'], 0, 28);
+          pn = pretty(datalist[i]['playlists_name'], 0, 28);
+          cn = pretty(datalist[i]['creator_name'], 0, 24);
           "#{i}. #{pn} - #{cn}"
         end
 
       when 'djchannels'
         show(entries, index, offset, datalist) do |i, datalist|
-          sn = pretty(datalist[i][0]['song_name'], 0, 32)
+          sn = pretty(datalist[i][0]['song_name'], 0, 28)
           "#{i}. #{sn}"
         end
 
@@ -179,7 +179,7 @@ class Ui
   end
 
   def build_favorite_menu
-    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.clear(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 - 精选歌单')
@@ -191,7 +191,7 @@ class Ui
   end
 
   def build_search_menu
-    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.clear(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 - 艺术家')
@@ -217,7 +217,7 @@ class Ui
   end
 
   def build_login_error
-    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.clear(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 - 稍后再试')
@@ -227,7 +227,7 @@ class Ui
   end
 
   def get_param(prompt_str)
-    screen.clear(screen, PLAYER_CONTENT_Y,SCREEN_HEIGHT)
+    screen.clear(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

data/lib/mdisc/version.rb

@@ -1,3 +1,3 @@
 module Mdisc
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/mdisc.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_runtime_dependency 'curses', '~>1.0.1'
-  spec.add_runtime_dependency 'open4', '~>1.3.4'
-  spec.add_runtime_dependency 'unirest', '~>1.1.2'
+  spec.add_dependency 'curses', '~>1.0.1'
+  spec.add_dependency 'open4', '~>1.3.4'
+  spec.add_dependency 'unirest', '~>1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdisc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rick Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler