commit 208c70467e3c67af53d99436fda9cf56819a62a5
parent 85e18580919496378ea5e89edf67b23d6d9392f8
Author: cfillion <cfillion@users.noreply.github.com>
Date: Sat, 16 Sep 2017 20:16:28 -0400
split task implementations over a few files
Diffstat:
7 files changed, 255 insertions(+), 232 deletions(-)
diff --git a/src/archive_tasks.cpp b/src/archive_tasks.cpp
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "archive_tasks.hpp"
+#include "task.hpp"
#include "archive.hpp"
#include "config.hpp"
diff --git a/src/archive_tasks.hpp b/src/archive_tasks.hpp
@@ -1,36 +0,0 @@
-/* ReaPack: Package manager for REAPER
- * Copyright (C) 2015-2017 Christian Fillion
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef REAPACK_ARCHIVE_TASKS
-#define REAPACK_ARCHIVE_TASKS
-
-#include "task.hpp"
-
-class ExportTask : public Task {
-public:
- ExportTask(const std::string &path, Transaction *);
-
-protected:
- bool start() override;
- void commit() override;
- void rollback() override;
-
-private:
- TempPath m_path;
-};
-
-#endif
diff --git a/src/install.cpp b/src/install.cpp
@@ -0,0 +1,142 @@
+/* ReaPack: Package manager for REAPER
+ * Copyright (C) 2015-2017 Christian Fillion
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "task.hpp"
+
+#include "archive.hpp"
+#include "config.hpp"
+#include "download.hpp"
+#include "filesystem.hpp"
+#include "index.hpp"
+#include "reapack.hpp"
+#include "transaction.hpp"
+
+using namespace std;
+
+InstallTask::InstallTask(const Version *ver, const bool pin,
+ const Registry::Entry &re, const ArchiveReaderPtr &reader, Transaction *tx)
+ : Task(tx), m_version(ver), m_pin(pin), m_oldEntry(move(re)), m_reader(reader),
+ m_fail(false), m_index(ver->package()->category()->index()->shared_from_this())
+{
+}
+
+bool InstallTask::start()
+{
+ // get current files before overwriting the entry
+ m_oldFiles = tx()->registry()->getFiles(m_oldEntry);
+
+ // prevent file conflicts (don't worry, the registry push is reverted)
+ try {
+ vector<Path> conflicts;
+ tx()->registry()->push(m_version, &conflicts);
+
+ if(!conflicts.empty()) {
+ for(const Path &path : conflicts) {
+ tx()->receipt()->addError({"Conflict: " + path.join() +
+ " is already owned by another package", m_version->fullName()});
+ }
+
+ return false;
+ }
+ }
+ catch(const reapack_error &e) {
+ tx()->receipt()->addError({e.what(), m_version->fullName()});
+ return false;
+ }
+
+ for(const Source *src : m_version->sources()) {
+ const Path &targetPath = src->targetPath();
+
+ const auto &old = find_if(m_oldFiles.begin(), m_oldFiles.end(),
+ [&](const Registry::File &f) { return f.path == targetPath; });
+
+ if(old != m_oldFiles.end())
+ m_oldFiles.erase(old);
+
+ if(m_reader) {
+ FileExtractor *ex = new FileExtractor(targetPath, m_reader);
+ push(ex, ex->path());
+ }
+ else {
+ const NetworkOpts &opts = g_reapack->config()->network;
+ FileDownload *dl = new FileDownload(targetPath, src->url(), opts);
+ push(dl, dl->path());
+ }
+ }
+
+ return true;
+}
+
+void InstallTask::push(ThreadTask *job, const TempPath &path)
+{
+ job->onStart([=] { m_newFiles.push_back(path); });
+ job->onFinish([=] {
+ m_waiting.erase(job);
+
+ if(job->state() != ThreadTask::Success)
+ rollback();
+ });
+
+ m_waiting.insert(job);
+ tx()->threadPool()->push(job);
+}
+
+void InstallTask::commit()
+{
+ if(m_fail)
+ return;
+
+ for(const TempPath &paths : m_newFiles) {
+ if(!FS::rename(paths)) {
+ tx()->receipt()->addError({
+ String::format("Cannot rename to target: %s", FS::lastError()),
+ paths.target().join()});
+
+ // it's a bit late to rollback here as some files might already have been
+ // overwritten. at least we can delete the temporary files
+ rollback();
+ return;
+ }
+ }
+
+ for(const Registry::File &file : m_oldFiles) {
+ if(FS::remove(file.path))
+ tx()->receipt()->addRemoval(file.path);
+
+ tx()->registerFile({false, m_oldEntry, file});
+ }
+
+ tx()->receipt()->addInstall(m_version, m_oldEntry);
+
+ const Registry::Entry newEntry = tx()->registry()->push(m_version);
+
+ if(m_pin)
+ tx()->registry()->setPinned(newEntry, true);
+
+ tx()->registerAll(true, newEntry);
+}
+
+void InstallTask::rollback()
+{
+ for(const TempPath &paths : m_newFiles)
+ FS::removeRecursive(paths.temp());
+
+ for(ThreadTask *job : m_waiting)
+ job->abort();
+
+ m_fail = true;
+}
diff --git a/src/synchronize.cpp b/src/synchronize.cpp
@@ -0,0 +1,98 @@
+/* ReaPack: Package manager for REAPER
+ * Copyright (C) 2015-2017 Christian Fillion
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "task.hpp"
+
+#include "config.hpp"
+#include "download.hpp"
+#include "filesystem.hpp"
+#include "index.hpp"
+#include "reapack.hpp"
+#include "transaction.hpp"
+
+SynchronizeTask::SynchronizeTask(const Remote &remote, const bool fullSync,
+ const InstallOpts &opts, Transaction *tx)
+ : Task(tx), m_remote(remote), m_indexPath(Index::pathFor(m_remote.name())),
+ m_opts(opts), m_fullSync(fullSync)
+{
+}
+
+bool SynchronizeTask::start()
+{
+ const auto &netConfig = g_reapack->config()->network;
+
+ time_t mtime = 0, now = time(nullptr);
+ FS::mtime(m_indexPath, &mtime);
+
+ const time_t threshold = netConfig.staleThreshold;
+ if(!m_fullSync && mtime && (!threshold || mtime > now - threshold))
+ return true;
+
+ auto dl = new FileDownload(m_indexPath, m_remote.url(),
+ netConfig, Download::NoCacheFlag);
+ dl->setName(m_remote.name());
+
+ dl->onFinish([=] {
+ if(dl->save())
+ tx()->receipt()->setIndexChanged();
+ });
+
+ tx()->threadPool()->push(dl);
+ return true;
+}
+
+void SynchronizeTask::commit()
+{
+ if(!FS::exists(m_indexPath))
+ return;
+
+ const IndexPtr &index = tx()->loadIndex(m_remote); // TODO: reuse m_indexPath
+ if(!index || !m_fullSync)
+ return;
+
+ for(const Package *pkg : index->packages())
+ synchronize(pkg);
+
+ if(m_opts.promptObsolete && !m_remote.isProtected()) {
+ for(const auto &entry : tx()->registry()->getEntries(m_remote.name())) {
+ if(!entry.pinned && !index->find(entry.category, entry.package))
+ tx()->addObsolete(entry);
+ }
+ }
+}
+
+void SynchronizeTask::synchronize(const Package *pkg)
+{
+ const auto &entry = tx()->registry()->getEntry(pkg);
+
+ if(!entry && !m_opts.autoInstall)
+ return;
+
+ const Version *latest = pkg->lastVersion(m_opts.bleedingEdge, entry.version);
+
+ if(!latest)
+ return;
+
+ if(entry.version == latest->name()) {
+ if(FS::allFilesExists(latest->files()))
+ return; // latest version is really installed, nothing to do here!
+ }
+ else if(entry.pinned || latest->name() < entry.version)
+ return;
+
+ tx()->install(latest, entry);
+}
diff --git a/src/task.cpp b/src/task.cpp
@@ -28,199 +28,6 @@
using namespace std;
-Task::Task(Transaction *tx) : m_tx(tx)
-{
-}
-
-SynchronizeTask::SynchronizeTask(const Remote &remote, const bool fullSync,
- const InstallOpts &opts, Transaction *tx)
- : Task(tx), m_remote(remote), m_indexPath(Index::pathFor(m_remote.name())),
- m_opts(opts), m_fullSync(fullSync)
-{
-}
-
-bool SynchronizeTask::start()
-{
- printf("start\n");
- const auto &netConfig = g_reapack->config()->network;
-
- time_t mtime = 0, now = time(nullptr);
- FS::mtime(m_indexPath, &mtime);
-
- const time_t threshold = netConfig.staleThreshold;
- if(!m_fullSync && mtime && (!threshold || mtime > now - threshold))
- return true;
-
- auto dl = new FileDownload(m_indexPath, m_remote.url(),
- netConfig, Download::NoCacheFlag);
- dl->setName(m_remote.name());
-
- dl->onFinish([=] {
- if(dl->save())
- tx()->receipt()->setIndexChanged();
- });
-
- tx()->threadPool()->push(dl);
- return true;
-}
-
-void SynchronizeTask::commit()
-{
- if(!FS::exists(m_indexPath))
- return;
-
- const IndexPtr &index = tx()->loadIndex(m_remote); // TODO: reuse m_indexPath
- if(!index || !m_fullSync)
- return;
-
- for(const Package *pkg : index->packages())
- synchronize(pkg);
-
- if(m_opts.promptObsolete && !m_remote.isProtected()) {
- for(const auto &entry : tx()->registry()->getEntries(m_remote.name())) {
- if(!entry.pinned && !index->find(entry.category, entry.package))
- tx()->addObsolete(entry);
- }
- }
-}
-
-void SynchronizeTask::synchronize(const Package *pkg)
-{
- const auto &entry = tx()->registry()->getEntry(pkg);
-
- if(!entry && !m_opts.autoInstall)
- return;
-
- const Version *latest = pkg->lastVersion(m_opts.bleedingEdge, entry.version);
-
- if(!latest)
- return;
-
- if(entry.version == latest->name()) {
- if(FS::allFilesExists(latest->files()))
- return; // latest version is really installed, nothing to do here!
- }
- else if(entry.pinned || latest->name() < entry.version)
- return;
-
- printf("installing\n");
- tx()->install(latest, entry);
-}
-
-InstallTask::InstallTask(const Version *ver, const bool pin,
- const Registry::Entry &re, const ArchiveReaderPtr &reader, Transaction *tx)
- : Task(tx), m_version(ver), m_pin(pin), m_oldEntry(move(re)), m_reader(reader),
- m_fail(false), m_index(ver->package()->category()->index()->shared_from_this())
-{
-}
-
-bool InstallTask::start()
-{
- // get current files before overwriting the entry
- m_oldFiles = tx()->registry()->getFiles(m_oldEntry);
-
- // prevent file conflicts (don't worry, the registry push is reverted)
- try {
- vector<Path> conflicts;
- tx()->registry()->push(m_version, &conflicts);
-
- if(!conflicts.empty()) {
- for(const Path &path : conflicts) {
- tx()->receipt()->addError({"Conflict: " + path.join() +
- " is already owned by another package", m_version->fullName()});
- }
-
- return false;
- }
- }
- catch(const reapack_error &e) {
- tx()->receipt()->addError({e.what(), m_version->fullName()});
- return false;
- }
-
- for(const Source *src : m_version->sources()) {
- const Path &targetPath = src->targetPath();
-
- const auto &old = find_if(m_oldFiles.begin(), m_oldFiles.end(),
- [&](const Registry::File &f) { return f.path == targetPath; });
-
- if(old != m_oldFiles.end())
- m_oldFiles.erase(old);
-
- if(m_reader) {
- FileExtractor *ex = new FileExtractor(targetPath, m_reader);
- push(ex, ex->path());
- }
- else {
- const NetworkOpts &opts = g_reapack->config()->network;
- FileDownload *dl = new FileDownload(targetPath, src->url(), opts);
- push(dl, dl->path());
- }
- }
-
- return true;
-}
-
-void InstallTask::push(ThreadTask *job, const TempPath &path)
-{
- job->onStart([=] { m_newFiles.push_back(path); });
- job->onFinish([=] {
- m_waiting.erase(job);
-
- if(job->state() != ThreadTask::Success)
- rollback();
- });
-
- m_waiting.insert(job);
- tx()->threadPool()->push(job);
-}
-
-void InstallTask::commit()
-{
- if(m_fail)
- return;
-
- for(const TempPath &paths : m_newFiles) {
- if(!FS::rename(paths)) {
- tx()->receipt()->addError({
- String::format("Cannot rename to target: %s", FS::lastError()),
- paths.target().join()});
-
- // it's a bit late to rollback here as some files might already have been
- // overwritten. at least we can delete the temporary files
- rollback();
- return;
- }
- }
-
- for(const Registry::File &file : m_oldFiles) {
- if(FS::remove(file.path))
- tx()->receipt()->addRemoval(file.path);
-
- tx()->registerFile({false, m_oldEntry, file});
- }
-
- tx()->receipt()->addInstall(m_version, m_oldEntry);
-
- const Registry::Entry newEntry = tx()->registry()->push(m_version);
-
- if(m_pin)
- tx()->registry()->setPinned(newEntry, true);
-
- tx()->registerAll(true, newEntry);
-}
-
-void InstallTask::rollback()
-{
- for(const TempPath &paths : m_newFiles)
- FS::removeRecursive(paths.temp());
-
- for(ThreadTask *job : m_waiting)
- job->abort();
-
- m_fail = true;
-}
-
UninstallTask::UninstallTask(const Registry::Entry &re, Transaction *tx)
: Task(tx), m_entry(move(re))
{
diff --git a/src/task.hpp b/src/task.hpp
@@ -40,7 +40,7 @@ typedef std::shared_ptr<const Index> IndexPtr;
class Task {
public:
- Task(Transaction *parent);
+ Task(Transaction *parent) : m_tx(parent) {}
virtual ~Task() {}
virtual bool start() { return true; }
@@ -126,4 +126,17 @@ private:
bool m_pin;
};
+class ExportTask : public Task {
+public:
+ ExportTask(const std::string &path, Transaction *);
+
+protected:
+ bool start() override;
+ void commit() override;
+ void rollback() override;
+
+private:
+ TempPath m_path;
+};
+
#endif
diff --git a/src/transaction.cpp b/src/transaction.cpp
@@ -17,7 +17,6 @@
#include "transaction.hpp"
-#include "archive_tasks.hpp"
#include "config.hpp"
#include "download.hpp"
#include "errors.hpp"
