pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-11 09:24:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add return values to builder interface

Browse Source
This commit is contained in:
Oleg Korshul
2019-08-01 18:15:48 +03:00
parent c094962751
commit 3bc08e72dc
3 changed files with 156 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DesktopEditor/doctrenderer/docbuilder.cpp
View File

@ -53,9 +53,9 @@ namespace NSDoctRenderer
int CDocBuilder::SaveFile(const int& type, const wchar_t* path, const wchar_t* params)
{
return m_pInternal->SaveFile(type, path, params);
}
bool CDocBuilder::ExecuteCommand(const wchar_t* command)
{
return m_pInternal->ExecuteCommand(command);
}
bool CDocBuilder::ExecuteCommand(const wchar_t* command, CDocBuilderValue* retValue)
{
return m_pInternal->ExecuteCommand(command, retValue);
}
}

30
DesktopEditor/doctrenderer/docbuilder.h
View File

@ -35,7 +35,33 @@
#include "./common.h"
namespace NSDoctRenderer
{
{
class CDocBuilderValue_Private;
class Q_DECL_EXPORT CDocBuilderValue
{
public:
CDocBuilderValue();
CDocBuilderValue(const CDocBuilderValue& src);
CDocBuilderValue& operator=(const CDocBuilderValue& src);
~CDocBuilderValue();
void* private_get_internal();
public:
bool IsEmpty();
void Clear();
void FreeString(wchar_t* data);
bool IsNull();
bool IsUndefined();
int ToInt();
double ToDouble();
wchar_t* ToString();
CDocBuilderValue GetProperty(const wchar_t* name);
private:
CDocBuilderValue_Private* m_internal;
};
class CDocBuilder_Private;
class Q_DECL_EXPORT CDocBuilder
{
@ -49,7 +75,7 @@ namespace NSDoctRenderer
void SetTmpFolder(const wchar_t* folder);
int SaveFile(const int& type, const wchar_t* path, const wchar_t* params = 0);
void CloseFile();
bool ExecuteCommand(const wchar_t* command);
bool ExecuteCommand(const wchar_t* command, CDocBuilderValue* retValue = 0);
bool Run(const wchar_t* path);

129
DesktopEditor/doctrenderer/docbuilder_p.h
View File

@ -60,6 +60,29 @@
#include "../../Common/FileDownloader/FileDownloader.h"
#endif
namespace NSDoctRenderer
{
class CDocBuilderValue_Private
{
public:
v8::Isolate* m_isolate;
v8::Local<v8::Value> m_value;
public:
CDocBuilderValue_Private()
{
m_isolate = NULL;
}
~CDocBuilderValue_Private()
{
}
void Clear()
{
m_value.Clear();
}
};
}
template <typename T>
class CScopeWrapper
{
@ -131,10 +154,13 @@ public:
std::cerr << sT << ": " << sE << std::endl;
}
bool ExecuteCommand(const std::wstring& command)
bool ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue = NULL)
{
LOGGER_SPEED_START
if (retValue)
retValue->Clear();
std::string commandA = U_TO_UTF8(command);
//commandA = "_api." + commandA;
@ -159,7 +185,7 @@ public:
}
else
{
script->Run();
v8::Local<v8::Value> retNativeVal = script->Run();
if (try_catch.HasCaught())
{
@ -171,6 +197,13 @@ public:
return false;
}
if (retValue)
{
NSDoctRenderer::CDocBuilderValue_Private* privateRet = (NSDoctRenderer::CDocBuilderValue_Private*)retValue->private_get_internal();
privateRet->m_isolate = m_isolate;
privateRet->m_value = retNativeVal;
}
}
LOGGER_SPEED_LAP("run_command")
@ -578,6 +611,92 @@ namespace NSDoctRenderer
std::string m_sArgumentJSON;
};
CDocBuilderValue::CDocBuilderValue()
{
m_internal = new CDocBuilderValue_Private();
}
CDocBuilderValue::CDocBuilderValue(const CDocBuilderValue& src)
{
m_internal->m_value = src.m_internal->m_value;
}
CDocBuilderValue& CDocBuilderValue::operator=(const CDocBuilderValue& src)
{
m_internal->m_value = src.m_internal->m_value;
return *this;
}
CDocBuilderValue::~CDocBuilderValue()
{
delete m_internal;
}
void* CDocBuilderValue::private_get_internal()
{
return (void*)m_internal;
}
bool CDocBuilderValue::IsEmpty()
{
return m_internal->m_value.IsEmpty();
}
void CDocBuilderValue::Clear()
{
m_internal->Clear();
}
bool CDocBuilderValue::IsNull()
{
if (m_internal->m_value.IsEmpty())
return false;
return m_internal->m_value->IsNull();
}
bool CDocBuilderValue::IsUndefined()
{
if (m_internal->m_value.IsEmpty())
return false;
return m_internal->m_value->IsUndefined();
}
int CDocBuilderValue::ToInt()
{
if (m_internal->m_value.IsEmpty() || !m_internal->m_value->IsInt32())
return 0;
return m_internal->m_value->ToInt32()->Value();
}
double CDocBuilderValue::ToDouble()
{
if (m_internal->m_value.IsEmpty() || !m_internal->m_value->IsNumber())
return 0;
return m_internal->m_value->ToNumber()->Value();
}
wchar_t* CDocBuilderValue::ToString()
{
if (m_internal->m_value.IsEmpty() || !m_internal->m_value->IsString())
return NULL;
std::wstring sValue = to_cstring(m_internal->m_value);
if (sValue.empty())
return NULL;
size_t len = sValue.length();
wchar_t* buffer = new wchar_t[len + 1];
memcpy(buffer, sValue.c_str(), len * sizeof(wchar_t));
buffer[len] = '\0';
return buffer;
}
void CDocBuilderValue::FreeString(wchar_t* data)
{
delete [] data;
}
CDocBuilderValue CDocBuilderValue::GetProperty(const wchar_t* name)
{
CDocBuilderValue ret;
if (m_internal->m_value.IsEmpty() || !m_internal->m_value->IsObject())
return ret;
std::wstring sProp(name);
std::string sPropA = U_TO_UTF8(sProp);
ret.m_internal->m_isolate = m_internal->m_isolate;
ret.m_internal->m_value = m_internal->m_value->ToObject()->Get(v8::String::NewFromUtf8(m_internal->m_isolate, sPropA.c_str()));
return ret;
}
class CDocBuilder_Private
{
public:
@ -1413,9 +1532,9 @@ namespace NSDoctRenderer
return nReturnCode;
}
bool ExecuteCommand(const std::wstring& command)
bool ExecuteCommand(const std::wstring& command, CDocBuilderValue* retValue = NULL)
{
if (command.length() < 7) // minimum command (!!!)
if (command.length() < 7 && !retValue) // minimum command (!!!)
return true;
Init();
@ -1442,7 +1561,7 @@ namespace NSDoctRenderer
return false;
}
return m_pWorker->ExecuteCommand(command);
return m_pWorker->ExecuteCommand(command, retValue);
}
std::string GetScript()