Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add KeyValues.Export() method #1840

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add KeyValues.Export() method #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f188fd
Push `KeyValues.Export()` method
Wend4r Oct 11, 2022
873fa99
Fix compiler errors
Wend4r Oct 11, 2022
630277c
Remove not working argument
Wend4r Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions core/smn_keyvalues.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,34 @@ static cell_t smn_KvGetDataType(IPluginContext *pCtx, const cell_t *params)
return pStk->pCurRoot.front()->GetDataType(name);
}

static cell_t smn_KeyValuesExport(IPluginContext *pCtx, const cell_t *params)
{
Handle_t hndl = static_cast<Handle_t>(params[1]);
HandleError herr;
HandleSecurity sec;
KeyValueStack *pStk;

sec.pOwner = NULL;
sec.pIdentity = g_pCoreIdent;

if ((herr=handlesys->ReadHandle(hndl, g_KeyValueType, &sec, (void **)&pStk))
!= HandleError_None)
{
return pCtx->ThrowNativeError("Invalid key value handle %x (error %d)", hndl, herr);
}

KeyValues *pNewKV = new KeyValues(NULL /* Will be initialized in KeyValues::operator=() */ );

*pNewKV = *(pStk->pCurRoot.front()); // KeyValues::operator=() to recursive copy.

KeyValueStack *pExportStk = new KeyValueStack;

pExportStk->pBase = pNewKV;
pExportStk->pCurRoot.push(pNewKV);

return handlesys->CreateHandle(g_KeyValueType, pExportStk, pCtx->GetIdentity(), g_pCoreIdent, NULL);
}

static cell_t smn_KeyValuesToFile(IPluginContext *pCtx, const cell_t *params)
{
Handle_t hndl = static_cast<Handle_t>(params[1]);
Expand Down Expand Up @@ -1241,6 +1269,7 @@ REGISTER_NATIVES(keyvaluenatives)
{"KeyValues.Import", KeyValues_Import},
{"KeyValues.ImportFromFile", smn_FileToKeyValues},
{"KeyValues.ImportFromString", smn_StringToKeyValues},
{"KeyValues.Export", smn_KeyValuesExport},
{"KeyValues.ExportToFile", smn_KeyValuesToFile},
{"KeyValues.ExportToString", smn_KeyValuesToString},
{"KeyValues.ExportLength.get", smn_KeyValuesExportLength},
Expand Down
6 changes: 6 additions & 0 deletions plugins/include/keyvalues.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ methodmap KeyValues < Handle
// @param firstValue If firstKey is non-empty, specifies the first key's value.
public native KeyValues(const char[] name, const char[] firstKey="", const char[] firstValue="");

// Exports a KeyValues tree to new descriptor. The tree is dumped from the current position.
// The Handle must be closed.
//
// @return A Handle to a new KeyValues structure.
public native KeyValues Export();

// Exports a KeyValues tree to a file. The tree is dumped from the current position.
//
// @param file File to dump write to.
Expand Down