directlink 0.0.8.4 → 0.0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f42b5eafdc2cffee78b290dd2b2873863da1f17
-  data.tar.gz: edda6ebe3c54923788d5ead6591896a26d0601fc
+  metadata.gz: e62e48e14056c1b1ab1c34049bc1e4137ca77239
+  data.tar.gz: 405b2ee26671bf02bcc118dd4ae985ba99d545db
 SHA512:
-  metadata.gz: b3e0f61364cce617a0bcc7f1ffa03ff2b94f459c80b368a3395596a17015c04217dfeee31d31b8f416f76f88ee80851084e55a6fc1180725f128ac874bc8fbde
-  data.tar.gz: 07e69d129b074449d3dcc52d187dc9e163fc70bbaabf2a5bbd319127a6447c13408f75b3d8528be8fb1974b8f9b21904a09b13fff301311fd7dfa99070a5f335
+  metadata.gz: 1b171d73b0edd1ad7b7e7cab84bf78c82916044858c9fdbd0c8dabfd6cba6a00d6b03db9ef6ac84a001e82f769cbd8df4142f30295aab1670dcfe22700cca812
+  data.tar.gz: ffddae00c3c62fa43ea4ce3050def2347d1010e908f1da28a886d72e39ce3c62f4202f5343180f4869523023f832e5be7f40231344baf30fc6510da03c427a50

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.8.4"
+  spec.version      = "0.0.8.5"
   spec.summary      = "converts any kind of image hyperlink to direct link, type of image and its resolution"
 
   spec.author       = "Victor Maslov aka Nakilon"

data/lib/directlink.rb

@@ -275,7 +275,7 @@ end
 
 require "fastimage"
 
-def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ignore_meta: false
+def DirectLink link, timeout = nil, giveup: false, ignore_meta: false
   ArgumentError.new("link should be a <String>, not <#{link.class}>") unless link.is_a? String
   begin
     URI link
@@ -313,10 +313,10 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ig
       **( %w{ reddit com } == URI(link).host.split(?.).last(2) ||
           %w{   redd it  } == URI(link).host.split(?.) ? {Cookie: "over18=1"} : {} ),
     }
-    head = NetHTTPUtils.request_data link, :head, header: header, **(max_redirect_resolving_retry_delay ? {
-      timeout: max_redirect_resolving_retry_delay,
-      max_start_http_retry_delay: max_redirect_resolving_retry_delay,
-      max_read_retry_delay: max_redirect_resolving_retry_delay
+    head = NetHTTPUtils.request_data link, :head, header: header, **(timeout ? {
+      timeout: timeout,
+      max_start_http_retry_delay: timeout,
+      max_read_retry_delay: timeout
     } : {})
   rescue Net::ReadTimeout
   rescue NetHTTPUtils::Error => e
@@ -370,7 +370,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ig
       f = ->_{ _.type == :a ? _.attr["href"] : _.children.flat_map(&f) }
       require "kramdown"
       return f[Kramdown::Document.new(u).root].map do |sublink|
-        DirectLink URI.join(link, sublink).to_s, max_redirect_resolving_retry_delay, giveup: giveup
+        DirectLink URI.join(link, sublink).to_s, timeout, giveup: giveup
       end
     end
     return struct.new *u.values_at(*%w{ fallback_url width height }), "video" if u.is_a? Hash
@@ -391,7 +391,10 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ig
   rescue FastImage::UnknownImageType
     raise if giveup
     require "nokogiri"
-    head = NetHTTPUtils.request_data link, :head, header: {"User-Agent" => "Mozilla"}
+    head = NetHTTPUtils.request_data link, :head, header: {"User-Agent" => "Mozilla"},
+      max_start_http_retry_delay: timeout,
+      timeout: timeout,                 # NetHTTPUtild passes this as read_timeout to Net::HTTP.start
+      max_read_retry_delay: timeout     # and then compares accumulated delay to this
     # if we use :get here we will download megabytes of files just to giveup on content_type we can't process
     case head.instance_variable_get(:@last_response).content_type
     when "text/html" ; nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.8.4
+  version: 0.0.8.5
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage