sleeproom 0.2.0 → 0.9.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccc2b043aff09d26b34628f302b06b38f3cca3aba8193bcd0164a294b6a74df
-  data.tar.gz: 97fac01b4349e11eaa28cdb0fb4dbe83c4c9d4874d29c7002abc3ba2ec2f757b
+  metadata.gz: 1164a0ff4adcb7d05b1a089972e1d895a10a334eb0d42be870a13198efbeec65
+  data.tar.gz: a22e22bc58e4db57da69b233d81026f6449645a4755a93c2353cb40430ab3ad9
 SHA512:
-  metadata.gz: 8ca356b737df0e57a5e442ff71e42a127698bcdd0b5a803272f35de0fcccc667d8b5796383795baa51706ba332f441ce2e4e59e54a971cbdc387d636cc489fd7
-  data.tar.gz: b3a840d7063a2a6ee531093134a56d3c975abb70fa826096c233f174a75d75692025543699597db2205333470e94cc5a6750bdf6a7be957a83f997376f5c047d
+  metadata.gz: 2999e46c33eaf5eed3fe5687e7815f74fcf0b0b702a9fc25113f10234c4d8e2d54d4023d460e7fb54a1f84a02b266c3d3f27dfb823ec0e16a0db2292ae6e8dad
+  data.tar.gz: 284d500d464e090b83dc7d72a4e1ed1e6db3322095e60f93e079359a0c25a8cef12804b3c9eb3f3a0a7a6fd45aaf32dbd684b03284eacd3317cbb33df367e968

data/Gemfile

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in sleeproom.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
-gem "rubocop", "~> 0.79.0"
 gem "rubocop-github"
 gem "rubocop-performance", require: false

data/Gemfile.lock

@@ -1,28 +1,35 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.2.0)
-      async
-      async-http-faraday
-      async-websocket
-      colorize
-      configatron
-      terminal-table
+    sleeproom (0.9.0.pre1)
+      async (~> 1.26.0)
+      async-http-faraday (~> 0.9.0)
+      async-websocket (~> 0.15.0)
+      backports (~> 3.0)
+      colorize (~> 0.8.0)
+      configatron (~> 4.5.0)
+      falcon (~> 0.36.0)
+      roda (~> 3.33.0)
+      ruby-next-core (~> 0.9.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)
+    async-container (0.16.6)
+      async (~> 1.0)
+      async-io (~> 1.26)
     async-http (0.52.4)
       async (~> 1.25)
       async-io (~> 1.28)
@@ -30,6 +37,8 @@ GEM
       protocol-http (~> 0.20.0)
       protocol-http1 (~> 0.13.0)
       protocol-http2 (~> 0.14.0)
+    async-http-cache (0.2.0)
+      async-http (~> 0.51)
     async-http-faraday (0.9.0)
       async-http (~> 0.42)
       faraday
@@ -41,22 +50,40 @@ GEM
       async-http (~> 0.51)
       async-io (~> 1.23)
       protocol-websocket (~> 0.7.0)
+    backports (3.18.1)
+    build-environment (1.13.0)
     colorize (0.8.1)
     concurrent-ruby (1.1.6)
     configatron (4.5.1)
     console (1.8.2)
     diff-lcs (1.3)
+    falcon (0.36.4)
+      async (~> 1.13)
+      async-container (~> 0.16.0)
+      async-http (~> 0.52.0)
+      async-http-cache (~> 0.2.0)
+      async-io (~> 1.22)
+      build-environment (~> 1.13)
+      localhost (~> 1.1)
+      process-metrics (~> 0.2.0)
+      rack (>= 1.0)
+      samovar (~> 2.1)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
+    localhost (1.1.6)
+    mapping (1.1.1)
     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)
+    process-metrics (0.2.1)
+      console (~> 1.8)
+      samovar (~> 2.1)
     protocol-hpack (1.4.2)
     protocol-http (0.20.0)
     protocol-http1 (0.13.0)
@@ -67,9 +94,12 @@ 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)
+    rake (13.0.1)
+    rexml (3.2.4)
+    roda (3.33.0)
+      rack
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -83,31 +113,36 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.79.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-github (0.16.0)
       rubocop (<= 0.82.0)
       rubocop-performance (~> 1.0)
       rubocop-rails (~> 2.0)
     rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
+      rubocop (>= 0.82.0)
+    ruby-next-core (0.9.2)
     ruby-progressbar (1.10.1)
+    samovar (2.1.4)
+      console (~> 1.0)
+      mapping (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     timers (4.3.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     zeitwerk (2.3.0)
 
 PLATFORMS
@@ -115,9 +150,8 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 0.79.0)
   rubocop-github
   rubocop-performance
   sleeproom!

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/sleeproom

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

data/lib/sleeproom/async/websocket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "async/websocket/connection"
 class WebSocketConnection < Async::WebSocket::Connection
   def read
@@ -5,16 +7,16 @@ class WebSocketConnection < Async::WebSocket::Connection
       parse(buffer)
     end
   end
-  
+
   def write(object)
     super(dump(object))
   end
-  
+
   def parse(buffer)
-    return buffer
+    buffer
   end
-  
+
   def dump(object)
-    return object
+    object
   end
-end
+end

data/lib/sleeproom/cli.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "backports/2.5" if RUBY_VERSION < "2.5.0"
+require "ruby-next"
 require "optparse"
 require "yaml"
 require "sleeproom/record"
@@ -8,19 +10,19 @@ module SleepRoom
   class CLI
     # @param argv [Array]
     def initialize(argv)
+      SleepRoom.reload_config
       @options = {}
       build
-      unless argv.empty?
+      if argv.empty? == false
         @parser.parse!(argv)
         action = argv.shift
-        if action == "status"
+        case action
+        when "status"
           SleepRoom::Record::Tasks.status
-        elsif action == "start"
-          SleepRoom::Record::Tasks.start
-        elsif action == "download"
-          raise "未实现"
-        elsif action == "exit"
-          SleepRoom::Record::Tasks.stop
+        when "start"
+          SleepRoom::Record::Tasks.start(**@options)
+        when "lists"
+          SleepRoom::Record::Tasks.lists
         end
         exit(0)
       else
@@ -29,22 +31,20 @@ module SleepRoom
       end
     end
 
-    # @return [void]
-    def run
-      SleepRoom::Record::Tasks.start
-    end
-
     # @return [void]
     def build
       @parser = OptionParser.new do |opt|
         opt.version = "SleepRoom / #{SleepRoom::VERSION}"
-        opt.banner = "#{opt.version}"
+        opt.banner = opt.version.to_s
         opt.banner += "\nUsage: sleeproom [Options]\n\n"
 
         opt.banner += "Action:\n"
         opt.banner += "status".rjust(10)
         opt.banner += "显示任务状态".rjust(33)
         opt.banner += "\n"
+        opt.banner += "list".rjust(8)
+        opt.banner += "显示录制列表".rjust(35)
+        opt.banner += "\n"
         opt.banner += "exit".rjust(8)
         opt.banner += "关闭任务队列".rjust(35)
         opt.banner += "\n\nCommands:\n"
@@ -53,16 +53,23 @@ 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, "房间名不能为空" if room.nil?
+
+          room = room.match(%r{https://www.showroom-live.com/(.*)})[1] if room.match?("https://www.showroom-live.com/")
+          write_status = SleepRoom::Record::WriteStatus.new
+          Async do
+            record = SleepRoom::Record::Showroom.new(room: room, group: "download", queue: write_status)
+            record.record
+          end
         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

data/lib/sleeproom/record.rb

@@ -8,13 +8,16 @@ require "sleeproom/record/record"
 require "sleeproom/record/tasks"
 require "sleeproom/record/websocket"
 require "sleeproom/record/api/api"
+require "sleeproom/record/web/app"
 require "async"
+require "roda"
+require "rack/handler/falcon"
 require "shellwords"
 module SleepRoom
   module Record
     # Okite!!!
     # @param url [String]
-    # @return [Boolean]
+    # @return [Integer]
     def self.call_minyami(url:, is_live: true, threads: configatron.minyami.threads, output:, retries: configatron.minyami.retries)
       command = "minyami -d #{Shellwords.escape(url)}"
       command += " --retries #{retries.to_i}" if retries
@@ -24,23 +27,23 @@ module SleepRoom
       command += " --output #{Shellwords.escape(output)}" if output
       download_dir_check(output)
       pid = exec_command(command, output)
-      return pid
+      pid
     end
 
     # @param command [String]
-    # @return [Boolean]
+    # @return [Integer]
     def self.exec_command(command, output)
       SleepRoom.info("Call command: #{command}")
       SleepRoom.info("STDOUT: #{output}.out , STDERR: #{output}.err")
       pid = spawn(command, out: "#{output}.out", err: "#{output}.err")
       SleepRoom.info("PID: #{pid}")
       Process.detach(pid)
-      return pid
+      pid
     end
 
     def self.download_dir_check(output)
       dir = File.dirname(output)
-      if !Dir.exist?(dir)
+      unless Dir.exist?(dir)
         SleepRoom.info("#{dir} does not exist, creating...")
         SleepRoom.mkdir(dir)
       end

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

@@ -10,17 +10,16 @@ module SleepRoom
   module Record
     module API
       class Error < StandardError; 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"
-
+      class NotFoundError < Error; end
       USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36"
 
-      def self.get(url)
-        Async do
-          http = Faraday.get(url, nil, {"User-Agent": USER_AGENT})
+      def self.get(url, task: Async::Task.current)
+        task.async do
+          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/room.rb

@@ -4,11 +4,12 @@ module SleepRoom
   module Record
     module API
       class Room
+        ROOM_URL = "https://www.showroom-live.com"
         def initialize(room_name)
           @url = ROOM_URL + "/" + room_name
         end
 
-        def get(task: Async::Task.current)
+        def get
           @json = API.get(@url).wait
         end
       end

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

@@ -4,13 +4,14 @@ module SleepRoom
   module Record
     module API
       class RoomAPI
+        ROOM_API = "https://www.showroom-live.com/api/room/status"
         def initialize(room_url_key)
           @url = ROOM_API + "?room_url_key=" + room_url_key
           @json = nil
           get
         end
 
-        def get(task: Async::Task.current)
+        def get
           @json = API.get(@url).wait
         end
 

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

@@ -4,18 +4,23 @@ module SleepRoom
   module Record
     module API
       class StreamingAPI
+        STREAMING_API = "https://www.showroom-live.com/api/live/streaming_url"
         def initialize(room_id)
           @url = STREAMING_API + "?room_id=" + room_id.to_s + "&ignore_low_stream=1"
           @json = nil
           get
         end
 
-        def get(task: Async::Task.current)
+        def get
           @json = API.get(@url).wait
         end
 
         def streaming_url
-          @json["streaming_url_list"].sort_by{|hash| -hash["quality"]}.first["url"]
+          if @json["streaming_url_list"].nil?
+            raise Error, "streaming url is null."
+          else
+            @json["streaming_url_list"].min_by { |hash| -hash["quality"] }["url"]
+          end
         end
       end
     end