Html2Feedbooks 1.0.10 → 1.1.0

data/bin/html2fb.rb

@@ -8,6 +8,7 @@ require 'parser.rb'
 require 'feedbooks.rb'
 require 'tmpdir'
 require 'launchy'
+require 'digest/md5'
 
 include HTML2FB
 
@@ -27,10 +28,13 @@ OptionParser.new do |opts|
 	opts.on("-nc", "--no-conv","No charset conversion") do |f|
 		options[:conv] = !f
 	end
+	opts.on("-C", "--cache", String,"Configuration file") do |f|
+		options[:cache] = !f
+	end
 end.parse!
-
 valid=false
 entry=ARGV[0]
+basedir=Dir.tmpdir+'/'
 while !valid
 	url=nil
 	begin
@@ -45,9 +49,31 @@ while !valid
 	entry=STDIN.readline.strip unless valid
 end
 conf=Conf.new(options[:conf],options[:conv])
+abridged_conf=conf.to_h.reject{|k,v| k=='fb'}
 content=Downloader.download(url)
+cache={}
+ok=false
+if options[:cache] && File.exists?(basedir+'.cache')
+	cache=Marshal.restore(File.open(basedir+'.cache','r'))
+	ok=Digest::MD5.hexdigest(content)==Digest::MD5.hexdigest(cache[:content])
+	abridged_conf.each do |k,v|
+#		puts (abridged_conf[k]==cache[:conf][k]).inspect
+#		puts (abridged_conf[k]).inspect
+#		puts (cache[:conf][k]).inspect
+#		puts "-_-_-_-_"
+		ok&&=abridged_conf[k]==cache[:conf][k]
+	end
+end
 #puts content.size
+if options[:cache] && ok
+puts "Using cache file"
+doc=cache[:doc]
+else
 doc=Parser.new(conf).parse(content)
+end
+File.open(basedir+'.cache','w') do |e|
+Marshal.dump({:url => url,:conf => abridged_conf, :content => content, :doc => doc},e)
+end
 puts doc.toc.to_yaml
 if options[:preview]
 	page=File.join(Dir.tmpdir(),Digest::MD5.hexdigest(url.to_s))+'.html'

data/lib/conf.rb

@@ -21,5 +21,9 @@ module HTML2FB
 		def [](x)
 			@conf[x]
 		end
+
+		def to_h
+			@conf
+		end
 	end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Html2Feedbooks
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 10
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors: 
 - Benoit Larroque
@@ -19,59 +14,44 @@ default_executable: html2fb.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 1
         version: 0.8.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: htmlentities
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
-        - 1
         version: 4.2.1
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: launchy
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
         version: "0.3"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: progressbar
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
-  type: :runtime
-  version_requirements: *id004
+    version: 
 description: Html2Feedbooks is script to automate basic publishing on feedbooks.com
 email: zeta dot ben at gmail dot com
 executables: 
@@ -103,20 +83,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Html2Feedbooks is script to automate basic publishing on feedbooks.com