Remove the loaded flag from PackSource files

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

diff --git a/source/packsource.h b/source/packsource.h
index 10e1433279aaa36dee9b1dda39938af5ab6a42b2..6912a40047edfb1110ef4d31ce867bb5bdceee4f 100644 (file)
--- a/source/packsource.h
+++ b/source/packsource.h
@@ -21,9 +21,16 @@ in is loaded.
 */
 class PackSource: public CollectionSource
 {
+public:
+       struct FileInfo
+       {
+               std::string name;
+               unsigned size;
+       };
+
 private:
        class File;
-       struct Object;
+       class Object;
 
        typedef std::map<std::string, const File *> FileMap;
        typedef std::map<std::string, const Object *> ObjectMap;
@@ -41,13 +48,15 @@ private:
 
        private:
                std::string filename;
+               IO::Seekable *io;
                unsigned 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; }
+               IO::Seekable *get_io() const { return io; }
                unsigned get_base_offset() const { return base_offset; }
 
                void collect_files(FileMap &, const std::string &) const;
@@ -72,19 +81,16 @@ private:
                unsigned length;
                bool collection;
                std::list<Object> objects;
-               bool loaded;
 
        public:
                File(const Pack &, const std::string &);
 
                RefPtr<IO::Seekable> open() const;
                const std::string &get_filename() const { return filename; }
+               FileInfo get_info() const;
                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;
        };
 
@@ -115,6 +121,22 @@ 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;