aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move updater setup to separate function

Browse Source
This commit is contained in:
Gres 2020-03-28 13:44:45 +03:00
parent c2a1dab1c7
commit 87987f4a71
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/manager.cpp
View File

@ -72,18 +72,7 @@ void Manager::updateSettings()
LTRACE() << "updateSettings";
SOFT_ASSERT(settings_, return );
setupProxy(*settings_);
updater_->model()->setExpansions({
{"$translators$", settings_->translatorsDir},
{"$tessdata$", settings_->tessdataPath},
});
if (settings_->autoUpdateIntervalDays > 0) {
updateAutoChecker_ = std::make_unique<update::AutoChecker>(*updater_);
updateAutoChecker_->setLastCheckDate(settings_->lastUpdateCheck);
updateAutoChecker_->setCheckIntervalDays(settings_->autoUpdateIntervalDays);
} else {
updateAutoChecker_.reset();
}
setupUpdates(*settings_);
tray_->updateSettings();
capturer_->updateSettings();
@ -118,6 +107,22 @@ void Manager::setupProxy(const Settings &settings)
QNetworkProxy::setApplicationProxy(proxy);
}
void Manager::setupUpdates(const Settings &settings)
{
updater_->model()->setExpansions({
{"$translators$", settings.translatorsDir},
{"$tessdata$", settings.tessdataPath},
});
if (settings.autoUpdateIntervalDays > 0) {
updateAutoChecker_ = std::make_unique<update::AutoChecker>(*updater_);
updateAutoChecker_->setLastCheckDate(settings.lastUpdateCheck);
updateAutoChecker_->setCheckIntervalDays(settings.autoUpdateIntervalDays);
} else {
updateAutoChecker_.reset();
}
}
void Manager::finishTask(const TaskPtr &task)
{
SOFT_ASSERT(task, return );

1
src/manager.h
View File

@ -29,6 +29,7 @@ public:
private:
void updateSettings();
void setupProxy(const Settings &settings);
void setupUpdates(const Settings &settings);
void finishTask(const TaskPtr &task);
std::unique_ptr<Settings> settings_;