xiami_radio 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef36812679c211bf6c72fda6c22fb0a390269e360b382df65e2f98912c3f51b4
-  data.tar.gz: 233923767c98494bc54bf49bb3bf0bc102b778327cf9f3e3802ed27eec259c72
+  metadata.gz: c80df547afbbfc2284323017626b157e353bddeb015ba83a473d0e5cd9fc3336
+  data.tar.gz: 7875216b5308b02065d7c7b7f1c115234bc1f980a13f71155e647adf793a0941
 SHA512:
-  metadata.gz: 11c216165188696466edf7f5c1fe3b4ed4e20f92205422ad368d8579e6ce8f97fce69c5296282abeab520163edf13afe2eb599027efcdaaf558077f504f6ef67
-  data.tar.gz: 6325ca7a7f9b84f73505bc1bec2484e792bfdea916374cd9205b072f7d00338886dca32445323e261f010ae9775640f4d748b93c06dd7455da1f39b36604cb2e
+  metadata.gz: f789017ef89a92681a64a07b6a8bcb95188b3acc36ef12acb2a5ae6e762b21c2012f1f09626833bc4aaf795849a66d8d8f8ff862941ffb2602532660f4b54b4e
+  data.tar.gz: 73ef890cbb1ffeced6dada265b642853609f4039f650763cc6f378b6c6b62c3ae24d1b1b847c58550be1f507d493db1803c6d5921acc1b0bce5925057de4a1e3

data/bin/xiami_radio

@@ -5,6 +5,8 @@ require 'xiami_radio'
 require 'io/console'
 require 'daemons'
 
+XiamiRadio.init
+
 daemons_opts = {
   app_name: 'xiami_radio',
   dir_mode: :normal,
@@ -17,15 +19,24 @@ def send_next_signal(app)
   Process.kill :SIGUSR1, app.pid.pid
 end
 
-case ARGV[0]
-when 'stop', 'status'
-  Daemons.run_proc 'xiami_radio', daemons_opts
-  exit
-when 'next'
-  Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ['status'], show_status_callback: :send_next_signal)
-  exit
+def send_which_signal(app)
+  File.delete XiamiRadio.track_info_swap
+  Process.kill :SIGUSR2, app.pid.pid
+  sleep 0.1
+  puts File.read XiamiRadio.track_info_swap
 end
 
+if ARGV[0] == '-s'
+  case ARGV[1]
+  when 'stop', 'status'
+    Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ARGV[1..-1])
+  when 'next'
+    Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ['status'], show_status_callback: :send_next_signal)
+  when 'name', 'which', 'what'
+    Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ['status'], show_status_callback: :send_which_signal)
+  end
+  exit
+end
 
 args = ARGV.select { |arg| /^[a-zA-Z]+=.+/ === arg }.inject({}) do |res, arg|
   k, v = arg.split("=")
@@ -68,7 +79,14 @@ else
 end
 
 if original_argv.include? '-d'
+  if RUBY_PLATFORM.include?('x86_64-darwin') && ENV['OBJC_DISABLE_INITIALIZE_FORK_SAFETY'] != 'YES'
+    puts "Plz setup OBJC_DISABLE_INITIALIZE_FORK_SAFETY firstly:"
+    puts "  export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES"
+    return
+  end
+
   Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ['start']) do
+    XiamiRadio.init
     XiamiRadio::Player.play XiamiRadio::Radio.new(type: radio_type, oid: radio_oid)
   end
 else

data/lib/xiami_radio.rb

@@ -19,24 +19,25 @@ module XiamiRadio
   Thread.abort_on_exception = true
 
   class << self
+    attr_reader :logger
+
     def init
       mktmpdir
       $stderr.reopen File.join(TMP_DIR, '戊'), 'w'
-      logger.level = debug? ? :debug : :warn
+      @logger = Logger.new File.join(TMP_DIR, '戊')
+      logger.level = debug? ? :debug : :info
     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
+
+    def track_info_swap
+      File.join(XiamiRadio::TMP_DIR, '庚')
+    end
   end
 end
-
-XiamiRadio.init

data/lib/xiami_radio/downloader.rb

@@ -41,7 +41,7 @@ module XiamiRadio
         if res.code == '302'
           request URI(res.header['Location'])
         else
-          XiamiRadio.logger.debug "#{@track.title} download start"
+          XiamiRadio.logger.info "#{@track.title} download start"
           @progress, @total = 0, res.header['Content-Length'].to_i
           @file = File.open(filename, 'w')
           res.read_body do |chunk|
@@ -51,7 +51,7 @@ module XiamiRadio
           end
         end
       end
-      XiamiRadio.logger.debug "#{@track.title} download completed"
+      XiamiRadio.logger.info "#{@track.title} download completed"
     end
   end
 end

data/lib/xiami_radio/player.rb

@@ -16,6 +16,11 @@ module XiamiRadio
       @view.listen_on self
 
       trap(:SIGUSR1) { self.next }
+      trap(:SIGUSR2) do
+        File.open(XiamiRadio.track_info_swap, 'w') do |f|
+          f.puts "#{self.track.title} - #{self.track.artist} - #{self.track.album_name}"
+        end
+      end
     end
 
     def play
@@ -28,7 +33,7 @@ module XiamiRadio
 
     def next
       @track.downloader.stop
-      if preload?
+      if preloading?
         @track, @next_track = @next_track, nil
       else
         @track = @radio.next_track
@@ -54,9 +59,9 @@ module XiamiRadio
     def position_change(position)
       @view.refresh @track, position
 
-      @track.record position.to_i if (120.0..120.1).include? position
+      @track.record position.to_i if (120.0..123.0).include? position
 
-      if !preload? && position / @track.duration > 0.7
+      if !preloading? && position / @track.duration > 0.8
         @preloader = Thread.start do
           @next_track = @radio.next_track
           @player.queue @next_track.file_path
@@ -65,13 +70,12 @@ module XiamiRadio
     end
 
     def complete
-      @track, @next_track = @next_track, nil
       @track.record
+      @track, @next_track = @next_track, nil
     end
 
-    def preload?
-      return true unless @next_track.nil?
-      !@preloader.nil? && @preloader.alive?
+    def preloading?
+      !@next_track.nil? || @preloader&.alive?
     end
 
     def self.play(radio)

data/lib/xiami_radio/radio.rb

@@ -6,13 +6,12 @@ module XiamiRadio
 
     XIAMI_CAI = {type: 8, oid: 0}.freeze
 
-    attr_reader :type, :oid, :nori, :play_queue, :client
+    attr_reader :type, :oid, :play_queue, :client
 
     def initialize(type:, oid:)
       @type = type
       @oid = oid
       @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

@@ -1,6 +1,7 @@
 module XiamiRadio
   class Track
     attr_reader :info, :title, :song_id, :album_name, :artist, :radio, :client
+    attr_accessor :recorded
 
     def initialize(track, radio:)
       @info = track
@@ -43,13 +44,16 @@ module XiamiRadio
     end
 
     def record(point = 1)
-      Thread.start do
-        client.init_http
-        uri = client.uri path: '/count/playrecord', query: URI.encode_www_form(
-          sid: song_id, type:10, start_point: point, _xiamitoken: client.user.xiami_token
-        )
-        client.get(uri, headers: radio.headers_referer, format: :xhtml)
-        XiamiRadio.logger.debug "#{title} record completed"
+      @recorded ||= begin
+        Thread.start do
+          client.init_http
+          uri = client.uri path: '/count/playrecord', query: URI.encode_www_form(
+            sid: song_id, type:10, start_point: point, _xiamitoken: client.user.xiami_token
+          )
+          client.get(uri, headers: radio.headers_referer, format: :xhtml)
+          XiamiRadio.logger.info "#{title} record completed"
+          true
+        end
       end
     end
 

data/lib/xiami_radio/version.rb

@@ -1,5 +1,5 @@
 module XiamiRadio
 
-  VERSION = '1.1.10'
+  VERSION = '1.1.11'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiami_radio
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Ivan Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite