xiami_radio 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82320db1fc6fa1004688356887db8a53f38683f6
-  data.tar.gz: a34ba7934dc3dd9a40da5bb4d0e5c6cf4808a1d9
+  metadata.gz: 2945c7bf31a3da8dab44bef8baeec1cc0e43d95f
+  data.tar.gz: 2777d8c81551c09bd2fd1a7f2a6f5105cc737acb
 SHA512:
-  metadata.gz: f1a0d25276bc5dafd2ffffe19659aa72f342cfedab660373a222ea8132620a3ab7b703016f29c133d2d0e6f7ee763d093b87f6518e8af080167b56b3e8dbe3c1
-  data.tar.gz: add1a386b190a5bf46720ffe232e9dd727b3fb65bdd3e3e83ca0cacd6e6a272f87f7a402dad1ab47ede33917d83526d71b826b7187c6f010c93f04bc26db287b
+  metadata.gz: 8a851c417c5d7d3d161c58bd0faf5b74422c7f1656e0464749a22b41d15c7ad820f2c409749ee586a6421dd7a6de44735ba2cad6e8207dc8125a2267fd74afdb
+  data.tar.gz: 78a312b7a549331b07d01d7a0a0471a2d5583addf9f66e1cbd2cef50f85504d2d8146cde07824cd7fb0e916f82af15a5a680924c96971fb982b9c884afc2fc38

data/lib/xiami_radio.rb

@@ -8,6 +8,7 @@ require 'xiami_radio/user'
 require 'xiami_radio/view/player'
 
 require 'tmpdir'
+require 'logger'
 
 module XiamiRadio
   TMP_DIR = File.join(Dir.tmpdir, 'xiami_radio').freeze
@@ -18,14 +19,18 @@ module XiamiRadio
   class << self
     def init
       mktmpdir
-      stderr = debug? ? STDOUT : File.join(TMP_DIR, '戊')
-      $stderr.reopen stderr, 'w'
+      $stderr.reopen File.join(TMP_DIR, '戊'), 'w'
+      logger.level = debug? ? :debug : :warn
     end
 
     def mktmpdir
       Dir.mkdir TMP_DIR, 0700 unless Dir.exist? TMP_DIR
     end
 
+    def logger
+      @logger ||= Logger.new File.join(TMP_DIR, '戊')
+    end
+
     def debug?
       %w(1 true on).include? ENV.fetch('DEBUG', DEBUG)
     end

data/lib/xiami_radio/downloader.rb

@@ -21,7 +21,7 @@ module XiamiRadio
     end
 
     def progress
-      (@progress.to_f / @total.to_f).round(2) unless @progress.nil?
+      @progress.nil? ? 0.00 : (@progress.to_f / @total.to_f).round(2)
     end
 
     def start
@@ -42,6 +42,7 @@ module XiamiRadio
         if res.code == '302'
           request URI(res.header['Location'])
         else
+          XiamiRadio.logger.debug "#{@track.title} download start"
           @progress, @total = 0, res.header['Content-Length'].to_i
           @file = File.open(filename, 'w')
           res.read_body do |chunk|
@@ -51,6 +52,7 @@ module XiamiRadio
           end
         end
       end
+      XiamiRadio.logger.debug "#{@track.title} download completed"
     end
   end
 end

data/lib/xiami_radio/player.rb

@@ -26,8 +26,12 @@ module XiamiRadio
 
     def next
       @track.downloader.stop
-      preload! unless preload?
-      unperload!
+      if preload?
+        @track, @next_track = @next_track, nil
+      else
+        @track = @radio.next_track
+        @player.queue @track.file_path
+      end
       @player.request_next_song
     end
 
@@ -46,31 +50,24 @@ module XiamiRadio
     private
 
     def position_change(position)
-      @view.refresh @track, position unless position > @track.duration
-
-      Thread.start do
-        preload!
-        @track.record
-      end if !preload? && position / @track.duration > 0.7
+      @view.refresh @track, position
+
+      if !preload? && position / @track.duration > 0.7
+        @preloader = Thread.start do
+          @next_track = @radio.next_track
+          @player.queue @next_track.file_path
+          @track.record
+        end
+      end
     end
 
     def complete
-      @track, @preload_track = @preload_track, nil
+      @track, @next_track = @next_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
+      return true unless @next_track.nil?
+      !@preloader.nil? && @preloader.alive?
     end
 
     def self.play(radio)

data/lib/xiami_radio/version.rb

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

data/lib/xiami_radio/view/player.rb

@@ -59,11 +59,11 @@ module XiamiRadio
       end
 
       def render_progress_line(play_rate, dawnload_rate)
-        p = (play_rate * cols).round
-        d = (dawnload_rate * cols).round - p
+        d_cols = [(dawnload_rate * cols).round, cols].min
+        p_cols = [(play_rate * cols).round, d_cols].min
         setpos(1, 0)
         clrtoeol
-        addstr('_' * p + '#' * d + ' ' * (cols - p - d))
+        addstr('_' * p_cols + '#' * (d_cols - p_cols) + ' ' * (cols - d_cols))
       end
 
       def render_info_line(track, position)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiami_radio
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Ivan Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite