Improve, but not really fix :/, support for macOS.

[ldid.git] / ldid.hpp

diff --git a/ldid.hpp b/ldid.hpp
index b7bbdaf8b25041182680bd09de72bdfc5f8c525a..7f2f3285ebcdd1bb1decfae287ef9a1cf8f8e8e7 100644 (file)
--- a/ldid.hpp
+++ b/ldid.hpp
@@ -3,8 +3,11 @@
 
 #include <cstdlib>
 #include <map>
 
 #include <cstdlib>
 #include <map>

+#include <set>
+#include <sstream>

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

+#include <vector>

 
 namespace ldid {
 
 
 namespace ldid {
 


@@ -45,11 +48,17 @@ FunctorImpl<decltype(&Function_::operator())> fun(const Function_ &value) {
     return value;
 }
 
     return value;
 }
 

+struct Progress {
+    virtual void operator()(const std::string &value) const = 0;
+    virtual void operator()(double value) const = 0;
+};
+

 class Folder {
   public:
 class Folder {
   public:

-    virtual void Save(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
-    virtual bool Open(const std::string &path, const Functor<void (std::streambuf &)> &code) = 0;
-    virtual void Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code) = 0;
+    virtual void Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code) = 0;
+    virtual bool Look(const std::string &path) const = 0;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const = 0;
+    virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const = 0;

 };
 
 class DiskFolder :
 };
 
 class DiskFolder :


@@ -59,17 +68,20 @@ class DiskFolder :
     const std::string path_;
     std::map<std::string, std::string> commit_;
 
     const std::string path_;
     std::map<std::string, std::string> commit_;
 

-    std::string Path(const std::string &path);
+  protected:
+    std::string Path(const std::string &path) const;

 
 

-    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);
+  private:
+    void Find(const std::string &root, const std::string &base, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;

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

-    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, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
+    virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;

 };
 
 class SubFolder :
 };
 
 class SubFolder :


@@ -82,35 +94,72 @@ class SubFolder :
   public:
     SubFolder(Folder &parent, const std::string &path);
 
   public:
     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);
+    std::string Path(const std::string &path) const;
+
+    virtual void Save(const std::string &path, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
+    virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;

 };
 
 class UnionFolder :
     public Folder
 {
   private:
 };
 
 class UnionFolder :
     public Folder
 {
   private:

+    struct Reset {
+        const void *flag_;
+        std::streambuf *data_;
+    };
+

     Folder &parent_;
     Folder &parent_;

-    std::map<std::string, std::stringbuf> files_;
+    std::set<std::string> deletes_;
+
+    std::map<std::string, std::string> remaps_;
+    mutable std::map<std::string, Reset> resets_;
+
+    std::string Map(const std::string &path) const;
+    void Map(const std::string &path, const Functor<void (const std::string &)> &code, const std::string &file, const Functor<void (const Functor<void (std::streambuf &, size_t, const void *)> &)> &save) const;

 
   public:
     UnionFolder(Folder &parent);
 
 
   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, bool edit, const void *flag, const Functor<void (std::streambuf &)> &code);
+    virtual bool Look(const std::string &path) const;
+    virtual void Open(const std::string &path, const Functor<void (std::streambuf &, size_t, const void *)> &code) const;
+    virtual void Find(const std::string &path, const Functor<void (const std::string &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) const;

 
 

-    std::stringbuf &operator [](const std::string &path) {
-        return files_[path];
+    void operator ()(const std::string &from) {
+        deletes_.insert(from);

     }
     }

+
+    void operator ()(const std::string &from, const std::string &to) {
+        operator ()(from);
+        remaps_[to] = from;
+    }
+
+    void operator ()(const std::string &from, const void *flag, std::streambuf &data) {
+        operator ()(from);
+        auto &reset(resets_[from]);
+        reset.flag_ = flag;
+        reset.data_ = &data;
+    }
+};
+
+struct Hash {
+    uint8_t sha1_[0x14];
+    uint8_t sha256_[0x20];
+};
+
+struct Bundle {
+    std::string path;
+    Hash hash;

 };
 
 };
 

-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, std::vector<char>> &remote);
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress);

 
 

-typedef std::map<uint32_t, std::vector<char>> Slots;
+typedef std::map<uint32_t, Hash> 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);
+Hash Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, bool merge, const std::string &requirements, const std::string &key, const Slots &slots, uint32_t flags, bool platform, const Progress &progress);

 
 }
 
 
 }