imagechan 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5408ce82328c425dcbe399032e75731f191cc64f
-  data.tar.gz: 6dfa0f1df5720befbfe71b2200f49e82a6ea3bdc
+  metadata.gz: 8aa7643f63cfe2a01f130c1e0bf9ba3cbc77c53c
+  data.tar.gz: 8033eef5983385761e3fab9681502350827bc645
 SHA512:
-  metadata.gz: 1c5d40b17c55ad7f2834b7550a3ad53891d7f325ac0d20343c187e65d78a5dc7b359ad325312ccd6e9204ef1e3e8dad969fdc6a89dc1c761450d5d9b3a14514f
-  data.tar.gz: d5290658784a00feeaab8c180eb9855cc4815337153e7431f9e80cdf521be6c0f4e42593569977719a3b1b53d57dab170d00b838f047c3d6db1cc317dbf09ae7
+  metadata.gz: c2ff013662f440776b195e283b9540354e4f564a2dc8cf9a63cf9cde20f8e5078371c2eaa87f258d7c7ef2b05be2d81eb90c92b421591c9733a29916b0179a66
+  data.tar.gz: bcf6334f442948557c312870e420e96d4448037d10c0ee1e647421206c7ceb90442ffa200c5230ee869ab08b38d64ad8752cd41abcac8660fa4f1334f6dd4bc0

data/bin/imagechan

@@ -18,9 +18,13 @@ if ARGV.size == 0
 	puts <<-end
 Usage: imagechan <command> [params]
 Commands:
-- <url>	: Download images from <url>
+- <threadurl>	: Download images from valid 4chan thread URL
 - version 	: Show current version
 - clearlock 	: Clear LOCK file
+- where 	: Show path to images
+
+example: $ imagechan http://boards.4chan.org/w/res/1515138
+will download all image from that thread
 end
 exit(0)
 else
@@ -65,7 +69,7 @@ else
 	target_dir = File.join(Imagechan.dir,category,Imagechan.get_folder_name_by_id(thread_id))
 end
 
-# Locking download for small connection
+# Locking download for slow connection
 if not File.exists?(File.join(Imagechan.dir,"LOCK"))
 	File.open(File.join(Imagechan.dir,"LOCK"),'w'){|f| f.write ""}
 else
@@ -73,6 +77,7 @@ else
 	exit(0)
 end
 
+
 # Let's the fun begin
 html_file = open(url)
 doc = Nokogiri::HTML(html_file)
@@ -82,6 +87,7 @@ puts "There are #{images.size} images"
 puts "Saving images to #{target_dir}"
 
 loop_number = 1
+
 images.each do |image|
 	img = "http:" + image.attr("href")
 	image_filename = img[/[0-9]+\.(jpg|png|gif)/]
@@ -89,18 +95,27 @@ images.each do |image|
 	if File.exists?(File.join(target_dir,image_filename))
 		puts "#{image_filename} exists, skipping..."
 	else
-		print "downloading #{image_filename}..."
+		begin
+			print "downloading #{image_filename}..."
 
-		# Pure ruby download method
-		File.open(File.join(target_dir,image_filename),"wb") do |save_file|
-			open(img,"rb") do |read_file|
-				save_file.write(read_file.read)
+			# Pure ruby download method
+			File.open(File.join(target_dir,image_filename),"wb") do |save_file|
+				open(img,"rb") do |read_file|
+					save_file.write(read_file.read)
+				end
 			end
+			puts " done!"
+		rescue Interrupt
+			puts "\nExiting..."
+			File.delete(File.join(target_dir,image_filename)) if File.exists? File.join(target_dir,image_filename)
+			puts "Removed last image to prevent error"
+			File.delete(File.join(Imagechan.dir,"LOCK")) if File.exists? File.join(Imagechan.dir,"LOCK")
+			puts "Lock removed"
+			exit(0)
 		end
-		puts " done!"
 	end
 	loop_number += 1
 end
 
-puts "Your images save in #{target_dir}"
+puts "Your images saved in #{target_dir}"
 File.delete(File.join(Imagechan.dir,"LOCK")) if File.exists? File.join(Imagechan.dir,"LOCK")

data/lib/imagechan/version.rb

@@ -1,5 +1,5 @@
 module Imagechan
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
   def self.version
   	return VERSION
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagechan
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - virtualpain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri