Simplify the callback mechanism

2018-05-30 13:34:37 +02:00
parent 1672bcd230
commit 81ea8bd5ce
16 changed files with 152 additions and 180 deletions
@@ -35,17 +35,14 @@ protected:
        const std::string & mimeType) override;

    void getFile(const std::string & path,
-        std::function<void(std::shared_ptr<std::string>)> success,
-        std::function<void(std::exception_ptr exc)> failure) override
+        Callback<std::shared_ptr<std::string>> callback) override
    {
-        sync2async<std::shared_ptr<std::string>>(success, failure, [&]() {
-            try {
-                return std::make_shared<std::string>(readFile(binaryCacheDir + "/" + path));
-            } catch (SysError & e) {
-                if (e.errNo == ENOENT) return std::shared_ptr<std::string>();
-                throw;
-            }
-        });
+        try {
+            // FIXME: O(n) space
+            callback(std::make_shared<std::string>(readFile(binaryCacheDir + "/" + path)));
+        } catch (SysError & e) {
+            if (e.errNo == ENOENT) callback(nullptr); else callback.rethrow();
+        } catch (...) { callback.rethrow(); }
    }

    PathSet queryAllValidPaths() override