Store offsets and sizes in PackSource as 64-bit ints

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

diff --git a/source/packsource.h b/source/packsource.h
index a599b5c0c99c985eaa8b834721f5158b8356b52d..35ec8b87a72eb54572057c04328a329e3d364dad 100644 (file)
--- a/source/packsource.h
+++ b/source/packsource.h
@@ -25,7 +25,7 @@ public:
        struct FileInfo
        {
                std::string name;
-               unsigned size;
+               IO::SeekOffset size;
        };
 
 private:
@@ -48,14 +48,16 @@ private:
 
        private:
                std::string filename;
-               unsigned base_offset;
+               IO::Seekable *io;
+               IO::SeekOffset base_offset;
                std::list<File> files;
 
        public:
-               Pack(const std::string &);
+               Pack(IO::Seekable *, const std::string &);
 
                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;
        };
@@ -75,11 +77,10 @@ private:
        private:
                const Pack &pack;
                std::string filename;
-               unsigned offset;
-               unsigned length;
+               IO::SeekOffset offset;
+               IO::SeekOffset length;
                bool collection;
                std::list<Object> objects;
-               bool loaded;
 
        public:
                File(const Pack &, const std::string &);
@@ -90,9 +91,6 @@ 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;
        };
 
@@ -123,6 +121,19 @@ 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;