mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2024-11-16 07:20:31 +01:00
Made more precise whoison's time message
- Changed whoison's function to compute time
This commit is contained in:
LeMagnesium
parent
82991c27d8
commit
0a18b1255e
|
|
@ -23,7 +23,7 @@ function whoison.functions.load(param)
|
||||||
for line in whoison.presence_file:lines() do
|
for line in whoison.presence_file:lines() do
|
||||||
local datas = minetest.deserialize(line)
|
local datas = minetest.deserialize(line)
|
||||||
if datas then
|
if datas then
|
||||||
if datas.name == name then
|
if datas.name == param then
|
||||||
return datas.time
|
return datas.time
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -41,34 +41,30 @@ end
|
||||||
function whoison.functions.save(param)
|
function whoison.functions.save(param)
|
||||||
--[[
|
--[[
|
||||||
Values for param :
|
Values for param :
|
||||||
* E : Everyone
|
|
||||||
* <name> : name
|
* <name> : name
|
||||||
]]--
|
]]--
|
||||||
|
|
||||||
if param == "E" then
|
for line in whoison.presence_file:lines() do
|
||||||
-- TODO
|
local datas = minetest.deserialize(line)
|
||||||
else
|
if datas then
|
||||||
for line in whoison.presence_file:lines() do
|
if datas.name == param then
|
||||||
local datas = minetest.deserialize(line)
|
-- Erase line
|
||||||
if datas then
|
local i = 0
|
||||||
if datas.name == name then
|
whoison.presence_file:seek(string.len(line),"cur")
|
||||||
-- Erase line
|
print("removing " .. string.len(line))
|
||||||
local i = 0
|
while i < string.len(line) do
|
||||||
whoison.presence_file:seek(string.len(line),"cur")
|
whoison.presence_file:write("\b")
|
||||||
while i < string.len(line) do
|
i = i + 1
|
||||||
whoison.presence_file:write("\b")
|
|
||||||
i = i + 1
|
|
||||||
end
|
|
||||||
whoison.presence_file:write(minetest.serialize(
|
|
||||||
{name = param, time = whoison.datas[param]}
|
|
||||||
) .. "\n")
|
|
||||||
return true
|
|
||||||
end
|
end
|
||||||
|
whoison.presence_file:write(minetest.serialize(
|
||||||
|
{name = param, time = whoison.datas[param]}
|
||||||
|
) .. "\n")
|
||||||
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
whoison.presence_file:write(minetest.serialize(
|
|
||||||
{name = param, time = whoison.datas[param]}
|
|
||||||
) .. "\n")
|
|
||||||
return true
|
|
||||||
end
|
end
|
||||||
|
whoison.presence_file:write(minetest.serialize(
|
||||||
|
{name = param, time = whoison.datas[param]}
|
||||||
|
) .. "\n")
|
||||||
|
return true
|
||||||
end
|
end
|
||||||
|
|
|
||||||
184
mods/whoison/init.lua
Normal file → Executable file
184
mods/whoison/init.lua
Normal file → Executable file
|
|
@ -1,71 +1,143 @@
|
||||||
-- Rewrite of whoison mod, LeMagnesium
|
|
||||||
--
|
|
||||||
|
|
||||||
whoison = {}
|
whoison = {}
|
||||||
whoison.datas = {}
|
whoison.lastrun = os.time()
|
||||||
whoison.config = {}
|
whoison.lastseen = {}
|
||||||
whoison.config.save_interval = 10
|
|
||||||
whoison.functions = {}
|
|
||||||
|
|
||||||
dofile(minetest.get_modpath("whoison") .. "/functions.lua")
|
local filename = minetest.get_worldpath().."/online-players"
|
||||||
|
local seenfile = minetest.get_worldpath().."/last-seen"
|
||||||
|
|
||||||
-- Boot, Step 0, open presence file
|
function whoison.createFile(loopit)
|
||||||
whoison.presence_file = io.open(minetest.get_worldpath() .. "/whoison.wio","r+")
|
local file = io.open(filename, "w")
|
||||||
if not whoison.presence_file then
|
file:write(os.time().."\n")
|
||||||
--minetest.log("error", "[whoison] Cannot open presence file! Mod disabled.")
|
file:write(minetest.get_server_status().."\n")
|
||||||
whoison.presence_file = io.open(minetest.get_worldpath() .. "/whoison.wio","w")
|
for _,player in ipairs(minetest.get_connected_players()) do
|
||||||
return
|
|
||||||
|
local name = player:get_player_name()
|
||||||
|
whoison.updateStats(name)
|
||||||
|
local ppos = minetest.pos_to_string(player:getpos())
|
||||||
|
local datastring = name.."|"..ppos.."\n"
|
||||||
|
file:write( datastring )
|
||||||
|
end
|
||||||
|
file:close()
|
||||||
|
minetest.log("action","Updated online player file")
|
||||||
|
if ( loopit == true ) then
|
||||||
|
minetest.after(300,whoison.createFile,true)
|
||||||
|
end
|
||||||
|
whoison.lastrun = os.time()
|
||||||
end
|
end
|
||||||
|
|
||||||
whoison.datas = whoison.functions.load("E")
|
function whoison.saveLastSeen()
|
||||||
if not whoison.datas then
|
local f = io.open(seenfile,"w")
|
||||||
whoison.datas = {}
|
f:write(minetest.serialize(whoison.lastseen))
|
||||||
|
f:close()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function whoison.loadLastSeen()
|
||||||
-- Boot, Step 1, define callbacks
|
local f = io.open(seenfile,"r")
|
||||||
|
if ( f ~= nil ) then
|
||||||
function whoison.functions.on_newplayer(player)
|
local ls = f:read("*all")
|
||||||
whoison.datas[player:get_player_name()] = 0
|
f:close()
|
||||||
|
if ( ls ~= nil and ls ~= "" ) then
|
||||||
|
whoison.lastseen = minetest.deserialize(ls)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function whoison.functions.on_joinplayer(player)
|
function whoison.getLastOnline(name)
|
||||||
local time = whoison.functions.load(player:get_player_name())
|
whoison.updateFormat(name)
|
||||||
if not time then
|
return whoison.lastseen[name]['lastonline']
|
||||||
minetest.log("error", "[whoison] Reading failed. Player " ..
|
|
||||||
player:get_player_name())
|
|
||||||
whoison.datas[player:get_player_name()] = 0
|
|
||||||
|
|
||||||
return
|
|
||||||
end
|
|
||||||
whoison.datas[player:get_player_name()] = time
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function whoison.functions.on_leaveplayer(player)
|
function whoison.getTimeOnline(name)
|
||||||
local name = player:get_player_name()
|
whoison.updateFormat(name)
|
||||||
local auth = minetest.get_auth_handler().get_auth(name)
|
return whoison.lastseen[name]['timeonline']
|
||||||
if auth and auth.last_login then
|
|
||||||
local last_login = auth.last_login
|
|
||||||
local uptime = os.difftime(os.time(),last_login)
|
|
||||||
whoison.datas[name] = whoison.datas[name] + uptime
|
|
||||||
local success = whoison.functions.save(name)
|
|
||||||
if not success then
|
|
||||||
minetest.log("error", "[whoison] Something went wrong while saving " ..
|
|
||||||
name .. "'s file")
|
|
||||||
end
|
|
||||||
else
|
|
||||||
minetest.log("error", "[whoison] Couldn't get " .. name .. "'s uptime")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function whoison.functions.on_shutdown()
|
function whoison.updateStats(name)
|
||||||
for index, player in pairs(minetest.get_connected_players()) do
|
whoison.updateFormat(name)
|
||||||
whoison.functions.on_leaveplayer(player)
|
whoison.lastseen[name]['timeonline'] = whoison.lastseen[name]['timeonline'] + ( os.time() - whoison.lastrun )
|
||||||
end
|
whoison.lastseen[name]['lastonline'] = os.time()
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_joinplayer(whoison.functions.on_joinplayer)
|
function whoison.updateFormat(name)
|
||||||
minetest.register_on_newplayer(whoison.functions.on_newplayer)
|
if ( type(whoison.lastseen[name]) ~= "table" ) then
|
||||||
minetest.register_on_leaveplayer(whoison.functions.on_leaveplayer)
|
-- update old data to new format
|
||||||
minetest.register_on_shutdown(whoison.functions.on_shutdown)
|
minetest.log("action",name.." lastseen is not a table... fixing...")
|
||||||
|
local lo = whoison.lastseen[name]
|
||||||
|
whoison.lastseen[name] = {timeonline=0,lastonline=lo}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_on_joinplayer(function (player)
|
||||||
|
whoison.createFile(false)
|
||||||
|
whoison.saveLastSeen()
|
||||||
|
end)
|
||||||
|
|
||||||
|
minetest.register_on_leaveplayer(function (player)
|
||||||
|
whoison.createFile(false)
|
||||||
|
whoison.saveLastSeen()
|
||||||
|
end)
|
||||||
|
|
||||||
|
minetest.register_chatcommand("seen",{
|
||||||
|
param = "<name>",
|
||||||
|
description = "Tells the last time a player was online",
|
||||||
|
func = function (name, param)
|
||||||
|
if ( param ~= nil ) then
|
||||||
|
local t = whoison.getLastOnline(param)
|
||||||
|
if ( t ~= nil ) then
|
||||||
|
local diff = (os.time() - t)
|
||||||
|
minetest.chat_send_player(name,param.." was last online "..breakdowntime(diff).." ago")
|
||||||
|
else
|
||||||
|
minetest.chat_send_player(name,"Sorry, I have no record of "..param)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
minetest.chat_send_player(name,"Usage is /seen <name>")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
||||||
|
minetest.register_chatcommand("timeonline",{
|
||||||
|
param = "<name>",
|
||||||
|
description = "Shows the cumulative time a player has been online",
|
||||||
|
func = function (name, param)
|
||||||
|
if ( param ~= nil ) then
|
||||||
|
local t = whoison.getTimeOnline(param)
|
||||||
|
if ( t ~= nil ) then
|
||||||
|
minetest.chat_send_player(name,param.." has been online for "..breakdowntime(t))
|
||||||
|
else
|
||||||
|
minetest.chat_send_player(name,"Sorry, I have no record of "..param)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
minetest.chat_send_player(name,"Usage is /timeonline <name>")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
||||||
|
function breakdowntime(t)
|
||||||
|
local countdown = t
|
||||||
|
local answer = ""
|
||||||
|
|
||||||
|
if countdown >= 86400 then
|
||||||
|
local days = math.floor(countdown / 86400)
|
||||||
|
countdown = countdown % 86400
|
||||||
|
answer = days .. " days "
|
||||||
|
end
|
||||||
|
if countdown >= 3600 then
|
||||||
|
local hours = math.floor(countdown / 3600)
|
||||||
|
countdown = countdown % 3600
|
||||||
|
answer = answer .. hours .. " hours "
|
||||||
|
end
|
||||||
|
if countdown >= 60 then
|
||||||
|
local minutes = math.floor(countdown / 60)
|
||||||
|
countdown = countdown % 60
|
||||||
|
answer = answer .. minutes .. " minutes "
|
||||||
|
end
|
||||||
|
|
||||||
|
local seconds = countdown
|
||||||
|
answer = answer .. seconds .. " seconds"
|
||||||
|
|
||||||
|
return answer
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.after(10,whoison.createFile,true)
|
||||||
|
|
||||||
|
whoison.loadLastSeen()
|
||||||
|
|
|
||||||
76
mods/whoison/init.lua.new
Normal file
76
mods/whoison/init.lua.new
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
-- Rewrite of whoison mod, LeMagnesium
|
||||||
|
--
|
||||||
|
|
||||||
|
whoison = {}
|
||||||
|
whoison.datas = {}
|
||||||
|
whoison.config = {}
|
||||||
|
whoison.config.save_interval = 10
|
||||||
|
whoison.functions = {}
|
||||||
|
|
||||||
|
dofile(minetest.get_modpath("whoison") .. "/functions.lua")
|
||||||
|
|
||||||
|
-- Boot, Step 0, open presence file
|
||||||
|
whoison.presence_file = io.open(minetest.get_worldpath() .. "/whoison.wio","r+")
|
||||||
|
if not whoison.presence_file then
|
||||||
|
--minetest.log("error", "[whoison] Cannot open presence file! Mod disabled.")
|
||||||
|
whoison.presence_file = io.open(minetest.get_worldpath() .. "/whoison.wio","w")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
whoison.datas = whoison.functions.load("E")
|
||||||
|
if not whoison.datas then
|
||||||
|
whoison.datas = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- Boot, Step 1, define callbacks
|
||||||
|
|
||||||
|
function whoison.functions.on_newplayer(player)
|
||||||
|
whoison.datas[player:get_player_name()] = 0
|
||||||
|
end
|
||||||
|
|
||||||
|
function whoison.functions.on_joinplayer(player)
|
||||||
|
local time = whoison.functions.load(player:get_player_name())
|
||||||
|
if not time then
|
||||||
|
minetest.log("error", "[whoison] Reading failed. Player " ..
|
||||||
|
player:get_player_name())
|
||||||
|
whoison.datas[player:get_player_name()] = 0
|
||||||
|
|
||||||
|
return
|
||||||
|
end
|
||||||
|
minetest.log("action", "[whoison] Successfuly read datas for player" ..
|
||||||
|
player:get_player_name())
|
||||||
|
whoison.datas[player:get_player_name()] = time
|
||||||
|
end
|
||||||
|
|
||||||
|
function whoison.functions.on_leaveplayer(player)
|
||||||
|
local name = player:get_player_name()
|
||||||
|
local auth = minetest.get_auth_handler().get_auth(name)
|
||||||
|
if auth and auth.last_login then
|
||||||
|
local last_login = auth.last_login
|
||||||
|
local uptime = os.difftime(os.time(),last_login)
|
||||||
|
whoison.datas[name] = whoison.datas[name] + uptime
|
||||||
|
local success = whoison.functions.save(name)
|
||||||
|
if not success then
|
||||||
|
minetest.log("error", "[whoison] Something went wrong while saving " ..
|
||||||
|
name .. "'s file")
|
||||||
|
else
|
||||||
|
minetest.log("action", "[whoison] Successfuly saved datas for " ..
|
||||||
|
"player " .. name)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
minetest.log("error", "[whoison] Couldn't get " .. name .. "'s uptime")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function whoison.functions.on_shutdown()
|
||||||
|
for index, player in pairs(minetest.get_connected_players()) do
|
||||||
|
whoison.functions.on_leaveplayer(player)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_on_joinplayer(whoison.functions.on_joinplayer)
|
||||||
|
minetest.register_on_newplayer(whoison.functions.on_newplayer)
|
||||||
|
minetest.register_on_leaveplayer(whoison.functions.on_leaveplayer)
|
||||||
|
minetest.register_on_shutdown(whoison.functions.on_shutdown)
|
||||||
|
|
@ -1,129 +0,0 @@
|
||||||
whoison = {}
|
|
||||||
whoison.lastrun = os.time()
|
|
||||||
whoison.lastseen = {}
|
|
||||||
|
|
||||||
local filename = minetest.get_worldpath().."/online-players"
|
|
||||||
local seenfile = minetest.get_worldpath().."/last-seen"
|
|
||||||
|
|
||||||
function whoison.createFile(loopit)
|
|
||||||
local file = io.open(filename, "w")
|
|
||||||
file:write(os.time().."\n")
|
|
||||||
file:write(minetest.get_server_status().."\n")
|
|
||||||
for _,player in ipairs(minetest.get_connected_players()) do
|
|
||||||
|
|
||||||
local name = player:get_player_name()
|
|
||||||
whoison.updateStats(name)
|
|
||||||
local ppos = minetest.pos_to_string(player:getpos())
|
|
||||||
local datastring = name.."|"..ppos.."\n"
|
|
||||||
file:write( datastring )
|
|
||||||
end
|
|
||||||
file:close()
|
|
||||||
minetest.log("action","Updated online player file")
|
|
||||||
if ( loopit == true ) then
|
|
||||||
minetest.after(300,whoison.createFile,true)
|
|
||||||
end
|
|
||||||
whoison.lastrun = os.time()
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.saveLastSeen()
|
|
||||||
local f = io.open(seenfile,"w")
|
|
||||||
f:write(minetest.serialize(whoison.lastseen))
|
|
||||||
f:close()
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.loadLastSeen()
|
|
||||||
local f = io.open(seenfile,"r")
|
|
||||||
if ( f ~= nil ) then
|
|
||||||
local ls = f:read("*all")
|
|
||||||
f:close()
|
|
||||||
if ( ls ~= nil and ls ~= "" ) then
|
|
||||||
whoison.lastseen = minetest.deserialize(ls)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.getLastOnline(name)
|
|
||||||
whoison.updateFormat(name)
|
|
||||||
return whoison.lastseen[name]['lastonline']
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.getTimeOnline(name)
|
|
||||||
whoison.updateFormat(name)
|
|
||||||
return whoison.lastseen[name]['timeonline']
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.updateStats(name)
|
|
||||||
whoison.updateFormat(name)
|
|
||||||
whoison.lastseen[name]['timeonline'] = whoison.lastseen[name]['timeonline'] + ( os.time() - whoison.lastrun )
|
|
||||||
whoison.lastseen[name]['lastonline'] = os.time()
|
|
||||||
end
|
|
||||||
|
|
||||||
function whoison.updateFormat(name)
|
|
||||||
if ( type(whoison.lastseen[name]) ~= "table" ) then
|
|
||||||
-- update old data to new format
|
|
||||||
minetest.log("action",name.." lastseen is not a table... fixing...")
|
|
||||||
local lo = whoison.lastseen[name]
|
|
||||||
whoison.lastseen[name] = {timeonline=0,lastonline=lo}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function (player)
|
|
||||||
whoison.createFile(false)
|
|
||||||
whoison.saveLastSeen()
|
|
||||||
end)
|
|
||||||
|
|
||||||
minetest.register_on_leaveplayer(function (player)
|
|
||||||
whoison.createFile(false)
|
|
||||||
whoison.saveLastSeen()
|
|
||||||
end)
|
|
||||||
|
|
||||||
minetest.register_chatcommand("seen",{
|
|
||||||
param = "<name>",
|
|
||||||
description = "Tells the last time a player was online",
|
|
||||||
func = function (name, param)
|
|
||||||
if ( param ~= nil ) then
|
|
||||||
local t = whoison.getLastOnline(param)
|
|
||||||
if ( t ~= nil ) then
|
|
||||||
local diff = (os.time() - t)
|
|
||||||
minetest.chat_send_player(name,param.." was last online "..breakdowntime(diff).." ago")
|
|
||||||
else
|
|
||||||
minetest.chat_send_player(name,"Sorry, I have no record of "..param)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
minetest.chat_send_player(name,"Usage is /seen <name>")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
minetest.register_chatcommand("timeonline",{
|
|
||||||
param = "<name>",
|
|
||||||
description = "Shows the cumulative time a player has been online",
|
|
||||||
func = function (name, param)
|
|
||||||
if ( param ~= nil ) then
|
|
||||||
local t = whoison.getTimeOnline(param)
|
|
||||||
if ( t ~= nil ) then
|
|
||||||
minetest.chat_send_player(name,param.." has been online for "..breakdowntime(t))
|
|
||||||
else
|
|
||||||
minetest.chat_send_player(name,"Sorry, I have no record of "..param)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
minetest.chat_send_player(name,"Usage is /timeonline <name>")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
function breakdowntime(t)
|
|
||||||
local eng = {"Seconds","Minutes","Hours","Days","Weeks","Months","Years"}
|
|
||||||
local inc = {60,60,24,7,4,12,1}
|
|
||||||
for k,v in ipairs(inc) do
|
|
||||||
if ( t > v ) then
|
|
||||||
t = math.floor( (t / v) )
|
|
||||||
else
|
|
||||||
return tostring(t).." "..eng[k]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.after(10,whoison.createFile,true)
|
|
||||||
|
|
||||||
whoison.loadLastSeen()
|
|
||||||
Loading…
Reference in New Issue
Block a user