# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1602254235 -7200
# Node ID 1dc49accb58e9fcfcd680b5ac500acb547fe6877
# Parent  82d6c8e627b9f37b090cf7ed0d2d32acbf47f16d
core.moduleapi: Return resource path from module:get_directory() (API BC)

:get_directory has so far returned the base directory of the current
module source code. This has worked well so far to load resources which
tend to be included in the same directory, but with the plugin installer
using LuaRocks, extra resources (e.g. templates and other assets) these
are saved in a completely different directory.

In be73df6765b9 core.modulemanager gained some code for finding that
directory and saving it in module.resource_path but now the question is
how this should be reflected in the API.

A survey of community modules suggest the vast majority use the
:get_directory method for locating templates and other assets, rather
than the code (which would use module:require instead).

Therefore this commit changes :get_directory to return the resource_path
when available. This should work for most modules.

diff -r 82d6c8e627b9 -r 1dc49accb58e core/moduleapi.lua
--- a/core/moduleapi.lua	Wed Oct 07 22:54:12 2020 +0200
+++ b/core/moduleapi.lua	Fri Oct 09 16:37:15 2020 +0200
@@ -496,11 +496,11 @@
 
 local path_sep = package.config:sub(1,1);
 function api:get_directory()
-	return self.path and (self.path:gsub("%"..path_sep.."[^"..path_sep.."]*$", "")) or nil;
+	return self.resource_path or self.path and (self.path:gsub("%"..path_sep.."[^"..path_sep.."]*$", "")) or nil;
 end
 
 function api:load_resource(path, mode)
-	path = resolve_relative_path(self.resource_path or self:get_directory(), path);
+	path = resolve_relative_path(self:get_directory(), path);
 	return io.open(path, mode);
 end