create entries with archivers

diff --git a/app/models/arc.rb b/app/models/arc.rb
index e781036..f7894df 100644 (file)
--- a/app/models/arc.rb
+++ b/app/models/arc.rb
@@ -5,9 +5,13 @@ class Arc < ActiveGroonga::Base
     key
   end
 
-  def create_zip_entries(path)
-    zip = Archivers::Zip.new(path)
-    zip.each_entry do |ent|
+  def create_entries(path)
+    archiver = Archiver.load(path, extname)
+    unless archiver
+      puts "archiver not found: #{path}"
+      return
+    end
+    archiver.each_entry do |ent|
       case ent
       when /\.pmd\z/
         puts [ code, ent ].join(' ')

diff --git a/bin/load-arcs-bowl.rb b/bin/load-arcs-bowl.rb
index 6b4c1f9..e24d87d 100644 (file)
--- a/bin/load-arcs-bowl.rb
+++ b/bin/load-arcs-bowl.rb
@@ -26,6 +26,6 @@ Bowl.each_code_in_rss do |code|
   locked = bowl.locked?
 
   arc = site.create_arc(name, summary, size, date, origname, locked)
-  arc.create_zip_entries("/Volumes/uploader/arc/#{site.code}/#{name}") unless locked
+  arc.create_entries("/Volumes/uploader/arc/#{site.code}/#{name}") unless locked
   puts
 end

diff --git a/bin/load-arcs.rb b/bin/load-arcs.rb
index 04f5c9f..7592620 100644 (file)
--- a/bin/load-arcs.rb
+++ b/bin/load-arcs.rb
@@ -25,7 +25,7 @@ open(ent) do |f|
     if scrap.match(line)
       name, summary, size, date, origname, locked = scrap.row
       arc = site.create_arc(name, summary, size, date, origname, locked)
-      arc.create_zip_entries("/Volumes/uploader/arc/#{site.code}/#{name}") unless locked
+      arc.create_entries("/Volumes/uploader/arc/#{site.code}/#{name}") unless locked
       puts
     end
   end

diff --git a/lib/archivers.rb b/lib/archivers.rb
index cbdbe9f..bec903c 100644 (file)
--- a/lib/archivers.rb
+++ b/lib/archivers.rb
@@ -73,4 +73,23 @@ module Archivers
       puts "error: " + exc.message
     end
   end
+
+module_function
+
+  def class_from_extname(extname)
+    case extname
+    when 'lzh'
+      Lzh
+    when 'rar'
+      Rar
+    when 'zip'
+      Zip
+    end
+  end
+
+  def load(path, extname)
+    klass = class_from_extname(extname)
+    klass.new(path) if klass
+  end
+
 end