t#30328:create op import ...and pull

[pettanr/pettanr.git] / app / models / resource_picture.rb

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index a7054f3..edc43be 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -11,12 +11,12 @@ class ResourcePicture < ActiveRecord::Base
   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 => {:minimum => 32, :maximum => 32}
-  validates :artist_id, :presence => true, :numericality => true, :existence => true
-  validates :license_id, :presence => true, :numericality => true, :existence => true
-  validates :original_picture_id, :presence => true, :numericality => true, :existence => true
+  validates :artist_id, :presence => true, :numericality => true, :existence => {:both => false}
+  validates :license_id, :presence => true, :numericality => true, :existence => {:both => false}
+  validates :original_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :artist_name, :presence => true
   validates :classname, :presence => true, :length => {:maximum => 50}
-  validates :picture_id, :presence => true, :numericality => true, :existence => true
+  validates :picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   
   def supply_default
   end
@@ -115,6 +115,14 @@ class ResourcePicture < ActiveRecord::Base
     {:include => {:license => {}, :artist => {}, :picture => {}} }
   end
   
+  def self.mylist ar, page = 1, page_size = Author.default_resource_picture_page_size
+    opt = {}
+    opt.merge!(ResourcePicture.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:conditions => ['resource_pictures.artist_id = ?', ar.id], :order => 'resource_pictures.updated_at desc'})
+    ResourcePicture.find(:all, opt)
+  end
+  
   def self.show rid, au
     opt = {}
     opt.merge!(self.show_opt)
@@ -145,7 +153,7 @@ class ResourcePicture < ActiveRecord::Base
     pc.overwrite self
     r = pc.store imager
     return pc if r
-    self.errors.add :base, 'picture does not create' + pc.errors.full_messages.join("\n")
+    self.errors.add :base, Picture.model_name.human + I18n.t('errors.not_create')
     false
   end
   
@@ -171,14 +179,17 @@ class ResourcePicture < ActiveRecord::Base
     if res = self.store_picture(imager, self.filename)
       if self.to_gif?
         if gifimager = imager.to_gif
-          res = self.store_picture(gifimager, self.gifname)
+          if res = self.store_picture(gifimager, self.gifname)
+          else
+            self.errors.add :base, I18n.t('picture_io.error')
+          end
         else
-          self.errors.add :base, 'picture data can not conv to gif'
+          self.errors.add :base, I18n.t('errors.not_convert')
           res = false
         end
       end
     else
-      self.errors.add :base, 'resource picture io does not work'
+      self.errors.add :base, I18n.t('picture_io.error')
     end
     res
   end
@@ -187,9 +198,14 @@ class ResourcePicture < ActiveRecord::Base
     res = false
     thumbnail_imager = self.flag_thumbnail >= 0 ? imager.to_thumbnail : imager
     return false unless thumbnail_imager
-    return false unless PictureIO.resource_picture_io.put(thumbnail_imager.binary, fn)
-    return false unless PictureIO.resource_picture_io.put(imager.binary, fn, 'full')
-    true
+    begin
+      PictureIO.resource_picture_io.put(thumbnail_imager.binary, fn)
+      PictureIO.resource_picture_io.put(imager.binary, fn, 'full')
+      res = true
+    rescue PictureIO::Error
+      res = false
+    end
+    res
   end
   
   def restore(subdir = nil)
@@ -197,13 +213,19 @@ class ResourcePicture < ActiveRecord::Base
   end
   
   def unpublish
-    r = true
+    res = false
     ResourcePicture.transaction do
-      self.destroy
-      PictureIO.resource_picture_io.delete(self.filename)
-      PictureIO.resource_picture_io.delete(self.filename, 'full')
+      begin
+        PictureIO.resource_picture_io.delete(self.filename) if PictureIO.resource_picture_io.exist?(self.filename)
+        PictureIO.resource_picture_io.delete(self.filename, 'full') if PictureIO.resource_picture_io.exist?(self.filename, 'full')
+      rescue PictureIO::Error
+        res = false
+        raise ActiveRecord::Rollback
+      end
+      res = self.destroy
+      raise ActiveRecord::Rollback unless res
     end
-    r
+    res
   end
   
   def self.visible_count