Cosmetic changes

[libs/datafile.git] / source / packsource.h

diff --git a/source/packsource.h b/source/packsource.h
index a599b5c0c99c985eaa8b834721f5158b8356b52d..d2194e044ca6739ca889f4ed7e61e1f4b8f8a6e7 100644 (file)
--- a/source/packsource.h
+++ b/source/packsource.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_PACKSOURCE_H_
 #define MSP_DATAFILE_PACKSOURCE_H_
 
+#include <msp/core/noncopyable.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
 #include "objectloader.h"
@@ -25,7 +26,7 @@ public:
        struct FileInfo
        {
                std::string name;
-               unsigned size;
+               IO::SeekOffset size = 0;
        };
 
 private:
@@ -48,16 +49,20 @@ private:
 
        private:
                std::string filename;
-               unsigned base_offset;
+               IO::Seekable *io = nullptr;
+               IO::SeekOffset base_offset = 0;
                std::list<File> files;
 
        public:
-               Pack(const std::string &);
+               Pack(IO::Seekable *, const std::string &);
+               Pack(const Pack &);
 
                const std::string &get_filename() const { return filename; }
-               unsigned get_base_offset() const { return base_offset; }
+               IO::Seekable *get_io() const { return io; }
+               IO::SeekOffset get_base_offset() const { return base_offset; }
 
                void collect_files(FileMap &, const std::string &) const;
+               void translate_files(FileMap &, const Pack &) const;
        };
 
        class File
@@ -68,21 +73,21 @@ private:
                public:
                        Loader(File &);
                private:
-                       virtual void finish();
+                       void finish() override;
                        void object(const std::string &, const std::string &);
                };
 
        private:
                const Pack &pack;
                std::string filename;
-               unsigned offset;
-               unsigned length;
-               bool collection;
+               IO::SeekOffset offset = 0;
+               IO::SeekOffset length = 0;
+               bool collection = false;
                std::list<Object> objects;
-               bool loaded;
 
        public:
                File(const Pack &, const std::string &);
+               File(const File &, const Pack &);
 
                RefPtr<IO::Seekable> open() const;
                const std::string &get_filename() const { return filename; }
@@ -90,23 +95,22 @@ private:
                std::string get_full_name() const;
                bool is_collection() const { return collection; }
 
-               void set_loaded();
-               bool is_loaded() const { return loaded; }
-
                void collect_objects(ObjectMap &) const;
+               void translate_objects(ObjectMap &, const File &) const;
        };
 
        class Object
        {
        private:
-               File &file;
+               const File &file;
                std::string name;
                std::string keyword;
 
        public:
-               Object(File &, const std::string &, const std::string &);
+               Object(const File &, const std::string &, const std::string &);
+               Object(const Object &, const File &);
 
-               File &get_file() const { return file; }
+               const File &get_file() const { return file; }
                const std::string &get_name() const { return name; }
                const std::string &get_keyword() const { return keyword; }
        };
@@ -115,6 +119,13 @@ private:
        FileMap files;
        ObjectMap objects;
 
+public:
+       PackSource() = default;
+       PackSource(const PackSource &);
+       PackSource &operator=(const PackSource &);
+private:
+       void translate_maps(const PackSource &);
+
 public:
        /// Adds a pack file to load objects from.  The index is read immediately.
        void add_pack_file(const std::string &);
@@ -123,13 +134,26 @@ public:
        read on the first call; subsequent calls will use cached data. */
        void add_pack_file(const std::string &, const std::string &);
 
+       /** Adds a pack from an existing seekable I/O object.  The same object is
+       used for all accesses to the pack, so it must not be deleted before the
+       PackSource. */
+       void add_pack_io(IO::Seekable &, const std::string & = std::string());
+
+       /** Adds a pack from an I/O object with a regex to filter logical files.
+       Multiple filters for the same I/O object can be added with repeated calls. */
+       void add_pack_io(IO::Seekable &, const std::string &, const std::string &);
+
+private:
+       void add_pack(IO::Seekable *, const std::string &, const std::string &);
+
+public:
        /// Returns information about the files in the pack.
        std::list<FileInfo> list_files() const;
 
-       virtual bool is_loadable(const CollectionItemTypeBase &, const std::string &) const;
-       virtual NameList get_names(const CollectionItemTypeBase &) const;
-       virtual void load(Collection &, const CollectionItemTypeBase &, const std::string &) const;
-       virtual IO::Seekable *open(const std::string &) const;
+       bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;
+       NameList get_names(const CollectionItemTypeBase &) const override;
+       void load(Collection &, const CollectionItemTypeBase &, const std::string &) const override;
+       IO::Seekable *open(const std::string &) const override;
 };
 
 } // namespace DataFile