sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-04-30 08:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix luacheck warnings in migrate.lua

Browse source
This commit is contained in:
Athozus 2023-03-14 12:29:28 +01:00
parent 6605b1db47
commit 8d9c1aa43f
No known key found for this signature in database
GPG key ID: B50895022E8484BF
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
migrate.lua
View file

@ -3,13 +3,12 @@ function mail.migrate()
if gen_file_v1 then if gen_file_v1 then
mail.migrate_v1_to_v2() mail.migrate_v1_to_v2()
end end
local info_file_v3 = mail.read_json_file(mail.maildir .. "/mail.info.json") local info_file_v3 = mail.read_json_file(mail.maildir .. "/mail.info.json")
if not info_file_v3.dbversion then if not info_file_v3.dbversion then
mail.migrate_v2_to_v3() mail.migrate_v2_to_v3()
end end
end end
-- migrate from mail.db to player-file-based mailbox -- migrate from mail.db to player-file-based mailbox
function mail.migrate_v1_to_v2() function mail.migrate_v1_to_v2()
@ -46,7 +45,6 @@ function mail.migrate_v2_to_v3()
end end
end) end)
mail.migrate_messages_v2_to_v3() mail.migrate_messages_v2_to_v3()
local info_file = mail.read_json_file(mail.maildir .. "/mail.info.json")
mail.write_json_file(mail.maildir .. "/mail.info.json", { dbversion = 3.0 }) mail.write_json_file(mail.maildir .. "/mail.info.json", { dbversion = 3.0 })
end end
@ -58,7 +56,8 @@ function mail.migrate_messages_v2_to_v3()
local saneplayername = string.gsub(playername, "[.|/]", "") local saneplayername = string.gsub(playername, "[.|/]", "")
local player_inbox = mail.read_json_file(mail.maildir .. "/" .. saneplayername .. ".json") local player_inbox = mail.read_json_file(mail.maildir .. "/" .. saneplayername .. ".json")
for _, msg in ipairs(player_inbox) do for _, msg in ipairs(player_inbox) do
local msg_id = tostring(msg.time) .. msg.sender -- id like "123456789.0singleplayer" -- it presumes that a same sender cannot send two mails within a second -- id like "123456789.0singleplayer" -- it presumes that a same sender cannot send two mails within a second
local msg_id = tostring(msg.time) .. msg.sender
local new_msg = true -- check if that mail was already processed with another player local new_msg = true -- check if that mail was already processed with another player
for _, cur_id in ipairs(already_processed) do for _, cur_id in ipairs(already_processed) do
if cur_id == msg_id then if cur_id == msg_id then
@ -87,13 +86,12 @@ end
function mail.migrate_contacts(playername) function mail.migrate_contacts(playername)
local gen_file_v1 = io.open(minetest.get_worldpath().."/mail.db", "r") local gen_file_v1 = io.open(minetest.get_worldpath().."/mail.db", "r")
if gen_file_v1 then if gen_file_v1 then
mail.migrate_contacts_v1_to_v2() mail.migrate_contacts_v1_to_v2(playername)
end end
-- v2 to v3 directly in general function -- v2 to v3 directly in general function
end end
function mail.migrate_contacts_v1_to_v2(playername) function mail.migrate_contacts_v1_to_v2(playername)
local file = io.open(mail.getContactsFile(playername), 'r') local file = io.open(mail.getContactsFile(playername), 'r')
if not file then if not file then
@ -119,7 +117,7 @@ end
function mail.migrate_contacts_v2_to_v3(playername) function mail.migrate_contacts_v2_to_v3(playername)
local player_contacts = mail.read_json_file(mail.maildir .. "/contacts/" .. playername .. ".json") local player_contacts = mail.read_json_file(mail.maildir .. "/contacts/" .. playername .. ".json")
for _, c in pairs(player_contacts) do for _, c in pairs(player_contacts) do
mail.addContact(playername, { name = c.name, note = c.note }) mail.addContact(playername, { name = c.name, note = c.note })
end end