storagemanager, datamanager, mod_storage_{internal,sql}: Replace list_stores() with an iterator version

4 files changed, 43 insertions, 34 deletions

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index a9759b6a..29cad2ff 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -119,8 +119,8 @@ end
 function datamanager.store(username, host, datastore, data)
 	return open(host, datastore):set(username, data);
 end
-function datamanager.list_stores(username, host)
-	return get_driver(host):list_stores(username);
+function datamanager.stores(username, host, typ)
+	return get_driver(host):stores(username, typ);
 end
 function datamanager.purge(username, host)
 	return purge(username);
diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
index 92ac3ef5..d8fdfc6f 100644
--- a/plugins/mod_storage_internal.lua
+++ b/plugins/mod_storage_internal.lua
@@ -16,8 +16,8 @@ function driver:set(user, data)
 	return datamanager.store(user, host, self.store, data);
 end
 
-function driver:list_stores(username)
-	return datamanager.list_stores(username, host);
+function driver:stores(username)
+	return datamanager.stores(username, host);
 end
 
 function driver:purge(user)
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index ea25c90b..5a08598a 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -374,10 +374,9 @@ function driver:open(store, typ)
 	return nil, "unsupported-store";
 end
 
-function driver:list_stores(username) -- Not to be confused with the list store type
-	local sql = (username == true
-		and "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`!=?"
-		or  "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`=?");
+function driver:stores(username) -- Not to be confused with the list store type
+	local sql = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" ..
+		(username == true and "!=?" or "=?");
 	if username == true or not username then
 		username = "";
 	end
@@ -385,11 +384,11 @@ function driver:list_stores(username) -- Not to be confused with the list store
 	if not stmt then
 		return rollback(nil, err);
 	end
-	local stores = {};
-	for row in stmt:rows() do
-		stores[#stores+1] = row[1];
-	end
-	return commit(stores);
+	local next = stmt:rows();
+	return commit(function()
+		local row = next();
+		return row and row[1];
+	end);
 end
 
 function driver:purge(username)
diff --git a/util/datamanager.lua b/util/datamanager.lua
index e6ad86db..9207f555 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -277,31 +277,41 @@ function list_load(username, host, datastore)
 	return items;
 end
 
-function list_stores(username, host)
-	if not host then
-		return nil, "bad argument #2 to 'list_stores' (string expected, got nothing)";
+local type_map = {
+	keyval = "dat";
+	list = "list";
+}
+
+function stores(username, host, typ)
+	typ = type_map[typ or "keyval"];
+	local store_dir = format("%s/%s/", data_path, encode(host));
+
+	local mode, err = lfs.attributes(store_dir, "mode");
+	if not mode then
+		return function() log("debug", err or (store_dir .. " does not exist")) end
 	end
-	local list = {};
-	local host_dir = format("%s/%s/", data_path, encode(host));
-	for node in lfs.dir(host_dir) do
-		if not node:match"^%." then -- dots should be encoded, this is probably . or ..
-			local store = decode(node);
-			local path = host_dir..node;
-			if username == true then
-				if lfs.attributes(path, "mode") == "directory" then
-					list[#list+1] = store;
-				end
-			elseif username then
-				if lfs.attributes(getpath(username, host, store), "mode")
-					or lfs.attributes(getpath(username, host, store, "list"), "mode") then
-					list[#list+1] = store;
+	local next, state = lfs.dir(store_dir);
+	return function(state)
+		for node in next, state do
+			if not node:match"^%." then
+				if username == true then
+					if lfs.attributes(store_dir..node, "mode") == "directory" then
+						return decode(node);
+					end
+				elseif username then
+					local store = decode(node)
+					if lfs.attributes(getpath(username, host, store, typ), "mode") then
+						return store;
+					end
+				elseif lfs.attributes(node, "mode") == "file" then
+					local file, ext = node:match("^(.*)%.([dalist]+)$");
+					if ext == typ then
+						return decode(file)
+					end
 				end
-			elseif lfs.attributes(path, "mode") == "file" then
-				list[#list+1] = store:gsub("%.[dalist]+$","");
 			end
 		end
-	end
-	return list;
+	end, state;
 end
 
 local function do_remove(path)