xiami_radio 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ddcbcc63e20f9f3999029050af23a8d67c60df
-  data.tar.gz: 3a463ade0be3eaca266432247e2b8225c0821713
+  metadata.gz: 50ddba85c070fa7c7fd7b01f709dc8db3b3b752d
+  data.tar.gz: bd290dc2f4f2a9ffa6548836532ea253c1ffb8d8
 SHA512:
-  metadata.gz: 726ba0bc37a2c6d153f63afbab77bbadbf4e8637935a33f7c1f099ab3b023f3c657937f53566f4e647989f6b003aca6c9915d7e457964bf7dd665bb84d4fb6cd
-  data.tar.gz: bce25a48033c93f47242d7931f2b236ba5e384083ae81fd1e4c5058a5f014156fd0a151688df308e9563e34d2ab50db7e620fa7abba7d9e601607d9fb5bd7c79
+  metadata.gz: e92935f1f4f3e04b05f2a2779b62bc71b2f6975e5cf331b7b86a56dff48731a9237084c60b837af13d7522026b0563de6355a259e178389f5dca8b75e5d513ef
+  data.tar.gz: cd9685770691fd5ec0fa9ff7012e46d447629fc43e2045e58ddc2baa6377c9b008e65df9c36ab4ae31629e9156bca6fd86ca8e7bed46a033a0fb03a7136d0b3b

data/README.md

@@ -30,6 +30,19 @@ and then
 $ xiaomi_radio
 ```
 
+you can also pass `-d` to make it run in background
+
+```
+# run xiaomi_radio in background
+$ xiaomi_radio -d
+
+# play next song
+$ xiaomi_radio next
+
+# stop
+$ xiaomi_radio stop
+```
+
 Enjoy yourself ~
 
 ## Requirements

data/bin/xiami_radio

@@ -3,36 +3,74 @@
 
 require 'xiami_radio'
 require 'io/console'
+require 'daemons'
+
+daemons_opts = {
+  app_name: 'xiami_radio',
+  dir_mode: :normal,
+  dir: XiamiRadio::TMP_DIR,
+  log_output: XiamiRadio.debug?,
+  output_logfilename: '辛'
+}
+
+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
+end
+
+
+args = ARGV.select { |arg| /^[a-zA-Z]+=.+/ === arg }.inject({}) do |res, arg|
+  k, v = arg.split("=")
+  res.merge k.to_sym => v
+end
+original_argv = ARGV.dup
+ARGV.clear
 
 user = XiamiRadio::User.instance
+unless user.login?
+  email, pwd = args[:email].to_s, args[:pwd].to_s
+  if email.empty? || pwd.to_s.empty?
+    puts 'Plz keep empty if you don\'t want to login'
+    print 'Email: '
+    email = gets.chomp.to_s
+    pwd = unless email.empty?
+      print 'Password: '
+      STDIN.noecho(&:gets).chomp
+    end.to_s
+  end
+  user.login_by_email(email, pwd) unless email.to_s.empty? || pwd.to_s.empty?
+end
+
+if args[:type].to_s.empty? || args[:oid].to_s.empty?
+  puts 'Which radio do you want to listen?'
+  puts '1/Enter - 虾米猜       2 - 个人电台      3 - 其他'
+  case gets.chomp[0]
+  when '2'
+    radio_type, radio_oid = user.login? ? [4, user.user_id] : [8, 0]
+  when '3'
+    print 'type: '
+    radio_type = gets.chomp.to_i
+    print 'oid: '
+    radio_oid = gets.chomp.to_i
+  else
+    radio_type, radio_oid = 8, 0
+  end
+else
+  radio_type, radio_oid = args[:type].to_i, args[:oid].to_i
+end
 
-email = unless user.login?
-          puts 'Plz keep empty if you don\'t want to login'
-          print 'Email: '
-          gets.chomp
-        end.to_s
-pwd = unless user.login? || email.empty?
-        print 'Password: '
-        STDIN.noecho(&:gets).chomp
-      end.to_s
-user.login_by_email email, pwd unless email.empty? || pwd.empty?
-
-puts 'Which radio do you want to listen?'
-puts '1/Enter - 虾米猜       2 - 个人电台      3 - 其他'
-
-radio_option = case gets.chomp[0]
-                 when nil
-                   {type: 8, oid: 0}
-                 when '1'
-                   {type: 8, oid: 0}
-                 when '2'
-                   user.login? ? {type: 4, oid: user.user_id} : {type: 8, oid: 0}
-                 else
-                   print 'type: '
-                   type = gets.chomp[0]
-                   print 'oid: '
-                   oid = gets.chomp
-                   {type: (type || 8).to_i, oid: oid.to_i}
-               end
-
-XiamiRadio::Player.play XiamiRadio::Radio.new(radio_option)
+if original_argv.include? '-d'
+  Daemons.run_proc 'xiami_radio', daemons_opts.merge(ARGV: ['start']) do
+    XiamiRadio::Player.play XiamiRadio::Radio.new(type: radio_type, oid: radio_oid)
+  end
+else
+  XiamiRadio::Player.play XiamiRadio::Radio.new(type: radio_type, oid: radio_oid)
+end

data/lib/xiami_radio.rb

@@ -1,7 +1,7 @@
 require 'xiami_radio/client'
 require 'xiami_radio/downloader'
 require 'xiami_radio/notice'
-require 'xiami_radio/player'
+# require 'xiami_radio/player'
 require 'xiami_radio/radio'
 require 'xiami_radio/track'
 require 'xiami_radio/user'
@@ -11,6 +11,8 @@ require 'tmpdir'
 require 'logger'
 
 module XiamiRadio
+  autoload :Player, 'xiami_radio/player'
+
   TMP_DIR = File.join(Dir.tmpdir, 'xiami_radio').freeze
   DEBUG = false
 

data/lib/xiami_radio/player.rb

@@ -14,6 +14,8 @@ module XiamiRadio
       @player.events.on :position_change, &method(:position_change)
       @player.events.on :complete, &method(:complete)
       @view.listen_on self
+
+      trap(:SIGUSR1) { self.next }
     end
 
     def play

data/lib/xiami_radio/version.rb

@@ -1,5 +1,5 @@
 module XiamiRadio
 
-  VERSION = '1.1.6'
+  VERSION = '1.1.8'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiami_radio
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Ivan Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audite
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement