sleeproom 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccc2b043aff09d26b34628f302b06b38f3cca3aba8193bcd0164a294b6a74df
-  data.tar.gz: 97fac01b4349e11eaa28cdb0fb4dbe83c4c9d4874d29c7002abc3ba2ec2f757b
+  metadata.gz: 176b96c36ba23668dfa2b208022214cf61fa3a3d25d206466ebc8f01ceb1e4e2
+  data.tar.gz: 3bc135a5913ccc38dd81e4f49a8e3c33e8db9986eb282c5a61014725fca3bb0b
 SHA512:
-  metadata.gz: 8ca356b737df0e57a5e442ff71e42a127698bcdd0b5a803272f35de0fcccc667d8b5796383795baa51706ba332f441ce2e4e59e54a971cbdc387d636cc489fd7
-  data.tar.gz: b3a840d7063a2a6ee531093134a56d3c975abb70fa826096c233f174a75d75692025543699597db2205333470e94cc5a6750bdf6a7be957a83f997376f5c047d
+  metadata.gz: 1a907be22130df26ce7dd9a66c4753e06b31570724d4aaf4e90a62b0c147f6d86d010ce3dae31a7db32ab07600d99dbf302f1efb82473ef94dc6affe84cb3b0d
+  data.tar.gz: 06d08117b5c8c9c392619ba57c85f658e4fdf1a75902d163ed53e51b77234ef949fa8dd17ebedcc021ee5edfdd334f1193792fc5219ed27cbdb3fdae362f8150

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.2.0)
-      async
-      async-http-faraday
-      async-websocket
-      colorize
-      configatron
-      terminal-table
+    sleeproom (0.3.0)
+      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/

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/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

@@ -159,7 +159,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
@@ -187,7 +187,8 @@ module SleepRoom
         })
         task.async do |t|
           while true
-            if !SleepRoom.running?(pid) && !API::RoomAPI.new(@room).live?
+            live = API::RoomAPI.new(@room).live?
+            if !SleepRoom.running?(pid) && !live
               log("Download complete.")
               @downlaoding = false
               @queue.add({
@@ -198,9 +199,19 @@ 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
           end
+        rescue Faraday::ConnectionFailed
+          log("Network error.")
+          retry
         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
@@ -111,10 +112,6 @@ module SleepRoom
         file: {
           use: true,
           path: "#{sleeproom_dir}/log"
-        },
-        websocket: {
-          log: true,
-          ping_log: false
         }
       }
     }
@@ -197,18 +194,43 @@ module SleepRoom
   # @param string [String]
   # @return [nil]
   def self.info(string)
-    STDOUT.puts("[INFO] #{string}".colorize(:white))
+    log(:info, "[INFO] #{string}".colorize(:white))
   end
 
   # @param string [String]
   # @return [nil]
   def self.warning(string)
-    warn("[WARN] #{string}".colorize(:yellow))
+    log(:warning, "[WARN] #{string}".colorize(:yellow))
   end
 
   # @param string [String]
   # @return [nil]
   def self.error(string)
-    STDOUT.puts("[ERROR] #{string}".colorize(:red))
+    log(:error, "[ERROR] #{string}".colorize(:red))
+  end
+
+  def self.log(type, log)
+    case type
+    when :info
+      puts(log)
+    when :warning
+      warn(log)
+    when :error
+      puts(log)
+    end
+    file_logger(type, log) if configatron.logger.file.use == true
+  end
+
+  def self.file_logger(type, log)
+    path = configatron.logger.file.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.3.0"
 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.3.0
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-14 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