sleeproom 0.2.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccc2b043aff09d26b34628f302b06b38f3cca3aba8193bcd0164a294b6a74df
-  data.tar.gz: 97fac01b4349e11eaa28cdb0fb4dbe83c4c9d4874d29c7002abc3ba2ec2f757b
+  metadata.gz: 6cceff5806149367580bf38a490ac4301887c28390941d68dcbcba58b1e359e3
+  data.tar.gz: add480c7ae186cdf5cc9b8e7c857d1edd127fd25d6f15ace7ed12e60bf5b0c3b
 SHA512:
-  metadata.gz: 8ca356b737df0e57a5e442ff71e42a127698bcdd0b5a803272f35de0fcccc667d8b5796383795baa51706ba332f441ce2e4e59e54a971cbdc387d636cc489fd7
-  data.tar.gz: b3a840d7063a2a6ee531093134a56d3c975abb70fa826096c233f174a75d75692025543699597db2205333470e94cc5a6750bdf6a7be957a83f997376f5c047d
+  metadata.gz: 2ec44e1d44f7637a047b1793bb8df34aed091a6610cc00a4a41bcbed8af55ae28bc54d8462724dbaeab48710264e4cd38b746affaa50a97c304db9e5c6173ffa
+  data.tar.gz: c4d2dfa38c44c479e7a0fd074470e8bf59ea193e719df7f9a4a6cb91678c3efa40ae4965fdc673a0d75fd16dd58ee72c11e412f2e9276e4d79b92bcf909d5812

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.2.0)
-      async
-      async-http-faraday
-      async-websocket
-      colorize
-      configatron
-      terminal-table
+    sleeproom (0.4.4)
+      async (~> 1.26.0)
+      async-http-faraday (~> 0.9.0)
+      async-websocket (~> 0.15.0)
+      colorize (~> 0.8.0)
+      configatron (~> 4.5.0)
+      terminal-table (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.0)
-    async (1.26.1)
+    ast (2.4.1)
+    async (1.26.2)
       console (~> 1.0)
       nio4r (~> 2.3)
       timers (~> 4.1)
@@ -45,7 +45,7 @@ GEM
     concurrent-ruby (1.1.6)
     configatron (4.5.1)
     console (1.8.2)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     i18n (1.8.3)
@@ -54,9 +54,9 @@ GEM
     minitest (5.14.1)
     multipart-post (2.1.1)
     nio4r (2.5.2)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     protocol-hpack (1.4.2)
     protocol-http (0.20.0)
     protocol-http1 (0.13.0)
@@ -67,7 +67,7 @@ GEM
     protocol-websocket (0.7.4)
       protocol-http (~> 0.2)
       protocol-http1 (~> 0.2)
-    rack (2.2.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
@@ -108,7 +108,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/bin/sleeproom

@@ -1,6 +1,7 @@
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require "sleeproom/cli"
 
 cli = SleepRoom::CLI.new(ARGV)
-cli.run
+cli.run

data/lib/sleeproom/cli.rb

@@ -8,6 +8,7 @@ module SleepRoom
   class CLI
     # @param argv [Array]
     def initialize(argv)
+      SleepRoom.reload_config
       @options = {}
       build
       unless argv.empty?
@@ -17,8 +18,6 @@ module SleepRoom
           SleepRoom::Record::Tasks.status
         elsif action == "start"
           SleepRoom::Record::Tasks.start
-        elsif action == "download"
-          raise "未实现"
         elsif action == "exit"
           SleepRoom::Record::Tasks.stop
         end
@@ -53,18 +52,24 @@ module SleepRoom
           SleepRoom::Record::Tasks.add(room[0].to_s, room[1].to_s)
         end
 
-        opt.on("-r", "--remove [URL]", "从监视列表移除") do |room|
+        opt.on("-r", "--remove [ROOM]", "从监视列表移除") do |room|
           SleepRoom::Record::Tasks.remove(room)
         end
 
-        opt.on("-v", "--verbose", "Print log") do
-          @options[:verbose] = true
+        opt.on("-d", "--download [ROOM]", "录制指定房间") do |room|
+          raise Error.new("房间名不能为空") if room.nil?
+          if room.match?("https://www.showroom-live.com/")
+            room = room.match(/https:\/\/www.showroom-live.com\/(.*)/)[1]
+          end
+          write_status = SleepRoom::Record::WriteStatus.new
+          record = SleepRoom::Record::Showroom.new(room: room, group: "download", queue: write_status)
+          record.record
         end
 
-        opt.on("-d", "daemon", "Daemonize the script into the background") do
-          @options[:daemon] = true
+        opt.on("-v", "--verbose", "Print log") do
+          @options[:verbose] = true
         end
-
+        
         opt.on_tail("--version", "Print version") do
           STDOUT.puts(opt.version)
         end

data/lib/sleeproom/record/api/api.rb

@@ -10,6 +10,7 @@ module SleepRoom
   module Record
     module API
       class Error < StandardError; end
+      class NotFoundError < Error; end
       ROOM_URL = "https://www.showroom-live.com"
       ROOM_API = "https://www.showroom-live.com/api/room/status"
       STREAMING_API = "https://www.showroom-live.com/api/live/streaming_url"
@@ -21,6 +22,8 @@ module SleepRoom
           http = Faraday.get(url, nil, {"User-Agent": USER_AGENT})
           if http.status == 200
             @json = JSON.parse(http.body)
+          elsif http.status == 404
+            raise NotFoundError
           else
             raise Error, "HTTP Error: #{http.status}"
           end

data/lib/sleeproom/record/api/streaming_api.rb

@@ -15,7 +15,11 @@ module SleepRoom
         end
 
         def streaming_url
-          @json["streaming_url_list"].sort_by{|hash| -hash["quality"]}.first["url"]
+          if @json["streaming_url_list"].nil?
+            raise Error.new("streaming url is null.")
+          else
+            @json["streaming_url_list"].sort_by{|hash| -hash["quality"]}.first["url"]
+          end
         end
       end
     end

data/lib/sleeproom/record/record.rb

@@ -149,6 +149,10 @@ module SleepRoom
         @is_live = api.live?
         @broadcast_host = api.broadcast_host
         @broadcast_key = api.broadcast_key
+      rescue API::NotFoundError
+        SleepRoom.error("[#{@room}] The room does not exist.")
+        log("Task stopped.")
+        Async::Task.current.stop
       rescue => e
         SleepRoom.error(e.message)
         log("[setRoomInfo] Retry...")
@@ -159,7 +163,7 @@ module SleepRoom
         api = API::StreamingAPI.new(@room_id)
         streaming_url_list = api.streaming_url
       rescue => e
-        SleepRoom.error(e.message)
+        SleepRoom.error(e.full_message)
         log("[parseStreamingUrl] Retry...")
         retry
       end
@@ -186,8 +190,9 @@ module SleepRoom
           download_pid: pid
         })
         task.async do |t|
-          while true
-            if !SleepRoom.running?(pid) && !API::RoomAPI.new(@room).live?
+          loop do
+            live = API::RoomAPI.new(@room).live?
+            if !SleepRoom.running?(pid) && !live
               log("Download complete.")
               @downlaoding = false
               @queue.add({
@@ -198,8 +203,18 @@ module SleepRoom
                 status: :complete,
               })
               break
+            elsif live && !SleepRoom.running?(pid)
+              log("Minyami crash.")
+              streaming_url = parse_streaming_url
+              output = build_output
+              pid = SleepRoom::Record.call_minyami(url: streaming_url, output: output)
+            elsif !live && SleepRoom.running?(pid)
+              log("Live stop.")
             end
-            t.sleep 60
+            t.sleep 120
+          rescue Faraday::ConnectionFailed
+            log("Network error.")
+            retry
           end
         end.wait
       end

data/lib/sleeproom/utils.rb

@@ -4,6 +4,7 @@ require "configatron"
 require "colorize"
 require "fileutils"
 require "yaml"
+require "logger"
 
 module SleepRoom
   class Error < StandardError; end
@@ -109,12 +110,8 @@ module SleepRoom
       logger: {
         console: true,
         file: {
-          use: true,
+          use: false,
           path: "#{sleeproom_dir}/log"
-        },
-        websocket: {
-          log: true,
-          ping_log: false
         }
       }
     }
@@ -145,7 +142,8 @@ module SleepRoom
     end
     true
   rescue Errno::ENOENT => e
-    error("Could not load file. \n#{e.message}")
+    info("Creating configuration...")
+    init_base
     false
   end
 
@@ -168,7 +166,7 @@ module SleepRoom
 
   def self.running?(pid=nil)
     pid = SleepRoom.load_config(:pid) if pid.nil?
-    Process.getpgid(pid)
+    Process.kill(0, pid)
     true
   rescue
     false
@@ -197,18 +195,46 @@ module SleepRoom
   # @param string [String]
   # @return [nil]
   def self.info(string)
-    STDOUT.puts("[INFO] #{string}".colorize(:white))
+    log(:info, string)
   end
 
   # @param string [String]
   # @return [nil]
   def self.warning(string)
-    warn("[WARN] #{string}".colorize(:yellow))
+    log(:warning, string)
   end
 
   # @param string [String]
   # @return [nil]
   def self.error(string)
-    STDOUT.puts("[ERROR] #{string}".colorize(:red))
+    log(:error, string)
+  end
+
+  def self.log(type, log)
+    if configatron.logger.console == true
+      case type
+      when :info
+        puts("[INFO] #{log}".colorize(:white))
+      when :warning
+        warn("[WARN] #{log}".colorize(:yellow))
+      when :error
+        puts("[ERROR] #{log}".colorize(:red))
+      end
+    end
+    file_logger(type, log) if configatron.logger.file.use == true
+  end
+
+  def self.file_logger(type, log)
+    path = configatron.logger.file.path
+    mkdir(File.dirname(path)) unless Dir.exist?(File.dirname(path))
+    logger = Logger.new(path)
+    case type
+    when :info
+      logger.info(log)
+    when :warning
+      logger.warning(log)
+    when :error
+      logger.error(log)
+    end
   end
 end

data/lib/sleeproom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SleepRoom
-  VERSION = "0.2.0"
+  VERSION = "0.4.4"
 end

data/sleeproom.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.executables   = ["sleeproom"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("colorize")
-  spec.add_runtime_dependency("async")
-  spec.add_runtime_dependency("async-websocket")
-  spec.add_runtime_dependency("configatron")
-  spec.add_runtime_dependency("async-http-faraday")
-  spec.add_runtime_dependency("terminal-table")
+  spec.add_runtime_dependency("colorize", "~> 0.8.0")
+  spec.add_runtime_dependency("async", "~> 1.26.0")
+  spec.add_runtime_dependency("async-websocket", "~> 0.15.0")
+  spec.add_runtime_dependency("configatron", "~> 4.5.0")
+  spec.add_runtime_dependency("async-http-faraday", "~> 0.9.0")
+  spec.add_runtime_dependency("terminal-table", "~> 1.8.0")
 
   spec.post_install_message = <<~STR
     SleepRoom 需要:

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: sleeproom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.4
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: configatron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: async-http-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 description: 
 email:
 - i@wug.moe