moved

diff --git a/lib/arc.rb b/app/models/arc.rb
similarity index 100%
rename from lib/arc.rb
rename to app/models/arc.rb

diff --git a/lib/pmd.rb b/app/models/pmd.rb
similarity index 100%
rename from lib/pmd.rb
rename to app/models/pmd.rb

diff --git a/lib/thumb.rb b/app/models/thumb.rb
similarity index 56%
rename from lib/thumb.rb
rename to app/models/thumb.rb
index 4be63a4..1c330ab 100644 (file)
--- a/lib/thumb.rb
+++ b/app/models/thumb.rb
@@ -1,2 +1,5 @@
 class Thumb < ActiveGroonga::Base
+  def video_id
+    key
+  end
 end

diff --git a/lib/vmd.rb b/app/models/vmd.rb
similarity index 100%
rename from lib/vmd.rb
rename to app/models/vmd.rb

diff --git a/lib/x.rb b/app/models/x.rb
similarity index 100%
rename from lib/x.rb
rename to app/models/x.rb

diff --git a/bin/load-arc_thumbs.rb b/bin/load-arc_thumbs.rb
index 965cf0b..8c68e86 100644 (file)
--- a/bin/load-arc_thumbs.rb
+++ b/bin/load-arc_thumbs.rb
@@ -1,6 +1,7 @@
 #!ruby
 # encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../app/models')
 require 'connection'
 require 'site'
 require 'arc'
@@ -12,12 +13,12 @@ def link(thumb, code)
     puts "not found arc.code: #{code}"
     return
   end
-  unless arc.thumbs.include?(thumb.key)
-    arc.thumbs.push thumb.key
+  unless arc.thumbs.include?(thumb)
+    arc.thumbs << { :key => thumb.key }
     arc.save
   end
-  unless thumb.arcs.include?(arc.key)
-    thumb.arcs.push arc.key
+  unless thumb.arcs.include?(arc)
+    thumb.arcs << { :key => arc.key }
     thumb.save
   end
 end
@@ -27,7 +28,7 @@ thumbs = Thumb.all
 thumbs.each do |thumb|
   # puts "# #{thumb.video_id}"
   sites.each do |site|
-    path_re = Regexp.new(Regexp.escape(site.site) + site.path_pattern)
+    path_re = Regexp.new(Regexp.escape(site.url) + site.path_pattern)
     if md = path_re.match(thumb.description)
       name = md[1]
       code, extname = site.generate_arc_code_and_extname(name)
@@ -36,7 +37,7 @@ thumbs.each do |thumb|
     end
 
     next unless site.locked_path_pattern
-    locked_path_re = Regexp.new(Regexp.escape(site.site) + site.locked_path_pattern)
+    locked_path_re = Regexp.new(Regexp.escape(site.url) + site.locked_path_pattern)
     if md = locked_path_re.match(thumb.description)
       name = md[1]
       code = site.generate_locked_arc_code(name)

diff --git a/bin/load-arcs-bowl.rb b/bin/load-arcs-bowl.rb
index 3fa2853..6b4c1f9 100644 (file)
--- a/bin/load-arcs-bowl.rb
+++ b/bin/load-arcs-bowl.rb
@@ -1,6 +1,7 @@
 #!ruby
 # encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../app/models')
 require 'connection'
 require 'site'
 require 'arc'

diff --git a/bin/load-arcs.rb b/bin/load-arcs.rb
index 8635959..04f5c9f 100644 (file)
--- a/bin/load-arcs.rb
+++ b/bin/load-arcs.rb
@@ -1,6 +1,7 @@
 #!ruby
 # encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../app/models')
 require 'connection'
 require 'site'
 require 'arc'

diff --git a/bin/load-sites.rb b/bin/load-sites.rb
index ab1b59b..a26f2a8 100644 (file)
--- a/bin/load-sites.rb
+++ b/bin/load-sites.rb
@@ -1,6 +1,7 @@
 #!ruby
 # encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../app/models')
 require 'connection'
 require 'site'
 

diff --git a/bin/load-thumbs.rb b/bin/load-thumbs.rb
index 47a2883..7d21a58 100644 (file)
--- a/bin/load-thumbs.rb
+++ b/bin/load-thumbs.rb
@@ -1,7 +1,10 @@
 #!ruby
 # encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../app/models')
 require 'connection'
+require 'site'
+require 'arc'
 require 'thumb'
 require 'nicovideo'
 
@@ -12,7 +15,7 @@ def nv.tag_search_and_get_thumbinfo(tag_name)
   video_ids.each do |video_id|
     puts video_id
     td = get_thumbinfo(video_id)
-    thumb = Thumb.find_or_initialize_by_video_id(td.video_id)
+    thumb = Thumb.find(td.video_id) || Thumb.new(:key => td.video_id)
     thumb.title = td.title
     thumb.description = td.description
     thumb.save