cherrypicker 0.3.12 → 0.3.13

data/lib/cherrypicker/helpers.rb

@@ -46,8 +46,11 @@ module Cherrypicker
     uri = URI.parse(@link.to_s)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if uri.scheme == "https"
+    http.open_timeout = 3 # seconds
+    http.read_timeout = 3 # seconds
     request = Net::HTTP::Get.new(uri.request_uri)
     request.initialize_http_header({"User-Agent" => Cherrypicker::random_agent})
+    
     unless (uri.host.include? 'youtube.com') && (uri.request_uri.include? 'videoplayback') #youtube throws EOFError
       head = http.request_head(URI.escape(uri.path))
     case head
@@ -57,7 +60,8 @@ module Cherrypicker
         @size = head['content-length'] if @size.nil? && head['content-length'].to_i > 1024
       end
     end
-    puts "unknown file size for #{@filename}" if @size.nil?
+    
+    puts "unknown file size for #{@filename} but downloading..." if @size.nil?
     http.request(request) do |response|
       bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i) unless @size.nil?
       bar.format_arguments=[:title, :percentage, :bar, :stat_for_file_transfer] unless @size.nil?
@@ -70,6 +74,7 @@ module Cherrypicker
         end
       end
     end
+    
     @finished = true
     puts
     puts "download completed"

data/lib/cherrypicker/plugins/youtube.rb

@@ -58,17 +58,10 @@ module Cherrypicker
   		format_ext["5"] = ["flv", "old default?"]
 
       download_url = video_info_hash["fmt_url_map"][formats.first]
-  		@filename = video_info_hash["title"].delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[formats.first].first
+  		@filename = video_info_hash["title"].delete("\"'").gsub(/[^0-9A-Za-z]/, '_') + "." + format_ext[formats.first].first		
+  		@download_url = download_url
+  	end
   		
-  		#there might be a redirect let check
-  		reply = Cherrypicker::remote_query("#{download_url}")
-  		if reply.response['location']
-  		  @download_url = reply.response['location']
-  		else
-  		  @download_url = download_url
-  		end
-    end
-  
     def download
       Cherrypicker::download_file(@download_url, :location => @location, :filename  => @filename)
     end

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -2,7 +2,7 @@
 name: cherrypicker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Karl Entwistle