mdisc 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ffacdc06c21ea64668d433820057b7b0badbd4e
-  data.tar.gz: 355417e17dc4b9b457e31e79642024f5c9139f7a
+  metadata.gz: 517516d1caae450b750f38cc40ba6f3c59589378
+  data.tar.gz: 2f76a77f18bd3db546c4b0af4fe02b44eaf9516f
 SHA512:
-  metadata.gz: fa69a50b93d1239aae16df330ec40263c7b9ff2cebf2344e8edd3329474549890320ed2afeca52574602ec6c9df7a0be588312017734cba71c4124333bcddd6e
-  data.tar.gz: ffb47f0891021dd3dac34b9c76ddee8e9b4f3391e9a6875cb827a83c9ab55257cf06cf370d5ec5971e1c9052edcb7479dbf6e813ad664654242b44a1580a62e9
+  metadata.gz: 017a94632c0254a20c380fa84cb3175d6c6a14c794ce109328d9f336c75d9acc6bbf7ecdcb9db35bdaf96bb5e4ce62d7e09c61adf49ff767b9c4a8cfc0dc1bad
+  data.tar.gz: 88c70d888f818e60a16d64c939cf9b7f77c044c2b3358ddf6c0d6fbcbb1b5a4993a925dffe316992cc215f6708792cbcd25f3c6323b542bac45b60060b4f7764

data/lib/mdisc/menu.rb

@@ -39,7 +39,7 @@ class Menu
     @offset = 0
     @index = 0
     @present_songs = []
-    @step = 20
+    @step = 25
     @stack = []
     @userid = nil
     @username = nil

data/lib/mdisc/player.rb

@@ -1,5 +1,7 @@
 require 'open4'
 
+# FIXME: There is something wrong...
+
 class Player
   WAIT_TIME = 0.5
 
@@ -25,7 +27,9 @@ class Player
     ui.build_playinfo(item['song_name'], item['artist'])
 
     @thread = Thread.new do
-      @mp3id, stdin, stdout, stderr = Open4::popen4('mpg123', item['mp3_url'])
+      # Add input option: --continue,
+      # play a song continuously in case the network becomes offline occasionally.
+      @mp3id, stdin, stdout, stderr = Open4::popen4('mpg123', '--continue', item['mp3_url'])
       Process::waitpid2 @mp3id
 
       if @playing_flag

data/lib/mdisc/screen.rb

@@ -8,7 +8,7 @@ class Screen
     Curses.init_screen
     Curses.start_color
     Curses.cbreak
-    Curses.stdscr.keypad true
+    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)
@@ -21,8 +21,8 @@ class Screen
     color = Curses.color_pair num
     @draw.setpos(y, x)
     @draw.clrtoeol
-    @draw.attrset(color)
-    @draw.addstr(string)
+    @draw.attrset color
+    @draw.addstr(strip_invalid(string))
   end
 
   def clear(top, bottom)
@@ -47,4 +47,15 @@ class Screen
   def setpos(*args)
     @draw.setpos *args
   end
+
+  private
+
+  def strip_invalid(str)
+    # Clean emoji.
+    str = str.gsub(/[\u{00A9}\u{00AE}\u{203C}\u{2049}\u{2122}\u{2139}\u{2194}-\u{2199}\u{21A9}-\u{21AA}\u{231A}-\u{231B}\u{23E9}-\u{23EC}\u{23F0}\u{23F3}\u{24C2}\u{25AA}-\u{25AB}\u{25B6}\u{25C0}\u{25FB}-\u{25FE}\u{2600}-\u{2601}\u{260E}\u{2611}\u{2614}-\u{2615}\u{261D}\u{263A}\u{2648}-\u{2653}\u{2660}\u{2663}\u{2665}-\u{2666}\u{2668}\u{267B}\u{267F}\u{2693}\u{26A0}-\u{26A1}\u{26AA}-\u{26AB}\u{26BD}-\u{26BE}\u{26C4}-\u{26C5}\u{26CE}\u{26D4}\u{26EA}\u{26F2}-\u{26F3}\u{26F5}\u{26FA}\u{26FD}\u{2702}\u{2705}\u{2708}-\u{270C}\u{270F}\u{2712}\u{2714}\u{2716}\u{2728}\u{2733}-\u{2734}\u{2744}\u{2747}\u{274C}\u{274E}\u{2753}-\u{2755}\u{2757}\u{2764}\u{2795}-\u{2797}\u{27A1}\u{27B0}\u{27BF}\u{2934}-\u{2935}\u{2B05}-\u{2B07}\u{2B1B}-\u{2B1C}\u{2B50}\u{2B55}\u{3030}\u{303D}\u{3297}\u{3299}\u{1F004}\u{1F0CF}\u{1F170}-\u{1F171}\u{1F17E}-\u{1F17F}\u{1F18E}\u{1F191}-\u{1F19A}\u{1F201}-\u{1F202}\u{1F21A}\u{1F22F}\u{1F232}-\u{1F23A}\u{1F250}-\u{1F251}\u{1F300}-\u{1F31F}\u{1F330}-\u{1F335}\u{1F337}-\u{1F37C}\u{1F380}-\u{1F393}\u{1F3A0}-\u{1F3C4}\u{1F3C6}-\u{1F3CA}\u{1F3E0}-\u{1F3F0}\u{1F400}-\u{1F43E}\u{1F440}\u{1F442}-\u{1F4F7}\u{1F4F9}-\u{1F4FC}\u{1F500}-\u{1F507}\u{1F509}-\u{1F53D}\u{1F550}-\u{1F567}\u{1F5FB}-\u{1F640}\u{1F645}-\u{1F64F}\u{1F680}-\u{1F68A}\u{1F68C}-\u{1F6C5}]/, "").strip
+
+    # Remove unnecessary charactors to prevent bad UI layout.
+    # More info about regex and Unicode: http://www.regular-expressions.info/unicode.html
+    str = str.gsub(/[\p{M}\p{Po}\p{So}]/, "").strip
+  end
 end

data/lib/mdisc/ui.rb

@@ -31,10 +31,8 @@ class Ui
 
   SCREEN_HEIGHT        = 40
   SCREEN_WIDTH         = 80
-  SCREEN_TOP           = 0
-  SCREEN_LEFT          = 0
 
-  PLAYER_X             = 4
+  PLAYER_X             = 6
   PLAYER_TITLE_Y       = 4
   PLAYER_STATUS_Y      = 5
   PLAYER_CONTENT_Y     = 7
@@ -50,9 +48,9 @@ class Ui
 
   def build_playinfo(song_name, artist, pause = false)
     if pause
-      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, '■', 3)
+      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, 'S', 3)
     else
-      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, '▶', 3)
+      screen.line(PLAYER_STATUS_Y, PLAYER_NOTE_X, 'P', 3)
     end
 
     sn = pretty(song_name, 0, 28)
@@ -82,47 +80,47 @@ class Ui
       case datatype
       when 'main'
         show(entries, index, offset, datalist) do |i, datalist|
-          "#{i}. #{datalist[i]}"
+          "#{i} #{datalist[i]}"
         end
 
-        screen.line(PLAYER_INFO_Y, PLAYER_X, 'Crafted with ❤ by cosmtrek', 3)
+        screen.line(PLAYER_INFO_Y, PLAYER_X, 'Crafted with <3 by cosmtrek', 3)
 
       when 'songs'
         show(entries, index, offset, datalist) do |i, datalist|
           sn = pretty(datalist[i]['song_name'], 0, 28)
           at = pretty(datalist[i]['artist'], 0, 24)
-          "#{i}. #{sn} - #{at}"
+          "#{i} #{sn} - #{at}"
         end
 
       when 'artists'
         show(entries, index, offset, datalist) do |i, datalist|
           an = pretty(datalist[i]['artists_name'], 0, 28)
-          "#{i}. #{an}"
+          "#{i} #{an}"
         end
 
       when 'albums'
         show(entries, index, offset, datalist) do |i, datalist|
           al = pretty(datalist[i]['albums_name'], 0, 28)
           an = pretty(datalist[i]['artists_name'], 0, 24)
-          "#{i}. #{al} - #{an}"
+          "#{i} #{al} - #{an}"
         end
 
       when 'playlists'
         show(entries, index, offset, datalist) do |i, datalist|
           pn = pretty(datalist[i]['playlists_name'], 0, 28);
           cn = pretty(datalist[i]['creator_name'], 0, 24);
-          "#{i}. #{pn} - #{cn}"
+          "#{i} #{pn}"
         end
 
       when 'djchannels'
         show(entries, index, offset, datalist) do |i, datalist|
           sn = pretty(datalist[i][0]['song_name'], 0, 28)
-          "#{i}. #{sn}"
+          "#{i} #{sn}"
         end
 
       when 'help'
         entries.each do |i|
-          info = "#{i}. #{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
+          info = "#{i} #{datalist[i][0]} #{datalist[i][1]} #{datalist[i][2]}"
           screen.line(i-offset+PLAYER_CONTENT_Y, PLAYER_X, info)
         end
       end
@@ -250,7 +248,7 @@ class Ui
 
   def highlight_or_not(i, index, offset, info)
     if i == index
-      highlight = "♩ #{info}"
+      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)

data/lib/mdisc/version.rb

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

metadata

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