merged snupfox

diff --git a/bin/3ch-idx.rb b/bin/3ch-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index e0524b2..1524cb3
--- a/bin/3ch-idx.rb
+++ b/bin/3ch-idx.rb
@@ -21,7 +21,7 @@ uploader.root_path = "/tech-arts/ta3dc"
 uploader.base_html = "t1a931d9c1s9.html"
 uploader.kcode = 'U'
 uploader.authorization = "Basic " + ["tech:mybride"].pack('m').chomp
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/3ch'
+uploader.local_dir = '/Volumes/uploader/arc/3ch'
 body = uploader.get_base
 each_fileno(body) do |fileno|
   basename_without_extension = "TA3CH%04d" % fileno.to_i

diff --git a/bin/hnt-idx.rb b/bin/hnt-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index caf089a..3c26e97
--- a/bin/hnt-idx.rb
+++ b/bin/hnt-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "www.nijibox5.com"
 uploader.root_path = "/futabacustom/save"
 uploader.base_html = ""
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/hnt'
+uploader.local_dir = '/Volumes/uploader/arc/hnt'
 body = uploader.get_base
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)

diff --git a/bin/mmd-idx.rb b/bin/mmd-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index bf054d9..f9e23da
--- a/bin/mmd-idx.rb
+++ b/bin/mmd-idx.rb
@@ -19,8 +19,9 @@ uploader = SnUploader.new
 uploader.host = "bytatsu.net"
 uploader.root_path = "/uploader/mikumikudance"
 uploader.base_html = "index.html"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/mmd'
+uploader.local_dir = '/Volumes/uploader/arc/mmd'
 body = uploader.get_base
+open('/Volumes/uploader/src/mmd/index.html', 'w'){ |f| f.puts body }
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)
   puts [ filename, exist ? 'exist' : 'download' ].join("\t")

diff --git a/bin/mmdacc1-idx.rb b/bin/mmdacc1-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0fda001..68fcfcc
--- a/bin/mmdacc1-idx.rb
+++ b/bin/mmdacc1-idx.rb
@@ -18,9 +18,10 @@ end
 uploader = SnUploader.new
 uploader.host = "www9.atpages.jp"
 uploader.root_path = "/~mmdaccessory/uploader"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/mmdacc1'
+uploader.local_dir = '/Volumes/uploader/arc/mmdacc1'
   uploader.base_html = "index.php"
   body = uploader.get_base
+  open('/Volumes/uploader/src/mmdacc1/index.html', 'w'){ |f| f.puts body }
   each_filename(body) do |filename|
     exist = uploader.local_file_exist?(filename)
     puts [ filename, exist ? 'exist' : 'download' ].join("\t")

diff --git a/bin/mmdacc2-idx.rb b/bin/mmdacc2-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index 7117149..c8a81da
--- a/bin/mmdacc2-idx.rb
+++ b/bin/mmdacc2-idx.rb
@@ -18,9 +18,10 @@ end
 uploader = SnUploader.new
 uploader.host = "www9.atpages.jp"
 uploader.root_path = "/~mmdaccessory/uploader2"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/mmdacc2'
+uploader.local_dir = '/Volumes/uploader/arc/mmdacc2'
   uploader.base_html = "index.html"
   body = uploader.get_base
+  open('/Volumes/uploader/src/mmdacc2/index.html', 'w'){ |f| f.puts body }
   each_filename(body) do |filename|
     exist = uploader.local_file_exist?(filename)
     puts [ filename, exist ? 'exist' : 'download' ].join("\t")

diff --git a/bin/mmdfile-idx.rb b/bin/mmdfile-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index a3f57fc..ce94eae
--- a/bin/mmdfile-idx.rb
+++ b/bin/mmdfile-idx.rb
@@ -5,9 +5,13 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'sn_uploader'
 
-def each_filename(text)
-  text.scan(%r(<a href="(.+?)" >(.+?)</a>)) do |href, name |
-    yield name
+def each_id(text)
+  file_href = '?id='
+  file_re = Regexp.new(Regexp.escape(file_href) + '(\d+)\\z')
+  text.scan(/href="(.+?)"/) do |href, |
+    if md = file_re.match(href)
+      yield md[1]
+    end
   end
 end
 
@@ -15,11 +19,12 @@ uploader = SnUploader.new
 uploader.host = "loda.jp"
 uploader.root_path = "/mmdfile"
 uploader.local_dir = '/Volumes/uploader/arc/mmdfile'
-  uploader.base_html = "/?page=1"
+  uploader.base_html = "/"
   body = uploader.get_base
-  open('/Volumes/uploader/src/mmdfile/1.html', 'w') { |o| o.puts body }
-  each_filename(body) do |filename|
+  open('/Volumes/uploader/src/mmdfile/index.html', 'w'){ |f| f.puts body }
+  each_id(body) do |id|
+    filename = id + '.zip'
     exist = uploader.local_file_exist?(filename)
-    puts [ filename, exist ? 'exist' : 'download' ].join("\t")
+    puts [ id, exist ? 'exist' : 'download' ].join("\t")
     uploader.download_file_directly_id(filename)
   end

diff --git a/bin/mod-idx.rb b/bin/mod-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index a736f96..074c3b2
--- a/bin/mod-idx.rb
+++ b/bin/mod-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "www.nijibox5.com"
 uploader.root_path = "/futabacustom/mod"
 uploader.base_html = ""
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/mod'
+uploader.local_dir = '/Volumes/uploader/arc/mod'
 body = uploader.get_base
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)

diff --git a/bin/pnt-idx.rb b/bin/pnt-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index f8a39b2..4bf4b2f
--- a/bin/pnt-idx.rb
+++ b/bin/pnt-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "www.nijibox5.com"\r
 uploader.root_path = "/futabacustom/pose"\r
 uploader.base_html = ""\r
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/pnt'\r
+uploader.local_dir = '/Volumes/uploader/arc/pnt'\r
 body = uploader.get_base\r
 each_filename(body) do |filename|\r
   exist = uploader.local_file_exist?(filename)\r

diff --git a/bin/tap-idx.rb b/bin/tap-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0a88e26..87ae479
--- a/bin/tap-idx.rb
+++ b/bin/tap-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "www.esc-j.net"
 uploader.root_path = "/tech-arts/pose"
 uploader.base_html = ""
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/tap'
+uploader.local_dir = '/Volumes/uploader/arc/tap'
 body = uploader.get_base
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)

diff --git a/bin/tim-idx.rb b/bin/tim-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index a75f065..fe5d7fa
--- a/bin/tim-idx.rb
+++ b/bin/tim-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "www.nijibox5.com"
 uploader.root_path = "/futabacustom/time"
 uploader.base_html = ""
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/tim'
+uploader.local_dir = '/Volumes/uploader/arc/tim'
 body = uploader.get_base
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)

diff --git a/bin/wpc-idx.rb b/bin/wpc-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index 8a2f6f2..90746e1
--- a/bin/wpc-idx.rb
+++ b/bin/wpc-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "3dcustom.ath.cx"
 uploader.root_path = "/uploader/mod"
 uploader.base_html = "upload.html"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/wpc'
+uploader.local_dir = '/Volumes/uploader/arc/wpc'
 body = uploader.get_base
 each_fileno(body) do |fileno|
   basename_without_extension = "MODS%04d" % fileno.to_i

diff --git a/bin/xpc-idx.rb b/bin/xpc-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index ba68b1a..c3dd622
--- a/bin/xpc-idx.rb
+++ b/bin/xpc-idx.rb
@@ -19,7 +19,7 @@ uploader = SnUploader.new
 uploader.host = "up1.3dcustom.net"
 uploader.root_path = "/TACuploader"
 uploader.base_html = "upload.html"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/xpc'
+uploader.local_dir = '/Volumes/uploader/arc/xpc'
 body = uploader.get_base
 each_fileno(body) do |fileno|
   basename_without_extension = "XPC%05d" % fileno.to_i

diff --git a/bin/xpp-idx.rb b/bin/xpp-idx.rb
old mode 100755 (executable)
new mode 100644 (file)
index 546763f..c8b018b
--- a/bin/xpp-idx.rb
+++ b/bin/xpp-idx.rb
@@ -18,7 +18,7 @@ uploader = SnUploader.new
 uploader.host = "3dcustom.net"
 uploader.root_path = "/TAPuploader"
 uploader.base_html = "upload.html"
-uploader.local_dir = File.dirname(__FILE__) + '/../arc/xpp'
+uploader.local_dir = '/Volumes/uploader/arc/xpp'
 body = uploader.get_base
 each_filename(body) do |filename|
   exist = uploader.local_file_exist?(filename)

diff --git a/lib/sn_uploader.rb b/lib/sn_uploader.rb
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/lib/user_agent.rb b/lib/user_agent.rb
old mode 100755 (executable)
new mode 100644 (file)