edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 15:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring of demo_extract_chat tool

Browse source 
Replace unnecessary `gameclient.h` include with more specific includes.

Fix storage creation error message not being logged as the logger was initialized after checking for the failed storage creation. However, in this case we want to avoid non-error log messages so the tool's output is only the extracted demo chat, except in error cases.

Rename `Process` function to `ExtractDemoChat` and make it `static` to avoid exporting it.

Use `log_error` instead of `dbg_msg`.
This commit is contained in:
Robert Müller 2023-12-17 12:53:08 +01:00
parent 4af28fd2d8
commit 1f5a648600
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/tools/demo_extract_chat.cpp
View file

@ -1,7 +1,13 @@
#include <base/logger.h>
#include <base/system.h>
#include <engine/client.h>
#include <game/client/gameclient.h>
#include <engine/shared/demo.h>
#include <engine/shared/network.h>
#include <engine/shared/snapshot.h>
#include <engine/storage.h>
#include <game/gamecore.h>
static const char *TOOL_NAME = "demo_extract_chat";
@ -190,14 +196,14 @@ public:
}
};
int Process(const char *pDemoFilePath, IStorage *pStorage)
static int ExtractDemoChat(const char *pDemoFilePath, IStorage *pStorage)
{
CSnapshotDelta DemoSnapshotDelta;
CDemoPlayer DemoPlayer(&DemoSnapshotDelta, false);
if(DemoPlayer.Load(pStorage, nullptr, pDemoFilePath, IStorage::TYPE_ALL_OR_ABSOLUTE) == -1)
{
dbg_msg(TOOL_NAME, "Demo file '%s' failed to load: %s", pDemoFilePath, DemoPlayer.ErrorMessage());
log_error(TOOL_NAME, "Demo file '%s' failed to load: %s", pDemoFilePath, DemoPlayer.ErrorMessage());
return -1;
}
@ -225,21 +231,23 @@ int Process(const char *pDemoFilePath, IStorage *pStorage)
int main(int argc, const char *argv[])
{
// Create storage before setting logger to avoid log messages from storage creation
IStorage *pStorage = CreateLocalStorage();
if(!pStorage)
{
dbg_msg(TOOL_NAME, "Error loading storage");
return -1;
}
CCmdlineFix CmdlineFix(&argc, &argv);
log_set_global_logger_default();
if(argc != 2)
if(!pStorage)
{
dbg_msg(TOOL_NAME, "Usage: %s <demo_filename>", TOOL_NAME);
log_error(TOOL_NAME, "Error creating local storage");
return -1;
}
return Process(argv[1], pStorage);
if(argc != 2)
{
log_error(TOOL_NAME, "Usage: %s <demo_filename>", TOOL_NAME);
return -1;
}
return ExtractDemoChat(argv[1], pStorage);
}