fyt 1.1.1.pre3 → 1.1.1.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ddb6f0c28e0097332cb98626c6e61d00bceba8
-  data.tar.gz: 8e9c2f6adaad7f08292822110b29d76496827a05
+  metadata.gz: a81606a3c21fc3b1d1fe00165742857047de5a8b
+  data.tar.gz: 756d3602dc030c0790c8b608906900a6b74e838c
 SHA512:
-  metadata.gz: af08b83bedaee9a4d401e286054df76ab17da29fca377e9614564df7e8ee01f70801a18c8273ed6c6589effe832bf392ca7dd39631e9a1808ec5cbb9863941a6
-  data.tar.gz: b5e871f6448e936f9fec127206034f054d60d4b09d555b953f20403af7e87717b236663fd4c334ca7ef71f9c927cb80766ea9647b4ef24c97817c73b1cfd1305
+  metadata.gz: 8de400085990440bd70262258b1c997dd247984ded9fb48a0a71520eca13ff701a722d0418fd0668beb98e07e68c4f91fadb1e07433617ab4d1a50204bc821f5
+  data.tar.gz: fe29868293ad3b373c664cd0993020812737d6524f6a884503a975ea589e6834627ff71b60a27adc5dfb359d1e22d9e4db947f632f44c6c16157c84d1ec1894d

data/lib/fyt/builder.rb

@@ -56,6 +56,8 @@ module FYT
       @add_image_counter ||= 0
       @add_image_counter += 1
 
+      @proxy_manager.remove(proxy)
+      
       add_image(youtube_url, title) if @add_image_counter < 3
     end
 

data/lib/fyt/parser.rb

@@ -20,6 +20,8 @@ module FYT
       @read_counter ||= 0
       @read_counter += 1
 
+      @proxy_manager.remove(proxy)
+
       read if @read_counter < 3
     end
   end

data/lib/fyt/storage.rb

@@ -52,15 +52,14 @@ module FYT
     def download_file!(url, output_path)
       proxy = @proxy_manager.get!
 
-      options = [
+      options_string = [
         "-f '#{@format_options}'",
         "--merge-output-format '#{@output_format}'",
-        "-o '#{output_path}'"
-      ]
-      options << "--proxy 'http://#{proxy.url}'"
-      options << "'#{url}'"
-
-      options_string = options.join(' ')
+        "-o '#{output_path}'",
+        "--proxy 'http://#{proxy.url}'",
+        "--socket-timeout '300'",
+        "'#{url}'"
+      ].join(' ')
 
       logger.debug "Executing: youtube-dl #{options_string}"
 
@@ -69,16 +68,20 @@ module FYT
       @download_counter ||= 0
       @download_counter += 1
 
+      @proxy_manager.remove(proxy)
+
       download_file!(url, output_path) if @download_counter < 3
     end
 
     def execute(command_string)
-      IO.pipe do |read_io, write_io|
-        break if system(command_string, out: write_io, err: write_io)
-
-        write_io.close
-        logger.error read_io.read
-        raise
+      Timeout::timeout(5) do
+        IO.pipe do |read_io, write_io|
+          break if system(command_string, out: write_io, err: write_io)
+
+          write_io.close
+          logger.debug read_io.read
+          raise
+        end
       end
     end
 

data/lib/fyt.rb

@@ -9,6 +9,14 @@ require 'fileutils'
 
 require 'proxy_fetcher'
 
+module ProxyFetcher
+  class Manager
+    def remove(proxy)
+      proxies = proxies - [proxy]
+    end
+  end
+end
+
 # handles the general behaviour of FYT
 module FYT
   def self.lock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fyt
 version: !ruby/object:Gem::Version
-  version: 1.1.1.pre3
+  version: 1.1.1.pre4
 platform: ruby
 authors:
 - Steffen Schröder