xiami_radio 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2945c7bf31a3da8dab44bef8baeec1cc0e43d95f
-  data.tar.gz: 2777d8c81551c09bd2fd1a7f2a6f5105cc737acb
+  metadata.gz: ad5acb7b2b85bf3651375b099f3cd44df6c30ab0
+  data.tar.gz: 35e41bb6a31064ff8d60f1d4981058811da27c66
 SHA512:
-  metadata.gz: 8a851c417c5d7d3d161c58bd0faf5b74422c7f1656e0464749a22b41d15c7ad820f2c409749ee586a6421dd7a6de44735ba2cad6e8207dc8125a2267fd74afdb
-  data.tar.gz: 78a312b7a549331b07d01d7a0a0471a2d5583addf9f66e1cbd2cef50f85504d2d8146cde07824cd7fb0e916f82af15a5a680924c96971fb982b9c884afc2fc38
+  metadata.gz: 731587bb2b51bb5b1c9ca00ba83fe1c35a946a7525cb5221db1fbc124f5aaddafaa3bbe518fd00a7d7c8be959bc64b4cd1bd8fdfdcbc01f72f6426d2290388b9
+  data.tar.gz: a47b38e7bf6d0cf1867934ae99910b2d552e0ead89a5f122fd454c39e6943e9dce17005de444560957a0a9b4bae55a6dbb0af5d1c3f90665608100296610f0db

data/lib/xiami_radio/client.rb

@@ -50,7 +50,7 @@ module XiamiRadio
     def request(uri, format, headers, &block)
       _headers = @headers.merge headers
       _headers.merge! 'Cookie' => HTTP::Cookie.cookie_value(user.cookie_jar.cookies uri)
-      _headers.merge! 'X-Requested-With' => 'XMLHttpRequest' if %i(json xml).include? format
+      _headers.merge! 'X-Requested-With' => 'XMLHttpRequest' if %i(json xml xhtml).include? format
 
       res = block.call _headers
 

data/lib/xiami_radio/downloader.rb

@@ -25,8 +25,7 @@ module XiamiRadio
     end
 
     def start
-      @thread = Thread.start { request URI(@track.location) }
-      sleep 0.1 until @progress.to_i > 0
+      @thread ||= Thread.start { request URI(@track.location) }
     end
 
     def stop

data/lib/xiami_radio/player.rb

@@ -52,17 +52,19 @@ module XiamiRadio
     def position_change(position)
       @view.refresh @track, position
 
+      @track.record position.to_i if (120.0..120.1).include? 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, @next_track = @next_track, nil
+      @track.record
     end
 
     def preload?

data/lib/xiami_radio/track.rb

@@ -9,7 +9,7 @@ module XiamiRadio
       @client = Client.new user: User.instance
     end
 
-    def location(hd: false)
+    def location(hd: true)
       hd ? decode_location(hd_location) : decode_location(@info[:location])
     end
 
@@ -36,20 +36,23 @@ module XiamiRadio
 
     def file_path
       @info[:file_path] ||= begin
-        downloader.start if downloader.file.nil?
+        downloader.start
+        sleep 0.1 while downloader.file.nil? || File.empty?(downloader.file)
         downloader.file.path
       end
     end
 
-    def record
-      uri = client.uri path: '/count/playrecord',
-                       query: URI.encode_www_form(sid: song_id, type: 1, ishq: 1)
-      client.get(uri, headers: radio.headers_referer, format: :js)
+    def record(point = 1)
+      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)
     end
 
     def fav
-      uri = client.uri path: '/song/fav',
-                       query: URI.encode_www_form(ids: song_id, _xiamitoken: client.user.xiami_token)
+      uri = client.uri path: '/song/fav', query: URI.encode_www_form(
+        ids: song_id, _xiamitoken: client.user.xiami_token
+      )
       res = client.get(uri, headers: radio.headers_referer, format: :js)
 
       return '操作失败 (╯‵□′)╯︵┻━┻' unless res.code == '200'

data/lib/xiami_radio/version.rb

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

metadata

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