# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1614186732 -3600
# Node ID 203f0f06d7666904bdd74c7cb5cb36035bcea232
# Parent  6844733ad2f59d82fddf24b6317051a595862e64
mod_migrate_http_upload: Respect the 'http_upload_path' setting

diff -r 6844733ad2f5 -r 203f0f06d766 mod_migrate_http_upload/mod_migrate_http_upload.lua
--- a/mod_migrate_http_upload/mod_migrate_http_upload.lua	Wed Feb 24 16:57:28 2021 +0100
+++ b/mod_migrate_http_upload/mod_migrate_http_upload.lua	Wed Feb 24 18:12:12 2021 +0100
@@ -18,6 +18,8 @@
 
 	local new_uploads = sm.open(component, "uploads", "archive");
 
+	local legacy_storage_path = module:context(component):get_option_string("http_upload_path", paths.join(prosody.paths.data, "http_upload"));
+
 	local legacy_uploads = {};
 	for user in assert(dm.users(user_host, "http_upload", "list")) do
 		legacy_uploads[user] = dm.list_load(user, user_host, "http_upload");
@@ -31,8 +33,8 @@
 		end
 		if not oldest_uploads then break end
 		local item = table.remove(oldest_uploads, 1);
-		local source_directory = paths.join(prosody.paths.data, "http_upload", item.dir);
-		local source_filename = paths.join(prosody.paths.data, "http_upload", item.dir, item.filename);
+		local source_directory = paths.join(legacy_storage_path, item.dir);
+		local source_filename = paths.join(source_directory, item.dir, item.filename);
 		local target_filename = dm.getpath(item.dir, component, "http_file_share", "bin", true);
 		if not lfs.attributes(source_filename, "mode") then
 			print("Not migrating missing file " .. source_filename);