MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 15:53:55 +00:00
Code Issues Releases Wiki Activity

Added "GetBuffer", which always returns a buffer.

Browse Source 
Updated "Get" so it always returns a string, which underneath it just fetches the buffer and calls toString() on it.
This commit is contained in:
Bryan Roe
2019-01-17 18:50:02 -08:00
parent 1e537debfb
commit 9eef92aae2
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
microscript/ILibDuktape_SimpleDataStore.c
View File

@@ -74,8 +74,7 @@ duk_ret_t ILibDuktape_SimpleDataStore_Put(duk_context *ctx)
duk_push_int(ctx, ILibSimpleDataStore_PutEx(dataStore, key, (int)keyLen, value, (int)valueLen)); // [ds][ptr][retVal]
return 1;
}
duk_ret_t ILibDuktape_SimpleDataStore_Get(duk_context *ctx)
duk_ret_t ILibDuktape_SimpleDataStore_GetRaw(duk_context *ctx)
{
char *cguid = Duktape_GetContextGuidHex(ctx);
char *key = (char*)duk_require_string(ctx, 0);
@@ -100,7 +99,7 @@ duk_ret_t ILibDuktape_SimpleDataStore_Get(duk_context *ctx)
duk_push_null(ctx);
return 1;
}
duk_push_fixed_buffer(ctx, bufferSize); // [ds][ptr][buffer]
buffer = Duktape_GetBuffer(ctx, -1, NULL);
written = ILibSimpleDataStore_Get(dataStore, key, buffer, bufferSize);
@@ -110,29 +109,22 @@ duk_ret_t ILibDuktape_SimpleDataStore_Get(duk_context *ctx)
}
else
{
if (buffer[bufferSize - 1] == 0)
{
int i = 0;
for (i = 0; i < bufferSize - 1; ++i)
{
if (buffer[i] == 0)
{
break;
}
}
if (i == bufferSize - 1)
{
duk_push_string(ctx, buffer);
}
}
else
{
duk_push_buffer_object(ctx, -1, 0, bufferSize, DUK_BUFOBJ_NODEJS_BUFFER);
}
duk_push_buffer_object(ctx, -1, 0, bufferSize, DUK_BUFOBJ_NODEJS_BUFFER);
}
return 1;
}
duk_ret_t ILibDuktape_SimpleDataStore_Get(duk_context *ctx)
{
ILibDuktape_SimpleDataStore_GetRaw(ctx); // [buffer]
if (!duk_is_null_or_undefined(ctx, -1))
{
duk_get_prop_string(ctx, -1, "toString"); // [buffer][toString]
duk_swap_top(ctx, -2); // [toString][this]
duk_call_method(ctx, 0);
}
return 1;
}
duk_ret_t ILibDuktape_SimpleDataStore_Compact(duk_context *ctx)
{
ILibSimpleDataStore dataStore;
@@ -232,6 +224,7 @@ duk_ret_t ILibDuktape_SimpleDataStore_Create(duk_context *ctx)
ILibDuktape_CreateInstanceMethod(ctx, "Delete", ILibDuktape_SimpleDataStore_Delete, 1);
ILibDuktape_CreateInstanceMethod(ctx, "Put", ILibDuktape_SimpleDataStore_Put, 2);
ILibDuktape_CreateInstanceMethod(ctx, "Get", ILibDuktape_SimpleDataStore_Get, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "GetBuffer", ILibDuktape_SimpleDataStore_GetRaw, DUK_VARARGS);
ILibDuktape_CreateInstanceMethod(ctx, "Compact", ILibDuktape_SimpleDataStore_Compact, 0);
ILibDuktape_CreateEventWithGetter(ctx, "Keys", ILibDuktape_SimpleDataStore_Keys);