imagechan 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20405a29d95ff1a6956d4b3c3e745c689dde91c
-  data.tar.gz: 9d357e9302e566d45fec2fe3fa9f40a6eceb84fa
+  metadata.gz: 876f49f4b41c7a5723530327050e625c34607f3b
+  data.tar.gz: bea28e45907ab6df60da25e3b525760019c231e0
 SHA512:
-  metadata.gz: 161373d7e63ac36fac2563f48e9616bb06a531e6f76f488d9efc43a267ab0bc5500a30482dd0d1deabaaa34d6fe565d9d12a6e02c737986d4f6e24ac23863bec
-  data.tar.gz: d020c44588af5206cfa6bd77457c341ea6a2171a1db4563e4a0e83378abe04888d6a57e765713e2eabfddb78ecd4c1f18a2363a5adcf239515ca90fe475886b1
+  metadata.gz: a82db3460930d2e6573cef97166d16ebcb9b7f54ceec97243e05131dd5bf8169bfd8a8504bc5e6bf4aae304a21b5505a690ca21b2b146e5fd00b90ce97673aeb
+  data.tar.gz: c23e642fd454486b0a89a4c8c783fefd3a62971c2812b75cf3c839fd6198fa5fbaaa865b74589950a5cf527729f03a258e878d6236183d81b3123c7845b475d6

data/bin/imagechan

@@ -4,28 +4,47 @@ require 'nokogiri'
 require "fileutils"
 require "open-uri"
 require 'imagechan'
+require "imagechan/version"
+require "imagechan/catalog"
 
-#  Preparation
+# Currently available commands
+commands = %w{catalog version clearlock where}
 
+#  Preparation
 if not File.exists? Imagechan.dir
-	puts "Preparing directory"
-	Dir.mkdir(Imagechan.dir)
+	Imagechan.prepare
 end
 
 if ARGV.size == 0
-	# puts "Puts complete thread url to download"
-	# print "url: "
-	# url = STDIN.gets.chomp
 	puts <<-end
-Usage: $ imagechan <url>
-Where <url> is a complete 4chan thread url
+Usage: imagechan <command> [params]
+Commands:
+- <url>	: Download images from <url>
+- version 	: Show current version
+- clearlock 	: Clear LOCK file
 end
 exit(0)
 else
-	url = ARGV.first
+	command = ARGV.first
+
+	case command
+	when "catalog"
+		Imagechan::FourChan.catalog(ARGV[1])
+	when "version"
+		puts "Version #{Imagechan.version}"
+	when "clearlock"
+		Imagechan.clearlock
+	when "where"
+		Imagechan.where?
+	else
+		url = command
+	end
+	if commands.include? command
+		exit(0)
+	end
 end
 
-if not url.match(/http:\/\/boards\.4chan\.org\/[a-z]+\/res\/[0-9]+/)
+if not Imagechan.match_thread_url(url)
 	puts "Error: Please put a valid 4chan thread URL!"
 	exit(0)
 end
@@ -49,7 +68,7 @@ else
 	target_dir = File.join(Imagechan.dir,category,Imagechan.get_folder_name_by_id(thread_id))
 end
 
-# Let's the fun begin
+# Locking download for small connection
 if not File.exists?(File.join(Imagechan.dir,"LOCK"))
 	File.open(File.join(Imagechan.dir,"LOCK"),'w'){|f| f.write ""}
 else
@@ -57,6 +76,7 @@ else
 	exit(0)
 end
 
+# Let's the fun begin
 html_file = open(url)
 doc = Nokogiri::HTML(html_file)
 images = doc.css("a.fileThumb")

data/imagechan.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'imagechan/version'
+# require 'imagechan/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "imagechan"
-  gem.version       = Imagechan::VERSION
+  gem.version       = "0.2.0" #Imagechan::VERSION
   gem.authors       = ["virtualpain"]
   gem.email         = ["uehara.kikumi@gmail.com"]
   gem.description   = %q{Simple 4chan image downloader command}

data/lib/imagechan.rb

@@ -23,4 +23,30 @@ module Imagechan
   	dir = Dir[File.join(Imagechan.dir,"*","#{id}*")].first.split(File::SEPARATOR).last
   	return dir
   end
+
+  def self.prepare
+  	puts "Preparing directory"
+	Dir.mkdir(Imagechan.dir)
+  end
+
+  def self.clearlock
+  	if File.exists?(File.join(Imagechan.dir,"LOCK"))
+  		File.delete File.join(Imagechan.dir,"LOCK") 
+  		puts "LOCK cleared!"
+  	else
+  		puts "There are nothing to unlock"
+  	end
+  end
+
+  def self.match_thread_url(url)
+  	if url.match(/http:\/\/boards\.4chan\.org\/[a-z]+\/res\/[0-9]+/)
+  		true
+  	else
+  		false
+  	end
+  end
+
+  def self.where?
+  	puts Imagechan.dir
+  end
 end

data/lib/imagechan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagechan
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - virtualpain