cherrypicker 0.2.4 → 0.2.5

data/lib/cherrypicker/download.rb

@@ -9,12 +9,13 @@ require 'progressbar'
 require 'open-uri'
 
 class Download
-  attr_accessor :link, :size, :location, :progress
+  attr_accessor :link, :size, :location, :progress, :filename
   
-  def initialize(link, location = nil, size = nil)
+  def initialize(link, location = nil, size = nil, filename = nil)
     @link     = link
     @size     = size
     @location = location
+    @filename = filename
     @progress = 0
  
     download_file
@@ -28,8 +29,8 @@ class Download
     request.initialize_http_header({"User-Agent" => random_agent})
     @size = http.request_head(URI.escape(uri.path))['content-length'].to_i if @size.nil?
     http.request(request) do |response|
-      bar = ProgressBar.new(File.basename(uri.path), @size.to_i)
-      File.open(@location + File.basename(uri.path), "wb") do |file|
+      bar = ProgressBar.new((@filename ||= File.basename(uri.path)), @size.to_i)
+      File.open(@location + (@filename ||= File.basename(uri.path)), "wb") do |file|
         response.read_body do |segment|
           @progress += segment.length
           bar.set(@progress)

data/lib/cherrypicker/hotfile.rb

@@ -25,7 +25,7 @@ class Hotfile
   end
 
   def download
-    Download.new(@hostname + remote_url, @location, @size)
+    Download.new(@hostname + remote_url, @location, @size, @filename)
   end
   
   def filename

data/lib/cherrypicker/rapidshare.rb

@@ -24,7 +24,7 @@ class Rapidshare
   end
   
   def download
-    Download.new(@hostname + remote_url, @location, @size,)
+    Download.new(@hostname + remote_url, @location, @size, @filename)
   end
   
   def fileid

data/lib/cherrypicker/version.rb

@@ -1,3 +1,3 @@
 module Cherrypicker
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

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