# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1280561554 -18000
# Node ID 32b018eeeb3b41b986e314f2a03203fdeac8d068
# Parent  b2a112720caee101f3ce9ceac4dec8749571ff6a
util.pluginloader: Fix loading of plugins, plugin libraries and resources in subfolders (e.g., when loading 'a/b', load 'a/mod_b.lua', and not 'mod_a/b.lua').

diff -r b2a112720cae -r 32b018eeeb3b util/pluginloader.lua
--- a/util/pluginloader.lua	Mon Jul 26 13:40:00 2010 +0100
+++ b/util/pluginloader.lua	Sat Jul 31 12:32:34 2010 +0500
@@ -25,16 +25,30 @@
 end
 
 function load_resource(plugin, resource, loader)
-	if not resource then
-		resource = "mod_"..plugin..".lua";
-	end
-	loader = loader or load_file;
+	local path, name = plugin:match("([^/]*)/?(.*)");
+	if name == "" then
+		if not resource then
+			resource = "mod_"..plugin..".lua";
+		end
+		loader = loader or load_file;
 
-	local content, err = loader(plugin.."/"..resource);
-	if not content then content, err = loader(resource); end
-	-- TODO add support for packed plugins
-	
-	return content, err;
+		local content, err = loader(plugin.."/"..resource);
+		if not content then content, err = loader(resource); end
+		-- TODO add support for packed plugins
+		
+		return content, err;
+	else
+		if not resource then
+			resource = "mod_"..name..".lua";
+		end
+		loader = loader or load_file;
+
+		local content, err = loader(plugin.."/"..resource);
+		if not content then content, err = loader(path.."/"..resource); end
+		-- TODO add support for packed plugins
+		
+		return content, err;
+	end
 end
 
 function load_code(plugin, resource)