サードパーティスキン refs #722

1 files changed, 33 insertions, 6 deletions

diff --git a/core/skin.rb b/core/skin.rb
index e352029c..4686fd7b 100644
--- a/core/skin.rb
+++ b/core/skin.rb
@@ -1,15 +1,42 @@
 # -*- coding: utf-8 -*-
 
+miquire :core, "userconfig"
+
 class Skin
+  SKIN_ROOT = File.join(CHIConfig::CONFROOT, "skin")
+  USER_SKIN = if :vanilla == UserConfig[:skin_dir]
+                nil
+              else
+                UserConfig[:skin_dir] end
+
+  def self.default_dir
+    File.join(*[File.dirname(__FILE__), "skin", "data"].flatten)
+  end
 
-  def self.get(filename)
-    fn = File.join(*[path, filename].flatten)
-    return Skin.get('notfound.png') if 'notfound.png' != filename and not FileTest.exist?(fn)
-    fn
+  def self.default_image
+    File.join(default_dir, "notfound.png")
   end
 
-  def self.path
-    [File.dirname(__FILE__), "skin", "data"]
+  def self.user_dir
+    if USER_SKIN
+      p [SKIN_ROOT, USER_SKIN]
+      File.join(SKIN_ROOT, USER_SKIN)
+    else
+      nil
+    end
   end
 
+  def self.get(filename, default = default_image)
+    valid_path = [ user_dir, default_dir ].compact.map { |_|
+      File.join(_, filename)
+    }.select { |_|
+      FileTest.exist?(_)
+    }.first
+
+    if valid_path
+      valid_path
+    else
+      default
+    end
+  end
 end