Skip to content

Commit

Permalink
remove duplication and organize better
Browse files Browse the repository at this point in the history 
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I6c4b7601d29080af5a3ead44d4cf7c1a766a912c
  • Loading branch information
@caolanm
caolanm committed Dec 17, 2024
1 parent 52d9c2e commit 68dcb90
Showing 1 changed file with 75 additions and 71 deletions.
146 changes: 75 additions & 71 deletions wsd/DocumentBroker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1473,17 +1473,30 @@ DocumentBroker::updateSessionWithWopiInfo(const std::shared_ptr<ClientSession>&
class PresetsInstallTask
{
private:
SocketPoll& _poll;
bool _reportedStatus;
bool _overallSuccess;
int _idCount;
std::string _configId;
std::string _presetsPath;
std::set<std::string> _installingPresets;
std::vector<std::function<void(bool)>> _installFinishedCBs;

public:
PresetsInstallTask(std::function<void(bool)> installFinishedCB)
: _reportedStatus(false)
, _overallSuccess(true)
void asyncInstall(const std::string& uri, const std::string& fileName)
{
appendCallback(installFinishedCB);
auto presetInstallFinished = [this](const std::string& id, bool presetResult)
{
installFinished(id, presetResult);
};

// just something unique for this resource
std::string id = std::to_string(_idCount++);

installStarted(id);

DocumentBroker::asyncInstallPreset(_poll, _configId,
uri, fileName, id,
presetInstallFinished);
}

void installStarted(const std::string& id)
Expand All @@ -1506,6 +1519,20 @@ class PresetsInstallTask
}
}

public:
PresetsInstallTask(SocketPoll& poll, const std::string& configId,
const std::string& presetsPath,
std::function<void(bool)> installFinishedCB)
: _poll(poll)
, _reportedStatus(false)
, _overallSuccess(true)
, _idCount(0)
, _configId(configId)
, _presetsPath(presetsPath)
{
appendCallback(installFinishedCB);
}

bool empty() const
{
return _installingPresets.empty();
Expand All @@ -1515,6 +1542,43 @@ class PresetsInstallTask
{
_installFinishedCBs.emplace_back(installFinishedCB);
}

void installGroup(Poco::JSON::Object::Ptr settings, const std::string& groupName)
{
if (auto group = settings->get(groupName).extract<Poco::JSON::Array::Ptr>())
{
for (std::size_t i = 0, count = group->size(); i < count; ++i)
{
auto elem = group->get(i).extract<Poco::JSON::Object::Ptr>();
if (!elem)
continue;

// TODO Are we potentially spamming here?
const std::string uri = JsonUtil::getJSONValue<std::string>(elem, "uri");
Poco::Path destDir(_presetsPath, groupName);
Poco::File(destDir).createDirectories();
std::string fileName =
Poco::Path(destDir.toString(),
Uri::getFilenameWithExtFromURL(uri))
.toString();

asyncInstall(uri, fileName);
}
}
}

void installXcu(Poco::JSON::Object::Ptr settings)
{
if (auto xcu = settings->get("xcu").extract<Poco::JSON::Object::Ptr>())
{
const std::string uri = JsonUtil::getJSONValue<std::string>(xcu, "uri");
Poco::Path destDir(_presetsPath, "xcu");
Poco::File(destDir).createDirectories();
std::string fileName = Poco::Path(destDir, "config.xcu").toString();

asyncInstall(uri, fileName);
}
}
};

void DocumentBroker::asyncInstallPresets(const std::shared_ptr<ClientSession> session,
Expand Down Expand Up @@ -1548,8 +1612,6 @@ DocumentBroker::asyncInstallPresets(SocketPoll& poll,
const std::string& presetsPath,
const std::function<void(bool)>& installFinishedCB)
{
auto presetTasks = std::make_shared<PresetsInstallTask>(installFinishedCB);

// Download the json for settings
const Poco::URI settingsUri{userSettingsUri};
std::shared_ptr<http::Session> httpSession(StorageConnectionManager::getHttpSession(settingsUri));
Expand All @@ -1561,6 +1623,9 @@ DocumentBroker::asyncInstallPresets(SocketPoll& poll,

std::string configId = Cache::getConfigId(userSettingsUri);

auto presetTasks = std::make_shared<PresetsInstallTask>(poll, configId, presetsPath,
installFinishedCB);

// When result arrives, extract uris of what we want to install to the jail's user presets
// and async download and install those.
http::Session::FinishedCallback finishedCallback =
Expand Down Expand Up @@ -1592,76 +1657,15 @@ DocumentBroker::asyncInstallPresets(SocketPoll& poll,

bool result = false;

auto presetInstallFinished = [presetTasks](const std::string& id, bool presetResult)
{
presetTasks->installFinished(id, presetResult);
};

const std::string& body = httpResponse->getBody();
Poco::JSON::Object::Ptr settings;
if (JsonUtil::parseJSON(body, settings))
{
result = true;

int idCount(0);

std::vector<PresetRequest> requests;

if (auto autotexts = settings->get("autotext").extract<Poco::JSON::Array::Ptr>())
{
for (std::size_t i = 0, count = autotexts->size(); i < count; ++i)
{
auto autotext = autotexts->get(i).extract<Poco::JSON::Object::Ptr>();
if (!autotext)
continue;
// TODO worry that we are potentially spamming here
const std::string uri = JsonUtil::getJSONValue<std::string>(autotext, "uri");
std::string fileName = Poco::Path(Poco::Path(presetsPath, "autotext").toString(),
Uri::getFilenameWithExtFromURL(uri)).toString();
std::string id = std::to_string(idCount++);
presetTasks->installStarted(id);
requests.emplace_back(uri, fileName, id);
}
}

// TODO: both autotexts and wordbooks are extracted the same way. create new method to extract preset and de-duplicate the code
if (auto wordbooks = settings->get("wordbook").extract<Poco::JSON::Array::Ptr>())
{
for (std::size_t i = 0, count = wordbooks->size(); i < count; ++i)
{
auto wordbook = wordbooks->get(i).extract<Poco::JSON::Object::Ptr>();
if (!wordbook)
continue;
// TODO worry that we are potentially spamming here
const std::string uri = JsonUtil::getJSONValue<std::string>(wordbook, "uri");
Poco::Path destDir(presetsPath, "wordbook");
Poco::File(destDir).createDirectories();
std::string fileName =
Poco::Path(destDir.toString(),
Uri::getFilenameWithExtFromURL(uri))
.toString();
std::string id = std::to_string(idCount++);
presetTasks->installStarted(id);
requests.emplace_back(uri, fileName, id);
}
}

if (auto xcu = settings->get("xcu").extract<Poco::JSON::Object::Ptr>())
{
const std::string uri = JsonUtil::getJSONValue<std::string>(xcu, "uri");
Poco::Path destDir(presetsPath, "xcu");
Poco::File(destDir).createDirectories();
std::string fileName = Poco::Path(destDir, "config.xcu").toString();
std::string id = std::to_string(idCount++);
presetTasks->installStarted(id);
requests.emplace_back(uri, fileName, id);
}

for (const auto& req : requests)
{
asyncInstallPreset(poll, configId, req._uri, req._fileName, req._id,
presetInstallFinished);
}
presetTasks->installGroup(settings, "autotext");
presetTasks->installGroup(settings, "wordbook");
presetTasks->installXcu(settings);
}
else
{
Expand Down

0 comments on commit 68dcb90

Please sign in to comment.