X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fsystem_picture.rb;h=b0d85324eea1c51a372bb279c53ace30bc07221a;hb=a0e7869980e9d497d325fddc7d4f5a3feea56738;hp=ccfe6af290b04f4153299efbec21f4cd44ed9618;hpb=c7216b685d62319f15e1cb982a0cfc50274ba043;p=pettanr%2Fpettanr.git

diff --git a/app/models/system_picture.rb b/app/models/system_picture.rb
index ccfe6af2..b0d85324 100644
--- a/app/models/system_picture.rb
+++ b/app/models/system_picture.rb
@@ -7,7 +7,7 @@ class SystemPicture < ActiveRecord::Base
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :filesize, :presence => true, :numericality => {:greater_than => 0, :less_than_or_equal_to => 2000000}, :natural_number => true
-  validates :md5, :presence => true, :length => {:maximum => 32}
+  validates :md5, :presence => true, :length => {:minimum => 32, :maximum => 32}
   
   before_destroy :destroy_with_file
   
@@ -15,53 +15,108 @@ class SystemPicture < ActiveRecord::Base
     PictureIO.system_picture_io.delete self.filename
   end
   
-  def dext
-    self.ext.downcase
+  def supply_default
+  end
+  
+  def overwrite
+  end
+  
+  def own? ad
+    true
+  end
+  
+  def visible? ad
+    true
   end
   
   def filename
-    "#{self.id}.#{self.dext}"
+    "#{self.id}.#{self.ext}"
   end
   
   def mime_type
-    "image/#{self.dext}"
+    "image/#{self.ext}"
   end
   
   def url
     '/system_pictures/' + filename
   end
   
-  def data_to_mgk picture_data
-    begin
-      mgk = Magick::Image.from_blob(picture_data).shift
-    rescue 
-      self.errors.add :base, 'magick failed'
-      return false
-    end
-    mgk
+  def self.default_page_size
+    25
   end
   
-  def store(picture_data)
-    mgk = data_to_mgk picture_data
-    return false unless mgk
+  def self.max_page_size
+    100
+  end
+  
+  def self.page prm = nil
+    page = prm.to_i
+    page = 1 if page < 1
+    page
+  end
+  
+  def self.page_size prm = self.default_page_size
+    page_size = prm.to_i
+    page_size = self.max_page_size if page_size > self.max_page_size
+    page_size = self.default_page_size if page_size < 1
+    page_size
+  end
+  
+  def self.list page = 1, page_size = self.default_page_size
+    opt = {}
+    opt.merge!(self.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:order => 'system_pictures.updated_at desc'})
+    SystemPicture.find(:all, opt)
+  end
+  
+  def self.list_opt
+    {}
+  end
+  
+  def self.list_json_opt
+    {}
+  end
+  
+  def self.show sid, ad
+    opt = {}
+    opt.merge!(self.show_opt)
+    res = SystemPicture.find(sid, opt)
+    raise ActiveRecord::Forbidden unless res.visible?(ad)
+    res
+  end
+  
+  def self.show_opt
+    {}
+  end
+  
+  def self.show_json_opt
+    {}
+  end
+  
+  def store(imager)
+    unless imager
+      self.errors.add :base, 'illegal picture data'
+      return false
+    end
     res = false
-    self.attributes = {:ext => mgk.format.downcase, :width => mgk.columns, :height => mgk.rows, 
-      :filesize => mgk.filesize
-    }
-    self.md5 = Digest::MD5.hexdigest(picture_data)
     SystemPicture.transaction do
       if res = self.save
-        res = PictureIO.system_picture_io.put(picture_data, self.filename)
+        if res = PictureIO.system_picture_io.put(imager.binary, self.filename)
+          res = true
+        else
+          self.errors.add :base, 'system picture io does not work'
+          raise ActiveRecord::Rollback
+        end
       end
     end
     res
   end
   
-  def self.store(picture_data)
-    md5 = Digest::MD5.hexdigest(picture_data)
-    sp = SystemPicture.find_by_md5(md5)
-    sp = SystemPicture.new() unless sp
-    res = sp.store picture_data
+  def self.store(imager)
+    attr = {:ext => imager.ext, :width => imager.width, :height => imager.height, :filesize => imager.filesize, :md5 => imager.md5}
+    sp = SystemPicture.modify_object(imager.md5, attr, 'md5')
+    res = sp.store imager
     res ? sp : nil
   end