fyt 1.1.1.pre3 → 1.1.1.pre4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fyt/builder.rb +2 -0
- data/lib/fyt/parser.rb +2 -0
- data/lib/fyt/storage.rb +16 -13
- data/lib/fyt.rb +8 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a81606a3c21fc3b1d1fe00165742857047de5a8b
|
4
|
+
data.tar.gz: 756d3602dc030c0790c8b608906900a6b74e838c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8de400085990440bd70262258b1c997dd247984ded9fb48a0a71520eca13ff701a722d0418fd0668beb98e07e68c4f91fadb1e07433617ab4d1a50204bc821f5
|
7
|
+
data.tar.gz: fe29868293ad3b373c664cd0993020812737d6524f6a884503a975ea589e6834627ff71b60a27adc5dfb359d1e22d9e4db947f632f44c6c16157c84d1ec1894d
|
data/lib/fyt/builder.rb
CHANGED
data/lib/fyt/parser.rb
CHANGED
data/lib/fyt/storage.rb
CHANGED
@@ -52,15 +52,14 @@ module FYT
|
|
52
52
|
def download_file!(url, output_path)
|
53
53
|
proxy = @proxy_manager.get!
|
54
54
|
|
55
|
-
|
55
|
+
options_string = [
|
56
56
|
"-f '#{@format_options}'",
|
57
57
|
"--merge-output-format '#{@output_format}'",
|
58
|
-
"-o '#{output_path}'"
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
options_string = options.join(' ')
|
58
|
+
"-o '#{output_path}'",
|
59
|
+
"--proxy 'http://#{proxy.url}'",
|
60
|
+
"--socket-timeout '300'",
|
61
|
+
"'#{url}'"
|
62
|
+
].join(' ')
|
64
63
|
|
65
64
|
logger.debug "Executing: youtube-dl #{options_string}"
|
66
65
|
|
@@ -69,16 +68,20 @@ module FYT
|
|
69
68
|
@download_counter ||= 0
|
70
69
|
@download_counter += 1
|
71
70
|
|
71
|
+
@proxy_manager.remove(proxy)
|
72
|
+
|
72
73
|
download_file!(url, output_path) if @download_counter < 3
|
73
74
|
end
|
74
75
|
|
75
76
|
def execute(command_string)
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
77
|
+
Timeout::timeout(5) do
|
78
|
+
IO.pipe do |read_io, write_io|
|
79
|
+
break if system(command_string, out: write_io, err: write_io)
|
80
|
+
|
81
|
+
write_io.close
|
82
|
+
logger.debug read_io.read
|
83
|
+
raise
|
84
|
+
end
|
82
85
|
end
|
83
86
|
end
|
84
87
|
|
data/lib/fyt.rb
CHANGED