-- Update the cached supported proto info,
-- it may have changed after a change by the settings menu.
common_update_cached_supp_proto()
-
- local render_details = core.is_yes(core.setting_getbool("public_serverlist"))
-
- local retval =
- "label[7.75,-0.15;" .. fgettext("Address / Port :") .. "]" ..
- "label[7.75,1.05;" .. fgettext("Name / Password :") .. "]" ..
- "field[8,0.75;3.4,0.5;te_address;;" ..
- core.formspec_escape(core.setting_get("address")) .. "]" ..
- "field[11.25,0.75;1.3,0.5;te_port;;" ..
- core.formspec_escape(core.setting_get("remote_port")) .. "]" ..
- "checkbox[0,4.85;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" ..
- dump(core.setting_getbool("public_serverlist")) .. "]"
-
- if not core.setting_getbool("public_serverlist") then
- retval = retval ..
- "button[8,4.9;2,0.5;btn_delete_favorite;" .. fgettext("Delete") .. "]"
+ local fav_selected = nil
+ if menudata.search_result then
+ fav_selected = menudata.search_result[tabdata.fav_selected]
+ else
+ fav_selected = menudata.favorites[tabdata.fav_selected]
end
- retval = retval ..
- "button[10,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" ..
- "field[8,1.95;2.95,0.5;te_name;;" ..
- core.formspec_escape(core.setting_get("name")) .. "]" ..
- "pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" ..
- "box[7.73,2.35;4.3,2.28;#999999]" ..
- "textarea[8.1,2.4;4.26,2.6;;"
-
- if tabdata.fav_selected ~= nil and
- menudata.favorites[tabdata.fav_selected] ~= nil and
- menudata.favorites[tabdata.fav_selected].description ~= nil then
- retval = retval ..
- core.formspec_escape(menudata.favorites[tabdata.fav_selected].description,true)
+ if not tabdata.search_for then
+ tabdata.search_for = ""
end
- retval = retval ..
- ";]"
+ local retval =
+ -- Search
+ "field[0.15,0.35;6.05,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
+ "button[5.8,0.1;2,0.1;btn_mp_search;" .. fgettext("Search") .. "]" ..
+
+ -- Address / Port
+ "label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" ..
+ "field[8,0.65;3.25,0.5;te_address;;" ..
+ core.formspec_escape(core.settings:get("address")) .. "]" ..
+ "field[11.1,0.65;1.4,0.5;te_port;;" ..
+ core.formspec_escape(core.settings:get("remote_port")) .. "]" ..
+
+ -- Name / Password
+ "label[7.75,0.95;" .. fgettext("Name / Password") .. "]" ..
+ "field[8,1.85;2.9,0.5;te_name;;" ..
+ core.formspec_escape(core.settings:get("name")) .. "]" ..
+ "pwdfield[10.73,1.85;1.77,0.5;te_pwd;]" ..
+
+ -- Description Background
+ "box[7.73,2.25;4.25,2.6;#999999]"..
+
+ -- Connect
+ "button[10.1,5.15;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
+
+ if tabdata.fav_selected and fav_selected then
+ if gamedata.fav then
+ retval = retval .. "button[7.75,5.15;2.3,0.5;btn_delete_favorite;" ..
+ fgettext("Del. Favorite") .. "]"
+ end
+ if fav_selected.description then
+ retval = retval .. "textarea[8.1,2.3;4.23,2.9;;" ..
+ core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]"
+ end
+ end
--favourites
- if render_details then
- retval = retval .. "tablecolumns[" ..
- "color,span=3;" ..
- "text,align=right;" .. -- clients
- "text,align=center,padding=0.25;" .. -- "/"
- "text,align=right,padding=0.25;" .. -- clients_max
- image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
- image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
- image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
- "color,span=1;" ..
- "text,padding=1]" -- name
- else
- retval = retval .. "tablecolumns[text]"
- end
- retval = retval ..
- "table[-0.15,-0.1;7.75,5;favourites;"
+ retval = retval .. "tablecolumns[" ..
+ image_column(fgettext("Favorite"), "favorite") .. ";" ..
+ image_column(fgettext("Ping")) .. ",padding=0.25;" ..
+ "color,span=3;" ..
+ "text,align=right;" .. -- clients
+ "text,align=center,padding=0.25;" .. -- "/"
+ "text,align=right,padding=0.25;" .. -- clients_max
+ image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
+ image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+ image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
+ "color,span=1;" ..
+ "text,padding=1]" ..
+ "table[-0.15,0.6;7.75,5.15;favourites;"
+
+ if menudata.search_result then
+ for i = 1, #menudata.search_result do
+ local favs = core.get_favorites("local")
+ local server = menudata.search_result[i]
+
+ for fav_id = 1, #favs do
+ if server.address == favs[fav_id].address and
+ server.port == favs[fav_id].port then
+ server.is_favorite = true
+ end
+ end
- if #menudata.favorites > 0 then
- retval = retval .. render_favorite(menudata.favorites[1],render_details)
+ if i ~= 1 then
+ retval = retval .. ","
+ end
- for i=2,#menudata.favorites,1 do
- retval = retval .. "," .. render_favorite(menudata.favorites[i],render_details)
+ retval = retval .. render_serverlist_row(server, server.is_favorite)
+ end
+ elseif #menudata.favorites > 0 then
+ local favs = core.get_favorites("local")
+ if #favs > 0 then
+ for i = 1, #favs do
+ for j = 1, #menudata.favorites do
+ if menudata.favorites[j].address == favs[i].address and
+ menudata.favorites[j].port == favs[i].port then
+ table.insert(menudata.favorites, i, table.remove(menudata.favorites, j))
+ end
+ end
+ if favs[i].address ~= menudata.favorites[i].address then
+ table.insert(menudata.favorites, i, favs[i])
+ end
+ end
+ end
+ retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
+ for i = 2, #menudata.favorites do
+ retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
end
end
- if tabdata.fav_selected ~= nil then
+ if tabdata.fav_selected then
retval = retval .. ";" .. tabdata.fav_selected .. "]"
else
retval = retval .. ";0]"
--------------------------------------------------------------------------------
local function main_button_handler(tabview, fields, name, tabdata)
- if fields["te_name"] ~= nil then
- gamedata.playername = fields["te_name"]
- core.setting_set("name", fields["te_name"])
+ local serverlist = menudata.search_result or menudata.favorites
+
+ if fields.te_name then
+ gamedata.playername = fields.te_name
+ core.settings:set("name", fields.te_name)
end
- if fields["favourites"] ~= nil then
- local event = core.explode_table_event(fields["favourites"])
+ if fields.favourites then
+ local event = core.explode_table_event(fields.favourites)
+ local fav = serverlist[event.row]
+
if event.type == "DCL" then
- if event.row <= #menudata.favorites then
- if not is_server_protocol_compat_or_error(menudata.favorites[event.row].proto_min,
- menudata.favorites[event.row].proto_max) then
+ if event.row <= #serverlist then
+ if menudata.favorites_is_public and
+ not is_server_protocol_compat_or_error(
+ fav.proto_min, fav.proto_max) then
return true
end
- gamedata.address = menudata.favorites[event.row].address
- gamedata.port = menudata.favorites[event.row].port
- gamedata.playername = fields["te_name"]
- if fields["te_pwd"] ~= nil then
- gamedata.password = fields["te_pwd"]
- end
+
+ gamedata.address = fav.address
+ gamedata.port = fav.port
+ gamedata.playername = fields.te_name
gamedata.selected_world = 0
- if menudata.favorites ~= nil then
- gamedata.servername = menudata.favorites[event.row].name
- gamedata.serverdescription = menudata.favorites[event.row].description
+ if fields.te_pwd then
+ gamedata.password = fields.te_pwd
end
- if gamedata.address ~= nil and
- gamedata.port ~= nil then
- core.setting_set("address",gamedata.address)
- core.setting_set("remote_port",gamedata.port)
+ gamedata.servername = fav.name
+ gamedata.serverdescription = fav.description
+
+ if gamedata.address and gamedata.port then
+ core.settings:set("address", gamedata.address)
+ core.settings:set("remote_port", gamedata.port)
core.start()
end
end
end
if event.type == "CHG" then
- if event.row <= #menudata.favorites then
- local address = menudata.favorites[event.row].address
- local port = menudata.favorites[event.row].port
-
- if address ~= nil and
- port ~= nil then
- core.setting_set("address",address)
- core.setting_set("remote_port",port)
+ if event.row <= #serverlist then
+ gamedata.fav = false
+ local favs = core.get_favorites("local")
+ local address = fav.address
+ local port = fav.port
+ gamedata.serverdescription = fav.description
+
+ for i = 1, #favs do
+ if fav.address == favs[i].address and
+ fav.port == favs[i].port then
+ gamedata.fav = true
+ end
end
+ if address and port then
+ core.settings:set("address", address)
+ core.settings:set("remote_port", port)
+ end
tabdata.fav_selected = event.row
end
-
return true
end
end
- if fields["key_up"] ~= nil or
- fields["key_down"] ~= nil then
-
+ if fields.key_up or fields.key_down then
local fav_idx = core.get_table_index("favourites")
+ local fav = serverlist[fav_idx]
- if fav_idx ~= nil then
- if fields["key_up"] ~= nil and fav_idx > 1 then
- fav_idx = fav_idx -1
- else if fields["key_down"] and fav_idx < #menudata.favorites then
- fav_idx = fav_idx +1
- end end
+ if fav_idx then
+ if fields.key_up and fav_idx > 1 then
+ fav_idx = fav_idx - 1
+ elseif fields.key_down and fav_idx < #menudata.favorites then
+ fav_idx = fav_idx + 1
+ end
else
fav_idx = 1
end
-
- if menudata.favorites == nil or
- menudata.favorites[fav_idx] == nil then
+
+ if not menudata.favorites or not fav then
tabdata.fav_selected = 0
return true
end
-
- local address = menudata.favorites[fav_idx].address
- local port = menudata.favorites[fav_idx].port
-
- if address ~= nil and
- port ~= nil then
- core.setting_set("address",address)
- core.setting_set("remote_port",port)
+
+ local address = fav.address
+ local port = fav.port
+ gamedata.serverdescription = fav.description
+ if address and port then
+ core.settings:set("address", address)
+ core.settings:set("remote_port", port)
end
tabdata.fav_selected = fav_idx
return true
end
- if fields["cb_public_serverlist"] ~= nil then
- core.setting_set("public_serverlist", fields["cb_public_serverlist"])
+ if fields.btn_delete_favorite then
+ local current_favourite = core.get_table_index("favourites")
+ if not current_favourite then return end
- if core.setting_getbool("public_serverlist") then
- asyncOnlineFavourites()
- else
- menudata.favorites = core.get_favorites("local")
- end
+ core.delete_favorite(current_favourite)
+ asyncOnlineFavourites()
tabdata.fav_selected = nil
+
+ core.settings:set("address", "")
+ core.settings:set("remote_port", "30000")
return true
end
- if fields["btn_delete_favorite"] ~= nil then
- local current_favourite = core.get_table_index("favourites")
- if current_favourite == nil then return end
- core.delete_favorite(current_favourite)
- menudata.favorites = order_favorite_list(core.get_favorites())
- tabdata.fav_selected = nil
+ if fields.btn_mp_search or fields.key_enter_field == "te_search" then
+ tabdata.fav_selected = 1
+ local input = fields.te_search:lower()
+ tabdata.search_for = fields.te_search
- core.setting_set("address","")
- core.setting_set("remote_port","30000")
+ if #menudata.favorites < 2 then
+ return true
+ end
- return true
- end
+ menudata.search_result = {}
+
+ -- setup the keyword list
+ local keywords = {}
+ for word in input:gmatch("%S+") do
+ table.insert(keywords, word)
+ end
+
+ if #keywords == 0 then
+ menudata.search_result = nil
+ return true
+ end
- if (fields["btn_mp_connect"] ~= nil or
- fields["key_enter"] ~= nil) and fields["te_address"] ~= nil and
- fields["te_port"] ~= nil then
+ -- Search the serverlist
+ local search_result = {}
+ for i = 1, #menudata.favorites do
+ local server = menudata.favorites[i]
+ local found = 0
+ for k = 1, #keywords do
+ local keyword = keywords[k]
+ if server.name then
+ local name = server.name:lower()
+ local _, count = name:gsub(keyword, keyword)
+ found = found + count * 4
+ end
- gamedata.playername = fields["te_name"]
- gamedata.password = fields["te_pwd"]
- gamedata.address = fields["te_address"]
- gamedata.port = fields["te_port"]
+ if server.description then
+ local desc = server.description:lower()
+ local _, count = desc:gsub(keyword, keyword)
+ found = found + count * 2
+ end
+ end
+ if found > 0 then
+ local points = (#menudata.favorites - i) / 5 + found
+ server.points = points
+ table.insert(search_result, server)
+ end
+ end
+ if #search_result > 0 then
+ table.sort(search_result, function(a, b)
+ return a.points > b.points
+ end)
+ menudata.search_result = search_result
+ local first_server = search_result[1]
+ core.settings:set("address", first_server.address)
+ core.settings:set("remote_port", first_server.port)
+ end
+ return true
+ end
+ if (fields.btn_mp_connect or fields.key_enter)
+ and fields.te_address ~= "" and fields.te_port then
+ gamedata.playername = fields.te_name
+ gamedata.password = fields.te_pwd
+ gamedata.address = fields.te_address
+ gamedata.port = fields.te_port
+ gamedata.selected_world = 0
local fav_idx = core.get_table_index("favourites")
+ local fav = serverlist[fav_idx]
- if fav_idx ~= nil and fav_idx <= #menudata.favorites and
- menudata.favorites[fav_idx].address == fields["te_address"] and
- menudata.favorites[fav_idx].port == fields["te_port"] then
+ if fav_idx and fav_idx <= #serverlist and
+ fav.address == fields.te_address and
+ fav.port == fields.te_port then
- gamedata.servername = menudata.favorites[fav_idx].name
- gamedata.serverdescription = menudata.favorites[fav_idx].description
+ gamedata.servername = fav.name
+ gamedata.serverdescription = fav.description
- if not is_server_protocol_compat_or_error(menudata.favorites[fav_idx].proto_min,
- menudata.favorites[fav_idx].proto_max)then
+ if menudata.favorites_is_public and
+ not is_server_protocol_compat_or_error(
+ fav.proto_min, fav.proto_max) then
return true
end
else
gamedata.serverdescription = ""
end
- gamedata.selected_world = 0
-
- core.setting_set("address", fields["te_address"])
- core.setting_set("remote_port",fields["te_port"])
+ core.settings:set("address", fields.te_address)
+ core.settings:set("remote_port", fields.te_port)
core.start()
return true
return false
end
-local function on_change(type,old_tab,new_tab)
- if type == "LEAVE" then
- return
- end
- if core.setting_getbool("public_serverlist") then
- asyncOnlineFavourites()
- else
- menudata.favorites = core.get_favorites("local")
- end
+local function on_change(type, old_tab, new_tab)
+ if type == "LEAVE" then return end
+ asyncOnlineFavourites()
end
--------------------------------------------------------------------------------
projects / oweals / minetest.git / blobdiff