Skip to content

Commit f3bd4c4

Browse files
red-001sofar
red-001
authored and
sofar
committedJan 15, 2017
Add keyword based search to serverlist
·
5.11.00.4.16
1 parent f5070b4 commit f3bd4c4

8 files changed

+113
-23
lines changed
 

Diff for: ‎builtin/mainmenu/common.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function order_favorite_list(list)
7777
end
7878

7979
--------------------------------------------------------------------------------
80-
function render_favorite(spec, is_favorite)
80+
function render_serverlist_row(spec, is_favorite)
8181
local text = ""
8282
if spec.name then
8383
text = text .. core.formspec_escape(spec.name:trim())

Diff for: ‎builtin/mainmenu/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ local function init_globals()
128128
end
129129

130130
-- Create main tabview
131-
local tv_main = tabview_create("maintab", {x = 12, y = 5.2}, {x = 0, y = 0})
131+
local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
132132

133133
if PLATFORM == "Android" then
134134
tv_main:add(tabs.simple_main)

Diff for: ‎builtin/mainmenu/tab_credits.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ return {
8585
"label[0.5,3.5;http://minetest.net]" ..
8686
"tablecolumns[color;text]" ..
8787
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
88-
"table[3.5,-0.25;8.5,5.8;list_credits;" ..
88+
"table[3.5,-0.25;8.5,6.05;list_credits;" ..
8989
"#FFFF00," .. fgettext("Core Developers") .. ",," ..
9090
table.concat(core_developers, ",,") .. ",,," ..
9191
"#FFFF00," .. fgettext("Active Contributors") .. ",," ..

Diff for: ‎builtin/mainmenu/tab_multiplayer.lua

+103-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ local function get_formspec(tabview, name, tabdata)
2020
-- Update the cached supported proto info,
2121
-- it may have changed after a change by the settings menu.
2222
common_update_cached_supp_proto()
23-
local fav_selected = menudata.favorites[tabdata.fav_selected]
23+
local fav_selected = nil
24+
if menudata.search_result then
25+
fav_selected = menudata.search_result[tabdata.fav_selected]
26+
else
27+
fav_selected = menudata.favorites[tabdata.fav_selected]
28+
end
29+
30+
if not tabdata.search_for then
31+
tabdata.search_for = ""
32+
end
2433

2534
local retval =
2635
"label[7.75,-0.15;" .. fgettext("Address / Port") .. "]" ..
@@ -33,7 +42,9 @@ local function get_formspec(tabview, name, tabdata)
3342
"field[8,1.95;2.95,0.5;te_name;;" ..
3443
core.formspec_escape(core.setting_get("name")) .. "]" ..
3544
"pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" ..
36-
"box[7.73,2.35;4.3,2.28;#999999]"
45+
"box[7.73,2.35;4.3,2.28;#999999]"..
46+
"field[0.15,0.25;4.5,0.27;te_search;;"..core.formspec_escape(tabdata.search_for).."]"..
47+
"button[4.8,0;2.7,0.1;btn_mp_search;" .. fgettext("Search") .. "]"
3748

3849
if tabdata.fav_selected and fav_selected then
3950
if gamedata.fav then
@@ -58,9 +69,27 @@ local function get_formspec(tabview, name, tabdata)
5869
image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
5970
"color,span=1;" ..
6071
"text,padding=1]" ..
61-
"table[-0.15,-0.1;7.75,5.5;favourites;"
72+
"table[-0.15,0.4;7.75,5.35;favourites;"
73+
74+
if menudata.search_result then
75+
for i = 1, #menudata.search_result do
76+
local favs = core.get_favorites("local")
77+
local server = menudata.search_result[i]
6278

63-
if #menudata.favorites > 0 then
79+
for fav_id = 1, #favs do
80+
if server.address == favs[fav_id].address and
81+
server.port == favs[fav_id].port then
82+
server.is_favorite = true
83+
end
84+
end
85+
86+
if i ~= 1 then
87+
retval = retval .. ","
88+
end
89+
90+
retval = retval .. render_serverlist_row(server, server.is_favorite)
91+
end
92+
elseif #menudata.favorites > 0 then
6493
local favs = core.get_favorites("local")
6594
if #favs > 0 then
6695
for i = 1, #favs do
@@ -75,9 +104,9 @@ local function get_formspec(tabview, name, tabdata)
75104
end
76105
end
77106
end
78-
retval = retval .. render_favorite(menudata.favorites[1], (#favs > 0))
107+
retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
79108
for i = 2, #menudata.favorites do
80-
retval = retval .. "," .. render_favorite(menudata.favorites[i], (i <= #favs))
109+
retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
81110
end
82111
end
83112

@@ -92,17 +121,19 @@ end
92121

93122
--------------------------------------------------------------------------------
94123
local function main_button_handler(tabview, fields, name, tabdata)
124+
local serverlist = menudata.search_result or menudata.favorites
125+
95126
if fields.te_name then
96127
gamedata.playername = fields.te_name
97128
core.setting_set("name", fields.te_name)
98129
end
99130

100131
if fields.favourites then
101132
local event = core.explode_table_event(fields.favourites)
102-
local fav = menudata.favorites[event.row]
133+
local fav = serverlist[event.row]
103134

104135
if event.type == "DCL" then
105-
if event.row <= #menudata.favorites then
136+
if event.row <= #serverlist then
106137
if menudata.favorites_is_public and
107138
not is_server_protocol_compat_or_error(
108139
fav.proto_min, fav.proto_max) then
@@ -131,7 +162,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
131162
end
132163

133164
if event.type == "CHG" then
134-
if event.row <= #menudata.favorites then
165+
if event.row <= #serverlist then
135166
gamedata.fav = false
136167
local favs = core.get_favorites("local")
137168
local address = fav.address
@@ -157,7 +188,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
157188

158189
if fields.key_up or fields.key_down then
159190
local fav_idx = core.get_table_index("favourites")
160-
local fav = menudata.favorites[fav_idx]
191+
local fav = serverlist[fav_idx]
161192

162193
if fav_idx then
163194
if fields.key_up and fav_idx > 1 then
@@ -176,7 +207,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
176207

177208
local address = fav.address
178209
local port = fav.port
179-
210+
gamedata.serverdescription = fav.description
180211
if address and port then
181212
core.setting_set("address", address)
182213
core.setting_set("remote_port", port)
@@ -199,16 +230,75 @@ local function main_button_handler(tabview, fields, name, tabdata)
199230
return true
200231
end
201232

233+
if fields.btn_mp_search or fields.key_enter_field == "te_search" then
234+
tabdata.fav_selected = 1
235+
local input = fields.te_search:lower()
236+
tabdata.search_for = fields.te_search
237+
238+
if #menudata.favorites < 2 then
239+
return true
240+
end
241+
242+
menudata.search_result = {}
243+
244+
-- setup the keyword list
245+
local keywords = {}
246+
for word in input:gmatch("%S+") do
247+
table.insert(keywords, word)
248+
end
249+
250+
if #keywords == 0 then
251+
menudata.search_result = nil
252+
return true
253+
end
254+
255+
-- Search the serverlist
256+
local search_result = {}
257+
for i = 1, #menudata.favorites do
258+
local server = menudata.favorites[i]
259+
local found = 0
260+
for k = 1, #keywords do
261+
local keyword = keywords[k]
262+
if server.name then
263+
local name = server.name:lower()
264+
local _, count = name:gsub(keyword, keyword)
265+
found = found + count * 4
266+
end
267+
268+
if server.description then
269+
local desc = server.description:lower()
270+
local _, count = desc:gsub(keyword, keyword)
271+
found = found + count * 2
272+
end
273+
end
274+
if found > 0 then
275+
local points = (#menudata.favorites - i) / 5 + found
276+
server.points = points
277+
table.insert(search_result, server)
278+
end
279+
end
280+
if #search_result > 0 then
281+
table.sort(search_result, function(a, b)
282+
return a.points > b.points
283+
end)
284+
menudata.search_result = search_result
285+
local first_server = search_result[1]
286+
core.setting_set("address", first_server.address)
287+
core.setting_set("remote_port", first_server.port)
288+
end
289+
return true
290+
end
291+
202292
if (fields.btn_mp_connect or fields.key_enter) and fields.te_address and fields.te_port then
203293
gamedata.playername = fields.te_name
204294
gamedata.password = fields.te_pwd
205295
gamedata.address = fields.te_address
206296
gamedata.port = fields.te_port
207297
gamedata.selected_world = 0
208298
local fav_idx = core.get_table_index("favourites")
209-
local fav = menudata.favorites[fav_idx]
299+
local fav = serverlist[fav_idx]
210300

211-
if fav_idx and fav_idx <= #menudata.favorites and
301+
if fav_idx and fav_idx <= #serverlist and
212302
fav.address == fields.te_address and
213303
fav.port == fields.te_port then
214304

Diff for: ‎builtin/mainmenu/tab_server.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ local function get_formspec(tabview, name, tabdata)
2626
"button[4,4.15;2.6,0.5;world_delete;" .. fgettext("Delete") .. "]" ..
2727
"button[6.5,4.15;2.8,0.5;world_create;" .. fgettext("New") .. "]" ..
2828
"button[9.2,4.15;2.55,0.5;world_configure;" .. fgettext("Configure") .. "]" ..
29-
"button[8.5,4.95;3.25,0.5;start_server;" .. fgettext("Start Game") .. "]" ..
29+
"button[8.5,5;3.25,0.5;start_server;" .. fgettext("Start Game") .. "]" ..
3030
"label[4,-0.25;" .. fgettext("Select World:") .. "]" ..
3131
"checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Mode") .. ";" ..
3232
dump(core.setting_getbool("creative_mode")) .. "]" ..

Diff for: ‎builtin/mainmenu/tab_settings.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ local function formspec(tabview, name, tabdata)
209209
.. fgettext("Reset singleplayer world") .. "]"
210210
else
211211
tab_string = tab_string ..
212-
"button[8,4.75;3.75,0.5;btn_change_keys;"
212+
"button[8,4.85;3.75,0.5;btn_change_keys;"
213213
.. fgettext("Change keys") .. "]"
214214
end
215215

216216
tab_string = tab_string ..
217-
"button[0,4.75;3.75,0.5;btn_advanced_settings;"
217+
"button[0,4.85;3.75,0.5;btn_advanced_settings;"
218218
.. fgettext("Advanced Settings") .. "]"
219219

220220

Diff for: ‎builtin/mainmenu/tab_simple_main.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ local function get_formspec(tabview, name, tabdata)
7070
end
7171
end
7272
end
73-
retval = retval .. render_favorite(menudata.favorites[1], (#favs > 0))
73+
retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
7474
for i = 2, #menudata.favorites do
75-
retval = retval .. "," .. render_favorite(menudata.favorites[i], (i <= #favs))
75+
retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
7676
end
7777
end
7878

Diff for: ‎builtin/mainmenu/tab_singleplayer.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ local function singleplayer_refresh_gamebar()
5757

5858
local btnbar = buttonbar_create("game_button_bar",
5959
game_buttonbar_button_handler,
60-
{x=-0.3,y=5.65}, "horizontal", {x=12.4,y=1.15})
60+
{x=-0.3,y=5.9}, "horizontal", {x=12.4,y=1.15})
6161

6262
for i=1,#gamemgr.games,1 do
6363
local btn_name = "game_btnbar_" .. gamemgr.games[i].id
@@ -96,7 +96,7 @@ local function get_formspec(tabview, name, tabdata)
9696
"button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
9797
"button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
9898
"button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
99-
"button[8.5,4.95;3.25,0.5;play;".. fgettext("Play") .. "]" ..
99+
"button[8.5,5;3.25,0.5;play;".. fgettext("Play") .. "]" ..
100100
"label[4,-0.25;".. fgettext("Select World:") .. "]"..
101101
"checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
102102
dump(core.setting_getbool("creative_mode")) .. "]"..

0 commit comments

Comments
 (0)
Please sign in to comment.