xiami_radio 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f93c045ffdd8ba47df5d6396621207607e4ddb6b
-  data.tar.gz: bdd9094e9627de4774fe49d3459bb3b510f60c5a
+  metadata.gz: 82320db1fc6fa1004688356887db8a53f38683f6
+  data.tar.gz: a34ba7934dc3dd9a40da5bb4d0e5c6cf4808a1d9
 SHA512:
-  metadata.gz: 8d51e8774338f469d4396d33aabfb93b3f2ed37bb5adcc860e41affae13245785f1c9ab9f46b8d3c778fbe7db3e10bb78b0d851447a888de1a2cd0a976137957
-  data.tar.gz: d35701ac4c45494d0e2541b8b307b0df193edd247a15713a6c417c243392a8c1fcefd181b07a4af8cba5ce17549d4ad2c4c006a3a116cc40f4673f9e65e93f31
+  metadata.gz: f1a0d25276bc5dafd2ffffe19659aa72f342cfedab660373a222ea8132620a3ab7b703016f29c133d2d0e6f7ee763d093b87f6518e8af080167b56b3e8dbe3c1
+  data.tar.gz: add1a386b190a5bf46720ffe232e9dd727b3fb65bdd3e3e83ca0cacd6e6a272f87f7a402dad1ab47ede33917d83526d71b826b7187c6f010c93f04bc26db287b

data/README.md

@@ -0,0 +1,61 @@
+Xiami_Radio
+======================================
+
+A Xiami radio player by command-line on ruby.
+
+鉴于 V2ex 上有复数个豆瓣的各种版本各种功能的播放工具，我大虾米拿去一比真是冷清得不行。
+
+（ **Pia!(ｏ ‵-′)ノಥ_ಥ ** 你丫忒夸张了吧，仔细看看还是有的 ）
+
+之前也在 V2 表示会折腾个 Ruby 版的虾米，于是就有了这个 ruby 的 **虾米电台** ，虽然好像已经过了很久了
+
+## Features
+
+* 支持用户登录
+* 支持选择电台
+* 支持 320k (无需会员)
+* 支持收藏到虾米音乐库
+* 播放记录上传虾米
+* 附带自动签到脚本一份
+
+## Usage
+
+```
+$ gem install xiami_radio
+```
+
+and then
+
+```
+$ xiaomi_radio
+```
+
+Enjoy yourself ~
+
+## Requirements
+
+* Portaudio >= 19
+* Mpg123 >= 1.14
+* Audite
+
+## OSX Install
+
+```
+brew install portaudio
+brew install mpg123
+```
+
+
+## Debian / Ubuntu Install
+```
+apt-get install libjack0 libjack-dev
+apt-get install libportaudiocpp0 portaudio19-dev libmpg123-dev
+```
+
+## Audite
+
+使用了 [Audite][1] 作为播放组件
+
+
+
+  [1]: https://github.com/georgi/audite

data/bin/xiami_radio

@@ -4,7 +4,7 @@
 require 'xiami_radio'
 require 'io/console'
 
-user = XiamiRadio::User.new
+user = XiamiRadio::User.instance
 
 email = unless user.login?
           puts 'Plz keep empty if you don\'t want to login'
@@ -35,4 +35,4 @@ radio_option = case gets.chomp[0]
                    {type: (type || 8).to_i, oid: oid.to_i}
                end
 
-XiamiRadio::Player.play user.radio radio_option
+XiamiRadio::Player.play XiamiRadio::Radio.new(radio_option)

data/lib/xiami_radio/downloader.rb

@@ -10,11 +10,10 @@ module XiamiRadio
       end
     end
 
-    attr_reader :track, :progress, :total, :file
+    attr_reader :track, :file
 
     def initialize(track)
       @track = track
-      @uri = URI @track.location
     end
 
     def filename
@@ -26,30 +25,32 @@ module XiamiRadio
     end
 
     def start
-      @thread = Thread.start do
-        Net::HTTP.get_response @uri do |res|
-          if res.code == '302'
-            @uri = URI res.header['Location']
-            start
-          else
-            @progress, @total = 0, res.header['Content-Length'].to_i
-            @file = File.open(filename, 'w')
-            res.read_body do |chunk|
-              @file << chunk
-              @progress += chunk.size
-              @file.close unless @progress < @total
-            end
-          end
-        end
-      end
+      @thread = Thread.start { request URI(@track.location) }
       sleep 0.1 until @progress.to_i > 0
     end
 
     def stop
       @thread&.exit
       @thread = nil
-      File.delete(@file)
+      File.delete(@file) if @file
     end
 
+    private
+
+    def request(uri)
+      Net::HTTP.get_response uri do |res|
+        if res.code == '302'
+          request URI(res.header['Location'])
+        else
+          @progress, @total = 0, res.header['Content-Length'].to_i
+          @file = File.open(filename, 'w')
+          res.read_body do |chunk|
+            @file << chunk
+            @progress += chunk.size
+            @file.close unless @progress < @total
+          end
+        end
+      end
+    end
   end
 end

data/lib/xiami_radio/player.rb

@@ -4,16 +4,16 @@ module XiamiRadio
   # There is a player as you saw
   class Player
 
-    attr_reader :track, :next_track, :radio, :user
+    attr_reader :track, :next_track, :radio
 
     def initialize(radio:, _playlist: nil)
-      @radio, @user = radio, radio.client.user
+      @radio = radio
       @player = Audite.new
-      @view = View::Player.new self
+      @view = View::Player.new
 
       @player.events.on :position_change, &method(:position_change)
       @player.events.on :complete, &method(:complete)
-      @view.listen_on
+      @view.listen_on self
     end
 
     def play
@@ -25,11 +25,9 @@ module XiamiRadio
     end
 
     def next
-      if @next_track.nil?
-        @next_track = @radio.next_track
-        @player.queue @next_track.file_path
-      end
-      @track, @next_track = @next_track, nil
+      @track.downloader.stop
+      preload! unless preload?
+      unperload!
       @player.request_next_song
     end
 
@@ -48,19 +46,31 @@ module XiamiRadio
     private
 
     def position_change(position)
-      @view.refresh position
-
-      if @next_track.nil? && position / @track.duration > 0.7
-        Thread.start do
-          @track.record
-          @next_track = @radio.next_track
-          @player.queue @next_track.file_path
-        end
-      end
+      @view.refresh @track, position unless position > @track.duration
+
+      Thread.start do
+        preload!
+        @track.record
+      end if !preload? && position / @track.duration > 0.7
     end
 
     def complete
-      @track, @next_track = @next_track, nil
+      @track, @preload_track = @preload_track, nil
+    end
+
+    def preload?
+      @preload_flag ||= false
+    end
+
+    def preload!
+      @preload_flag = true
+      @preload_track = @radio.next_track
+      @player.queue @preload_track.file_path
+    end
+
+    def unperload!
+      @preload_flag = false
+      @track, @preload_track = @preload_track, nil
     end
 
     def self.play(radio)

data/lib/xiami_radio/radio.rb

@@ -6,12 +6,12 @@ module XiamiRadio
 
     XIAMI_CAI = {type: 8, oid: 0}.freeze
 
-    attr_reader :type, :oid, :client, :nori, :play_queue
+    attr_reader :type, :oid, :nori, :play_queue, :client
 
-    def initialize(type:, oid:, user: nil)
+    def initialize(type:, oid:)
       @type = type
       @oid = oid
-      @client = user&.client || Client.new
+      @client = Client.new user: User.instance
       @nori = Nori.new(:convert_tags_to => -> (tag) { tag.snakecase.to_sym })
       @play_queue = []
     end

data/lib/xiami_radio/track.rb

@@ -6,7 +6,7 @@ module XiamiRadio
       @info = track
       @title, @song_id, @album_name, @artist = track.values_at(:title, :song_id, :album_name, :artist)
       @radio = radio
-      @client = radio.client
+      @client = Client.new user: User.instance
     end
 
     def location(hd: false)

data/lib/xiami_radio/user.rb

@@ -1,8 +1,10 @@
 require 'http-cookie'
+require 'singleton'
 
 module XiamiRadio
   # There is a user as you saw
   class User
+    include Singleton
     attr_reader :nick_name, :level, :user_id, :sign, :is_vip
     attr_accessor :cookie_jar
 
@@ -12,10 +14,6 @@ module XiamiRadio
       get_user_info
     end
 
-    def radio(**args)
-      XiamiRadio::Radio.new user: self, **args
-    end
-
     def login?
       !user_id.to_s.empty?
     end
@@ -52,12 +50,12 @@ module XiamiRadio
       cookie_jar.cookies.select { |c| c.name == '_xiamitoken' }.first&.value
     end
 
+    private
+
     def client
       @client ||= Client.new user: self
     end
 
-    private
-
     def login_client
       @l_client ||= Client.new user: self, host: Client::LOGIN_HOST
     end

data/lib/xiami_radio/version.rb

@@ -1,5 +1,5 @@
 module XiamiRadio
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 
 end

data/lib/xiami_radio/view/player.rb

@@ -1,90 +1,92 @@
 require 'curses'
 
-module XiamiRadio::View
-  class Player
-    attr_reader :player
-
-    def initialize(player)
-      @player = player
-      Curses.init_screen
-      Curses.noecho
-      Curses.stdscr.keypad(true)
-      Curses.start_color
-      Curses.use_default_colors
-      Curses.init_pair(Curses::COLOR_CYAN,Curses::COLOR_CYAN,Curses::COLOR_BLACK)
-      Curses.init_pair(Curses::COLOR_RED,Curses::COLOR_RED,Curses::COLOR_BLACK)
-      Curses.clear
-    end
+module XiamiRadio
+  module View
+    class Player
+      include Curses
+      
+      def initialize
+        init_screen
+        noecho
+        stdscr.keypad true
+        curs_set 0
+        start_color
+        init_pair(COLOR_CYAN, COLOR_CYAN, COLOR_BLACK)
+        init_pair(COLOR_RED, COLOR_RED, COLOR_BLACK)
+      end
 
-    def refresh(position)
-      Curses.clear
-      render_title_line player.track
-      render_progress_line (position / player.track.duration), player.track.downloader.progress
-      render_info_line player.track, position
-      render_msg_line
-      Curses.refresh
-    end
+      alias_method :curses_refresh, :refresh
+      def refresh(track, position)
+        render_title_line track
+        render_progress_line (position / track.duration), track.downloader.progress
+        render_info_line track, position
+        render_msg_line
+        Curses.refresh
+      end
 
-    def listen_on
-      Thread.start do
-        while (key = Curses.getch)
-          case key
-            when Curses::KEY_LEFT
-              player.rewind
-            when Curses::KEY_RIGHT
-              player.forward
-            when Curses::KEY_DOWN
-              player.next
-            when 'l'
-              XiamiRadio::Notice.push player.track.fav
-            when ' '
-              player.toggle
-            else #
+      def listen_on(player)
+        Thread.start do
+          while (key = getch)
+            case key
+              when KEY_LEFT
+                player.rewind
+              when KEY_RIGHT
+                player.forward
+              when KEY_DOWN
+                player.next
+              when 'l'
+                XiamiRadio::Notice.push player.track.fav
+              when ' '
+                player.toggle
+              else #
+            end
           end
         end
       end
-    end
 
-    private
+      private
 
-    def render_title_line(track)
-      Curses.setpos(0, 0)
-      Curses.addstr('Now is playing ')
-      Curses.attron(Curses.color_pair(Curses::COLOR_RED)|Curses::A_NORMAL){
-        Curses.addstr("  #{track.title} - #{track.artist}  ")
-      }
-      if @player.user.login?
-        track.grade? ? Curses.addstr('    已收藏 ') : Curses.addstr('    按"L"加入收藏 ')
+      def render_title_line(track)
+        setpos(0, 0)
+        clrtoeol
+        addstr('Now is playing ')
+        attron(color_pair(COLOR_RED)|A_NORMAL) {
+          addstr("  #{track.title} - #{track.artist}  ")
+        }
+        if User.instance.login?
+          track.grade? ? addstr('    已收藏 ') : addstr('    按"L"加入收藏 ')
+        end
       end
-    end
 
-    def render_progress_line(play_rate, dawnload_rate)
-      p = (play_rate * Curses.cols).round
-      d = (dawnload_rate * Curses.cols).round - p
-      Curses.setpos(1, 0)
-      Curses.addstr('_' * p + '#' * d + ' ' * (Curses.cols - p - d))
-    end
+      def render_progress_line(play_rate, dawnload_rate)
+        p = (play_rate * cols).round
+        d = (dawnload_rate * cols).round - p
+        setpos(1, 0)
+        clrtoeol
+        addstr('_' * p + '#' * d + ' ' * (cols - p - d))
+      end
 
-    def render_info_line(track, position)
-      Curses.setpos(2, 0)
-      Curses.addstr("#{track.reason.content}")
-      Curses.addstr(": #{track.reason.title} ") unless track.reason.title.nil?
-      Curses.addstr("- #{track.reason.artist} ") unless track.reason.artist.nil?
-      Curses.addstr("    播放进度: ")
-      Curses.attron(Curses.color_pair(Curses::COLOR_CYAN)|Curses::A_NORMAL){
-        Curses.addstr(" #{sec_2_min position} / #{sec_2_min track.duration} ")
-      }
-    end
+      def render_info_line(track, position)
+        setpos(2, 0)
+        clrtoeol
+        addstr("#{track.reason.content}")
+        addstr(": #{track.reason.title} ") unless track.reason.title.nil?
+        addstr("- #{track.reason.artist} ") unless track.reason.artist.nil?
+        addstr("    播放进度: ")
+        attron(color_pair(COLOR_CYAN)|A_NORMAL) {
+          addstr(" #{sec_2_min position} / #{sec_2_min track.duration} ")
+        }
+      end
 
-    def render_msg_line(msg = XiamiRadio::Notice.shift)
-      return if msg.nil?
-      Curses.setpos(3, 0)
-      Curses.addstr(msg)
-    end
+      def render_msg_line(msg = XiamiRadio::Notice.shift)
+        setpos(3, 0)
+        clrtoeol
+        addstr(msg || '')
+      end
 
-    def sec_2_min(sec)
-      Time.at(sec).utc.strftime('%M:%S')
+      def sec_2_min(sec)
+        Time.at(sec).utc.strftime('%M:%S')
+      end
     end
-
   end
 end

data/lib/xiami_radio.rb

@@ -11,10 +11,25 @@ require 'tmpdir'
 
 module XiamiRadio
   TMP_DIR = File.join(Dir.tmpdir, 'xiami_radio').freeze
+  DEBUG = false
 
-  def self.mktmpdir
-    Dir.mkdir TMP_DIR, 0700 unless Dir.exist? TMP_DIR
+  Thread.abort_on_exception = true
+
+  class << self
+    def init
+      mktmpdir
+      stderr = debug? ? STDOUT : File.join(TMP_DIR, '戊')
+      $stderr.reopen stderr, 'w'
+    end
+
+    def mktmpdir
+      Dir.mkdir TMP_DIR, 0700 unless Dir.exist? TMP_DIR
+    end
+
+    def debug?
+      %w(1 true on).include? ENV.fetch('DEBUG', DEBUG)
+    end
   end
 end
 
-XiamiRadio.mktmpdir
+XiamiRadio.init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiami_radio
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Ivan Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite
@@ -80,7 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-description: a command-line tool to help you listen Xiami radio via a geek way
+description: A Xiami radio player by command-line on ruby, help you listening to the
+  Xiami via a geek way.
 email:
 - me@ichou.cn
 executables:
@@ -124,5 +125,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Xiami radio player with command-line on ruby
+summary: a Xiami radio player by command-line on ruby
 test_files: []