UnionFolder clobbered sub-paths in nested bundles.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index 4ae4950fefe672fb09144792f08e3468ad2f490f..40b1c8b1dd13417ec18c91b3c57583bc12e3b0de 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -3,8 +3,10 @@
 
 #include <cstdlib>
 #include <map>
 
 #include <cstdlib>
 #include <map>

+#include <sstream>

 #include <streambuf>
 #include <string>
 #include <streambuf>
 #include <string>

+#include <vector>

 
 namespace ldid {
 
 
 namespace ldid {
 


@@ -61,6 +63,8 @@ class DiskFolder :
 
     std::string Path(const std::string &path);
 
 
     std::string Path(const std::string &path);
 

+    void Find(const std::string &root, const std::string &base, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)>&code);
+

   public:
     DiskFolder(const std::string &path);
     ~DiskFolder();
   public:
     DiskFolder(const std::string &path);
     ~DiskFolder();


@@ -74,17 +78,51 @@ class SubFolder :
     public Folder
 {
   private:
     public Folder
 {
   private:

-    Folder *parent_;
+    Folder &parent_;

     std::string path_;
 
   public:
     std::string path_;
 
   public:

-    SubFolder(Folder *parent, const std::string &path);
+    SubFolder(Folder &parent, const std::string &path);
+
+    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
+    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
+    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
+};
+
+class UnionFolder :
+    public Folder
+{
+  private:
+    class StringBuffer :
+        public std::stringbuf
+    {
+      public:
+        StringBuffer() {
+        }
+
+        StringBuffer(const StringBuffer &rhs) :
+            std::stringbuf(rhs.str())
+        {
+        }
+    };
+
+    Folder &parent_;
+    std::map<std::string, StringBuffer> files_;
+
+  public:
+    UnionFolder(Folder &parent);

 
     virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
     virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);
 
     virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code);
     virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code);
     virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code);

+
+    std::stringbuf &operator [](const std::string &path) {
+        return files_[path];
+    }

 };
 
 };
 

+std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote, const std::string &entitlements);
+

 typedef std::map<uint32_t, std::vector<char>> Slots;
 
 void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots);
 typedef std::map<uint32_t, std::vector<char>> Slots;
 
 void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots);