fyt 1.1.1.pre5 → 1.1.1.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be94ca2f78ed6194f0b7ecff5a4bf0b5554f24a2
-  data.tar.gz: cba42a9ec84765c12fe3ba311ac0710bb6061434
+  metadata.gz: 3817b93efc8da3c47ff78ae6f2e81dec361f4940
+  data.tar.gz: 0c4a6c210d1d6774810b612f6bd7ac13ec72a0fc
 SHA512:
-  metadata.gz: 783cd1b4b72a5715331ecf4a500352d5df217a1a5a370acb25b188af879944986cc21a9dc87821bce17820bddc382a0d4490d1a91b84a1269fc9fa77951dff27
-  data.tar.gz: 5233887fcd79060a67baa667d92ae709a320b87f2383b315657744f116b2d593f68bc3f0fb110178bbcdb42cad829bee94dd1b03fb5d91b31bc4e70543d4b0e4
+  metadata.gz: 18533ac5ee75a01fc00dc5d047f917e5a232b2d10e5e221576bf74afee7db42779496eefb31f0a47a83ca4fee22aefb3f0ded9cc91dfdf44f15f996925232ca7
+  data.tar.gz: c6309f9a1acef18069269c39659a5443e8eb735425a328331b1154dad74f5ad7945d26a83fc99dcc2df8c8d5551090666d6d3df7e161bd8fab66b7440d1a45d6

data/lib/fyt/builder.rb

@@ -53,12 +53,9 @@ module FYT
     rescue OpenURI::HTTPError => e
       logger.debug "OpenURI::HTTPError: #{e.message}"
     rescue
-      @add_image_counter ||= 0
-      @add_image_counter += 1
-
       @proxy_manager.remove(proxy)
-      
-      add_image(youtube_url, title) if @add_image_counter < 3
+
+      add_image(youtube_url, title) if @proxy_manager.proxies.size > 0
     end
 
     def add_item(link, title, filename)

data/lib/fyt/parser.rb

@@ -17,12 +17,9 @@ module FYT
         return RSS::Parser.parse(rss, false)
       end
     rescue
-      @read_counter ||= 0
-      @read_counter += 1
-
       @proxy_manager.remove(proxy)
 
-      read if @read_counter < 3
+      read if @proxy_manager.proxies.size > 0
     end
   end
 end

data/lib/fyt/storage.rb

@@ -57,31 +57,25 @@ module FYT
         "--merge-output-format '#{@output_format}'",
         "-o '#{output_path}'",
         "--proxy 'http://#{proxy.url}'",
-        "--socket-timeout '300'",
         "'#{url}'"
       ].join(' ')
 
       logger.debug "Executing: youtube-dl #{options_string}"
 
-      execute "youtube-dl #{options_string}"
+      execute "timeout --preserve-status 300 youtube-dl #{options_string}"
     rescue
-      @download_counter ||= 0
-      @download_counter += 1
-
       @proxy_manager.remove(proxy)
 
-      download_file!(url, output_path) if @download_counter < 3
+      download_file!(url, output_path) if @proxy_manager.proxies.size > 0
     end
 
     def execute(command_string)
-      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
+      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
 

metadata

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