Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / lib / local_picture.rb

diff --git a/lib/local_picture.rb b/lib/local_picture.rb
index daaf866..bdaf976 100644 (file)
--- a/lib/local_picture.rb
+++ b/lib/local_picture.rb
@@ -13,10 +13,6 @@ class PictureIO
       @base = b
     end
     
-    def self.subdirs
-      ['', 'v', 'h', 'vh', 'thumbnail']
-    end
-    
     def dir(subdir = nil)
       sd = if subdir.to_s.empty?
         self.base
@@ -37,7 +33,7 @@ class PictureIO
       begin
         res = File.exist?(dir(subdir) + filename)
       rescue
-        res = false
+        raise PictureIO::Error
       end
       res
     end
@@ -50,7 +46,7 @@ class PictureIO
           f.write bindata
         end
       rescue
-        res = false
+        raise PictureIO::Error
       end
       res
     end
@@ -62,7 +58,7 @@ class PictureIO
           bindata += f.read
         end
       rescue
-        bindata = false
+        raise PictureIO::Error
       end
       bindata
     end
@@ -72,7 +68,7 @@ class PictureIO
       begin
         File.delete(dir(subdir) + filename)
       rescue
-        res = false
+        raise PictureIO::Error
       end
       res
     end