mirror of
https://github.com/mt-mods/mail.git
synced 2025-04-30 16:31:43 -04:00
Store message list in context to improve performance
They are deleted after closing formspec, and the json file is called only once
This commit is contained in:
parent
984d8c34d9
commit
fa391b5ee6
7 changed files with 39 additions and 15 deletions
7
init.lua
7
init.lua
|
@ -37,6 +37,13 @@ mail = {
|
||||||
trash_move_enable = {}
|
trash_move_enable = {}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
messages_context = {
|
||||||
|
inbox = {},
|
||||||
|
outbox = {},
|
||||||
|
drafts = {},
|
||||||
|
trash = {}
|
||||||
|
},
|
||||||
|
|
||||||
message_drafts = {}
|
message_drafts = {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,7 @@ function mail.show_drafts(name)
|
||||||
table[0,0.7;5.75,9.35;drafts;#999,]] .. S("To") .. "," .. S("Subject")
|
table[0,0.7;5.75,9.35;drafts;#999,]] .. S("To") .. "," .. S("Subject")
|
||||||
|
|
||||||
local formspec = { drafts_formspec }
|
local formspec = { drafts_formspec }
|
||||||
local entry = mail.get_storage_entry(name)
|
local messages = mail.messages_context.drafts[name]
|
||||||
local messages = entry.drafts
|
|
||||||
|
|
||||||
mail.message_drafts[name] = nil
|
mail.message_drafts[name] = nil
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
-- Getter to filter and sort messages on demand
|
-- Getter to filter and sort messages on demand
|
||||||
local function messageGetter(messages, sortfield, ascending, filter)
|
local function messageGetter(messages, sortfield, ascending, filter)
|
||||||
local results
|
local results
|
||||||
|
@ -15,15 +14,21 @@ local function nonempty(x)
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
|
-- Get player name
|
||||||
|
local name = player:get_player_name()
|
||||||
|
|
||||||
if formname ~= "mail:inbox" and formname ~= "mail:outbox"
|
if formname ~= "mail:inbox" and formname ~= "mail:outbox"
|
||||||
and formname ~= "mail:drafts" and formname ~= "mail:trash" then
|
and formname ~= "mail:drafts" and formname ~= "mail:trash" then
|
||||||
return
|
return
|
||||||
elseif fields.quit then
|
elseif fields.quit then
|
||||||
|
mail.messages_context.inbox[name] = nil
|
||||||
|
mail.messages_context.outbox[name] = nil
|
||||||
|
mail.messages_context.drafts[name] = nil
|
||||||
|
mail.messages_context.trash[name] = nil
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Get player name and handle / convert common input fields
|
-- Convert common input fields
|
||||||
local name = player:get_player_name()
|
|
||||||
local filter = (fields.search and fields.filter) or mail.selected_idxs.filter[name] or ""
|
local filter = (fields.search and fields.filter) or mail.selected_idxs.filter[name] or ""
|
||||||
local sortfieldindex = tonumber(fields.sortfield or mail.selected_idxs.sortfield[name]) or 3
|
local sortfieldindex = tonumber(fields.sortfield or mail.selected_idxs.sortfield[name]) or 3
|
||||||
local sortdirection = fields.sortdirection or mail.selected_idxs.sortdirection[name] or "1"
|
local sortdirection = fields.sortdirection or mail.selected_idxs.sortdirection[name] or "1"
|
||||||
|
@ -50,10 +55,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
|
|
||||||
-- split inbox and outbox msgs for different tests
|
-- split inbox and outbox msgs for different tests
|
||||||
local entry = mail.get_storage_entry(name)
|
local entry = mail.get_storage_entry(name)
|
||||||
local messagesDrafts = entry.drafts
|
local messagesDrafts = mail.messages_context.drafts[name]
|
||||||
local messagesTrash = entry.trash
|
local messagesTrash = mail.messages_context.trash[name]
|
||||||
local getInbox = messageGetter(entry.inbox, inboxsortfield, sortdirection == "2", filter)
|
local getInbox = messageGetter(mail.messages_context.inbox[name], inboxsortfield, sortdirection == "2", filter)
|
||||||
local getOutbox = messageGetter(entry.outbox, outboxsortfield, sortdirection == "2", filter)
|
local getOutbox = messageGetter(mail.messages_context.outbox[name], outboxsortfield, sortdirection == "2", filter)
|
||||||
|
|
||||||
-- Hanmdle formspec event
|
-- Hanmdle formspec event
|
||||||
if fields.inbox then -- inbox table
|
if fields.inbox then -- inbox table
|
||||||
|
@ -219,6 +224,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
mail.delete_mail(name, mail.selected_idxs.inbox[name])
|
mail.delete_mail(name, mail.selected_idxs.inbox[name])
|
||||||
end
|
end
|
||||||
mail.selected_idxs.inbox[name] = {}
|
mail.selected_idxs.inbox[name] = {}
|
||||||
|
mail.messages_context.inbox[name] = entry.inbox
|
||||||
elseif formname == "mail:outbox" and mail.selected_idxs.outbox[name] then -- outbox table
|
elseif formname == "mail:outbox" and mail.selected_idxs.outbox[name] then -- outbox table
|
||||||
if trash_enabled then
|
if trash_enabled then
|
||||||
mail.trash_mail(name, mail.selected_idxs.outbox[name])
|
mail.trash_mail(name, mail.selected_idxs.outbox[name])
|
||||||
|
@ -226,6 +232,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
mail.delete_mail(name, mail.selected_idxs.outbox[name])
|
mail.delete_mail(name, mail.selected_idxs.outbox[name])
|
||||||
end
|
end
|
||||||
mail.selected_idxs.outbox[name] = {}
|
mail.selected_idxs.outbox[name] = {}
|
||||||
|
mail.messages_context.outbox[name] = entry.outbox
|
||||||
elseif formname == "mail:drafts" and messagesDrafts[mail.selected_idxs.drafts[name]] then -- drafts table
|
elseif formname == "mail:drafts" and messagesDrafts[mail.selected_idxs.drafts[name]] then -- drafts table
|
||||||
if trash_enabled then
|
if trash_enabled then
|
||||||
mail.trash_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
|
mail.trash_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
|
||||||
|
@ -233,9 +240,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
mail.delete_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
|
mail.delete_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
|
||||||
end
|
end
|
||||||
mail.selected_idxs.drafts[name] = nil
|
mail.selected_idxs.drafts[name] = nil
|
||||||
|
mail.messages_context.drafts[name] = entry.drafts
|
||||||
|
|
||||||
elseif formname == "mail:trash" and messagesTrash[mail.selected_idxs.trash[name]] then -- trash table
|
elseif formname == "mail:trash" and messagesTrash[mail.selected_idxs.trash[name]] then -- trash table
|
||||||
mail.delete_mail(name, messagesTrash[mail.selected_idxs.trash[name]].id, true)
|
mail.delete_mail(name, messagesTrash[mail.selected_idxs.trash[name]].id, true)
|
||||||
|
mail.messages_context.trash[name] = entry.trash
|
||||||
end
|
end
|
||||||
|
|
||||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||||
|
@ -244,6 +253,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
if messagesTrash[mail.selected_idxs.trash[name]] then
|
if messagesTrash[mail.selected_idxs.trash[name]] then
|
||||||
mail.restore_mail(name, messagesTrash[mail.selected_idxs.trash[name]].id)
|
mail.restore_mail(name, messagesTrash[mail.selected_idxs.trash[name]].id)
|
||||||
end
|
end
|
||||||
|
-- update messages lists
|
||||||
|
mail.messages_context.inbox[name] = entry.inbox
|
||||||
|
mail.messages_context.outbox[name] = entry.outbox
|
||||||
|
mail.messages_context.drafts[name] = entry.drafts
|
||||||
|
mail.messages_context.trash[name] = entry.trash
|
||||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||||
|
|
||||||
elseif fields.reply then
|
elseif fields.reply then
|
||||||
|
|
|
@ -9,9 +9,8 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
|
||||||
filter = filter or mail.selected_idxs.filter[name] or ""
|
filter = filter or mail.selected_idxs.filter[name] or ""
|
||||||
mail.selected_idxs.inbox[name] = mail.selected_idxs.inbox[name] or {}
|
mail.selected_idxs.inbox[name] = mail.selected_idxs.inbox[name] or {}
|
||||||
|
|
||||||
local entry = mail.get_storage_entry(name)
|
|
||||||
local sortfield = ({"from","subject","time"})[sortfieldindex]
|
local sortfield = ({"from","subject","time"})[sortfieldindex]
|
||||||
local messages = mail.sort_messages(entry.inbox, sortfield, sortdirection == "2", filter)
|
local messages = mail.sort_messages(mail.messages_context.inbox[name], sortfield, sortdirection == "2", filter)
|
||||||
|
|
||||||
local trash_tab = ""
|
local trash_tab = ""
|
||||||
if mail.get_setting(name, "trash_move_enable") then
|
if mail.get_setting(name, "trash_move_enable") then
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
-- helper function for tabbed overview
|
-- helper function for tabbed overview
|
||||||
|
|
||||||
function mail.show_mail_menu(playername, sortfield, sortdirection, filter)
|
function mail.show_mail_menu(playername, sortfield, sortdirection, filter)
|
||||||
|
-- create contexts
|
||||||
|
local entry = mail.get_storage_entry(playername)
|
||||||
|
mail.messages_context.inbox[playername] = mail.messages_context.inbox[playername] or entry.inbox
|
||||||
|
mail.messages_context.outbox[playername] = mail.messages_context.outbox[playername] or entry.outbox
|
||||||
|
mail.messages_context.drafts[playername] = mail.messages_context.drafts[playername] or entry.drafts
|
||||||
|
mail.messages_context.trash[playername] = mail.messages_context.trash[playername] or entry.trash
|
||||||
|
|
||||||
local index = mail.selected_idxs.boxtab[playername] or 1
|
local index = mail.selected_idxs.boxtab[playername] or 1
|
||||||
if not mail.selected_idxs.boxtab[playername] then
|
if not mail.selected_idxs.boxtab[playername] then
|
||||||
mail.selected_idxs.boxtab[playername] = 1
|
mail.selected_idxs.boxtab[playername] = 1
|
||||||
|
|
|
@ -9,9 +9,8 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
|
||||||
filter = filter or mail.selected_idxs.filter[name] or ""
|
filter = filter or mail.selected_idxs.filter[name] or ""
|
||||||
mail.selected_idxs.outbox[name] = mail.selected_idxs.outbox[name] or {}
|
mail.selected_idxs.outbox[name] = mail.selected_idxs.outbox[name] or {}
|
||||||
|
|
||||||
local entry = mail.get_storage_entry(name)
|
|
||||||
local sortfield = ({"to","subject","time"})[sortfieldindex]
|
local sortfield = ({"to","subject","time"})[sortfieldindex]
|
||||||
local messages = mail.sort_messages(entry.outbox, sortfield, sortdirection == "2", filter)
|
local messages = mail.sort_messages(mail.messages_context.outbox[name], sortfield, sortdirection == "2", filter)
|
||||||
|
|
||||||
local trash_tab = ""
|
local trash_tab = ""
|
||||||
if mail.get_setting(name, "trash_move_enable") then
|
if mail.get_setting(name, "trash_move_enable") then
|
||||||
|
|
|
@ -20,8 +20,7 @@ local trash_formspec = "size[8.5,10;]" .. mail.theme .. [[
|
||||||
|
|
||||||
function mail.show_trash(name)
|
function mail.show_trash(name)
|
||||||
local formspec = { trash_formspec }
|
local formspec = { trash_formspec }
|
||||||
local entry = mail.get_storage_entry(name)
|
local messages = mail.messages_context.trash[name]
|
||||||
local messages = entry.trash
|
|
||||||
|
|
||||||
if messages[1] then
|
if messages[1] then
|
||||||
for _, message in ipairs(messages) do
|
for _, message in ipairs(messages) do
|
||||||
|
|
Loading…
Add table
Reference in a new issue