sleeproom 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176b96c36ba23668dfa2b208022214cf61fa3a3d25d206466ebc8f01ceb1e4e2
-  data.tar.gz: 3bc135a5913ccc38dd81e4f49a8e3c33e8db9986eb282c5a61014725fca3bb0b
+  metadata.gz: a8b882f789e21adccfa42fdb69e4c103b6397421b7ba688f2f2465d3ba874be1
+  data.tar.gz: 51436fb96ee7f78de6e8e38541a260a5361bd4add38f0896f216728fa6ed3b03
 SHA512:
-  metadata.gz: 1a907be22130df26ce7dd9a66c4753e06b31570724d4aaf4e90a62b0c147f6d86d010ce3dae31a7db32ab07600d99dbf302f1efb82473ef94dc6affe84cb3b0d
-  data.tar.gz: 06d08117b5c8c9c392619ba57c85f658e4fdf1a75902d163ed53e51b77234ef949fa8dd17ebedcc021ee5edfdd334f1193792fc5219ed27cbdb3fdae362f8150
+  metadata.gz: c697893e07f46d16341ed3a6008c9b4fe304f7b76c3c8c3c6105a3c3c136d46daeade8530696eed0fe806989bca7e60acac10edb4eeb0e2fcf6e5ad312c60c6f
+  data.tar.gz: 0f5f7ae15517f8281ce44e3d8c0536b235436cf44fcfd9833c3f61b60a0cf82dd128788812a7185f4de82c8e3592fb5d11ca65edef58dc8b33b0fe4474e72ee6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sleeproom (0.3.0)
+    sleeproom (0.4.0)
       async (~> 1.26.0)
       async-http-faraday (~> 0.9.0)
       async-websocket (~> 0.15.0)

data/lib/sleeproom/cli.rb

@@ -17,8 +17,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 +51,21 @@ 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?
+          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/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...")
@@ -186,7 +190,7 @@ module SleepRoom
           download_pid: pid
         })
         task.async do |t|
-          while true
+          loop do
             live = API::RoomAPI.new(@room).live?
             if !SleepRoom.running?(pid) && !live
               log("Download complete.")
@@ -208,10 +212,10 @@ module SleepRoom
               log("Live stop.")
             end
             t.sleep 120
+          rescue Faraday::ConnectionFailed
+            log("Network error.")
+            retry
           end
-        rescue Faraday::ConnectionFailed
-          log("Network error.")
-          retry
         end.wait
       end
 

data/lib/sleeproom/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleeproom
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Koell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize