mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-30 19:22:14 +00:00
fix formatting
This commit is contained in:
parent
453c4d061b
commit
440f3a5ac1
1 changed files with 132 additions and 146 deletions
|
@ -1,18 +1,15 @@
|
||||||
keyringmgr = {
|
keyringmgr = {
|
||||||
keyring = nil,
|
keyring = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function get_keyring_path()
|
local function get_keyring_path()
|
||||||
return core.get_user_path() .. DIR_DELIM .. "client" .. DIR_DELIM .. core.settings:get("keyring_file")
|
return core.get_user_path() .. DIR_DELIM .. "client" .. DIR_DELIM .. core.settings:get("keyring_file")
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function save_keyring(keyring)
|
local function save_keyring(keyring)
|
||||||
core.safe_file_write(get_keyring_path(), core.write_json(keyring))
|
core.safe_file_write(get_keyring_path(), core.write_json(keyring))
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function read_keyring()
|
local function read_keyring()
|
||||||
local path = get_keyring_path()
|
local path = get_keyring_path()
|
||||||
|
|
||||||
|
@ -24,14 +21,12 @@ local function read_keyring()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function is_for_server(keys, address, port)
|
local function is_for_server(keys, address, port)
|
||||||
return keys.address == address and keys.port == port
|
return keys.address == address and keys.port == port
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function delete_keys(keyring, address, port)
|
local function delete_keys(keyring, address, port)
|
||||||
for i=1, #keyring do
|
for i = 1, #keyring do
|
||||||
local keys = keyring[i]
|
local keys = keyring[i]
|
||||||
|
|
||||||
if is_for_server(keys, address, port) then
|
if is_for_server(keys, address, port) then
|
||||||
|
@ -41,9 +36,8 @@ local function delete_keys(keyring, address, port)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function get_keys(keyring, address, port)
|
local function get_keys(keyring, address, port)
|
||||||
for i=1, #keyring do
|
for i = 1, #keyring do
|
||||||
local keys = keyring[i]
|
local keys = keyring[i]
|
||||||
|
|
||||||
if is_for_server(keys, address, port) then
|
if is_for_server(keys, address, port) then
|
||||||
|
@ -55,21 +49,19 @@ local function get_keys(keyring, address, port)
|
||||||
address = address,
|
address = address,
|
||||||
port = port,
|
port = port,
|
||||||
logins = {},
|
logins = {},
|
||||||
last_login = false,
|
last_login = false
|
||||||
}
|
}
|
||||||
table.insert(keyring, 1, keys)
|
table.insert(keyring, 1, keys)
|
||||||
save_keyring(keyring)
|
save_keyring(keyring)
|
||||||
return keys
|
return keys
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
local function rewrite_keys(keyring, address, port, new_keys)
|
local function rewrite_keys(keyring, address, port, new_keys)
|
||||||
delete_keys(keyring, address, port)
|
delete_keys(keyring, address, port)
|
||||||
table.insert(keyring, 1, new_keys)
|
table.insert(keyring, 1, new_keys)
|
||||||
save_keyring(keyring)
|
save_keyring(keyring)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.get_keyring()
|
function keyringmgr.get_keyring()
|
||||||
if keyringmgr.keyring then
|
if keyringmgr.keyring then
|
||||||
return keyringmgr.keyring
|
return keyringmgr.keyring
|
||||||
|
@ -90,7 +82,6 @@ function keyringmgr.get_keyring()
|
||||||
return keyringmgr.keyring
|
return keyringmgr.keyring
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.set_last_login(address, port, playername)
|
function keyringmgr.set_last_login(address, port, playername)
|
||||||
local keyring = keyringmgr.get_keyring()
|
local keyring = keyringmgr.get_keyring()
|
||||||
local new_keys = get_keys(keyring, address, port)
|
local new_keys = get_keys(keyring, address, port)
|
||||||
|
@ -99,7 +90,6 @@ function keyringmgr.set_last_login(address, port, playername)
|
||||||
rewrite_keys(keyring, address, port, new_keys)
|
rewrite_keys(keyring, address, port, new_keys)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.set_login(address, port, playername, password)
|
function keyringmgr.set_login(address, port, playername, password)
|
||||||
-- If the user doesn't want to remember logins, we completely skip the process
|
-- If the user doesn't want to remember logins, we completely skip the process
|
||||||
if not core.settings:get_bool("remember_login") then
|
if not core.settings:get_bool("remember_login") then
|
||||||
|
@ -132,7 +122,6 @@ function keyringmgr.set_login(address, port, playername, password)
|
||||||
rewrite_keys(keyring, address, port, new_keys)
|
rewrite_keys(keyring, address, port, new_keys)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.get_login(address, port, playername)
|
function keyringmgr.get_login(address, port, playername)
|
||||||
assert(type(port) == "number")
|
assert(type(port) == "number")
|
||||||
|
|
||||||
|
@ -148,16 +137,15 @@ function keyringmgr.get_login(address, port, playername)
|
||||||
error("No login found on " .. address .. ":" .. port .. " for player " .. playername)
|
error("No login found on " .. address .. ":" .. port .. " for player " .. playername)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.remove_login(address, port, playername)
|
function keyringmgr.remove_login(address, port, playername)
|
||||||
assert(type(port) == "number")
|
assert(type(port) == "number")
|
||||||
|
|
||||||
local keyring = keyringmgr.get_keyring()
|
local keyring = keyringmgr.get_keyring()
|
||||||
local new_keys = get_keys(keyring, address, port);
|
local new_keys = get_keys(keyring, address, port);
|
||||||
for i=1, #new_keys.logins do
|
for i = 1, #new_keys.logins do
|
||||||
local login = new_keys.logins[i]
|
local login = new_keys.logins[i]
|
||||||
|
|
||||||
if(login.playername == playername) then
|
if (login.playername == playername) then
|
||||||
table.remove(new_keys.logins, i)
|
table.remove(new_keys.logins, i)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
@ -166,14 +154,12 @@ function keyringmgr.remove_login(address, port, playername)
|
||||||
rewrite_keys(keyring, address, port, new_keys)
|
rewrite_keys(keyring, address, port, new_keys)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.delete_keys(address, port)
|
function keyringmgr.delete_keys(address, port)
|
||||||
local keyring = keyringmgr.get_keyring()
|
local keyring = keyringmgr.get_keyring()
|
||||||
delete_keys(keyring, address, port)
|
delete_keys(keyring, address, port)
|
||||||
save_keyring(keyring)
|
save_keyring(keyring)
|
||||||
end
|
end
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
|
||||||
function keyringmgr.get_last_login(address, port)
|
function keyringmgr.get_last_login(address, port)
|
||||||
local playername = get_keys(keyringmgr.get_keyring(), address, port).last_login
|
local playername = get_keys(keyringmgr.get_keyring(), address, port).last_login
|
||||||
if playername then
|
if playername then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue