Refactor InternalTask to take a functor

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 45c5a81fa9ba60533a0471b105a2a26c4d25d2c0..31e62100d9751d991a0bf59529dd7699973e8ac5 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -10,6 +10,7 @@
 #include "builder.h"
 #include "copy.h"
 #include "installedfile.h"
+#include "internaltask.h"
 
 using namespace std;
 using namespace Msp;
@@ -25,19 +26,17 @@ Target *Copy::create_target(const vector<Target *> &sources, const string &arg)
 Task *Copy::run(const Target &target) const
 {
        const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
-       Worker *worker = new Worker(install);
-       InternalTask *task = new InternalTask(worker);
+       InternalTask *task = new InternalTask([&install]{ return _run(install); });
        task->add_file(install.get_path());
        task->set_unlink();
        return task;
 }
 
-
-void Copy::Worker::main()
+bool Copy::_run(const InstalledFile &install)
 {
-       const FileTarget &source = target.get_source();
+       const FileTarget &source = install.get_source();
        const FS::Path &src_path = source.get_path();
-       const FS::Path &dst_path = target.get_path();
+       const FS::Path &dst_path = install.get_path();
 
        try
        {
@@ -55,8 +54,7 @@ void Copy::Worker::main()
        catch(const exception &e)
        {
                IO::print(IO::cerr, "%s\n", e.what());
-               status = Task::ERROR;
-               return;
+               return false;
        }
 
 #ifndef _WIN32
@@ -65,7 +63,7 @@ void Copy::Worker::main()
        if(stat(src_path.str().c_str(), &st)==0)
                chmod(dst_path.str().c_str(), st.st_mode&0777);
 
-       const FS::Path &link = target.get_symlink();
+       const FS::Path &link = install.get_symlink();
        if(!link.empty())
        {
                FS::Path relpath = FS::relative(dst_path, FS::dirname(link));
@@ -75,5 +73,5 @@ void Copy::Worker::main()
        }
 #endif
 
-       status = Task::SUCCESS;
+       return true;
 }