X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpacksource.h;h=35ec8b87a72eb54572057c04328a329e3d364dad;hb=HEAD;hp=7d616614cff490690d73699f4a5b4f6a76a545f1;hpb=010737b64c8d4e7fcf0fe953ed15769eeac4178f;p=libs%2Fdatafile.git

diff --git a/source/packsource.h b/source/packsource.h
index 7d61661..d2194e0 100644
--- 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,18 +49,20 @@ private:
 
 	private:
 		std::string filename;
-		IO::Seekable *io;
-		unsigned base_offset;
+		IO::Seekable *io = nullptr;
+		IO::SeekOffset base_offset = 0;
 		std::list<File> files;
 
 	public:
 		Pack(IO::Seekable *, const std::string &);
+		Pack(const Pack &);
 
 		const std::string &get_filename() const { return filename; }
 		IO::Seekable *get_io() const { return io; }
-		unsigned get_base_offset() const { return base_offset; }
+		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
@@ -70,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; }
@@ -92,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; }
 	};
@@ -117,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 &);
@@ -141,10 +150,10 @@ 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