X-Git-Url: https://git.saurik.com/ldid.git/blobdiff_plain/8dfe0afc0d0d6b99d433e62c83485fe3fb97fb76..886cb3f1cf485d307519e2024ef141314d42e713:/ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index c59ecdb..33b1859 100644
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1643,22 +1643,57 @@ void DiskFolder::Find(const std::string &path, const Functor<void (const std::st
     Find(path, "", code);
 }
 
-SubFolder::SubFolder(Folder *parent, const std::string &path) :
+SubFolder::SubFolder(Folder &parent, const std::string &path) :
     parent_(parent),
     path_(path)
 {
 }
 
 void SubFolder::Save(const std::string &path, const Functor<void (std::streambuf &)> &code) {
-    return parent_->Save(path_ + path, code);
+    return parent_.Save(path_ + path, code);
 }
 
 bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &)> &code) {
-    return parent_->Open(path_ + path, code);
+    return parent_.Open(path_ + path, code);
 }
 
 void SubFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
-    return parent_->Find(path_ + path, code);
+    return parent_.Find(path_ + path, code);
+}
+
+UnionFolder::UnionFolder(Folder &parent) :
+    parent_(parent)
+{
+}
+
+void UnionFolder::Save(const std::string &path, const Functor<void (std::streambuf &)> &code) {
+    return parent_.Save(path, code);
+}
+
+bool UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &)> &code) {
+    auto file(files_.find(path));
+    if (file == files_.end())
+        return parent_.Open(path, code);
+
+    auto &data(file->second);
+    data.pubseekpos(0, std::ios::in);
+    code(data);
+    return true;
+}
+
+void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) {
+    parent_.Find(path, fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &save) {
+        if (files_.find(name) == files_.end())
+            code(name, save);
+    }));
+
+    for (auto &file : files_)
+        code(file.first, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
+            parent_.Save(file.first, fun([&](std::streambuf &save) {
+                file.second.pubseekpos(0, std::ios::in);
+                code(file.second, save);
+            }));
+        }));
 }
 
 static size_t copy(std::streambuf &source, std::streambuf &target) {
@@ -1837,7 +1872,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
         if (!nested(name))
             return;
         auto bundle(root + Split(name).dir);
-        SubFolder subfolder(&folder, bundle);
+        SubFolder subfolder(folder, bundle);
         Bundle(bundle, subfolder, key, local);
     }));