FileSourceZip implementation

src/FileSourceZip.cpp

@@ -1,28 +1,84 @@
 #include "FileSourceZip.h"
-#include "miniz.h"
 #include <cstdio>
+#include <cstdlib>
+
+extern "C" {
+#include "miniz.h"
+}
 
 namespace FileSystem {
 
-FileSourceZip::FileSourceZip(const std::string &zipPath) : FileSource(zipPath)
+class FileInfoZip : public FileInfo {
+public:
+	FileInfoZip(FileSourceZip *source, const std::string &path, FileType type) : FileInfo(source, path, type) {}
+};
+
+FileSourceZip::FileSourceZip(const std::string &zipPath) : FileSource(zipPath), m_archive(0)
 {
-	printf("FileSourceZip: %s\n", zipPath.c_str());
+	mz_zip_archive *zip = reinterpret_cast<mz_zip_archive*>(std::calloc(1, sizeof(mz_zip_archive)));
+	if (!mz_zip_reader_init_file(zip, zipPath.c_str(), 0)) {
+		printf("FileSourceZip: unable to open '%s'\n", zipPath.c_str());
+		std::free(zip);
+		return;
+	}
+
+	mz_zip_archive_file_stat zipStat;
+
+	Uint32 numFiles = mz_zip_reader_get_num_files(zip);
+	for (Uint32 i = 0; i < numFiles; i++) {
+		if (mz_zip_reader_file_stat(zip, i, &zipStat)) {
+			bool is_dir = mz_zip_reader_is_file_a_directory(zip, i);
+			if (!mz_zip_reader_is_file_encrypted(zip, i))
+				m_index.insert(std::make_pair(zipStat.m_filename, FileStat(i, zipStat.m_uncomp_size, FileInfoZip(this, zipStat.m_filename, is_dir ? FileInfo::FT_DIR : FileInfo::FT_FILE))));
+		}
+	}
+
+	m_archive = reinterpret_cast<void*>(zip);
 }
 
 FileSourceZip::~FileSourceZip()
 {
+	if (!m_archive) return;
+	mz_zip_archive *zip = reinterpret_cast<mz_zip_archive*>(m_archive);
+	mz_zip_reader_end(zip);
 }
 
 FileInfo FileSourceZip::Lookup(const std::string &path)
 {
+	FileMap::iterator i = m_index.find(path);
+	if (i == m_index.end()) return FileInfoZip(this, path, FileInfo::FT_NON_EXISTENT);
+	return (*i).second.info;
 }
 
 RefCountedPtr<FileData> FileSourceZip::ReadFile(const std::string &path)
 {
+	if (!m_archive) return RefCountedPtr<FileData>();
+	mz_zip_archive *zip = reinterpret_cast<mz_zip_archive*>(m_archive);
+
+	FileMap::iterator i = m_index.find(path);
+	if (i == m_index.end()) return RefCountedPtr<FileData>();
+
+	FileStat st = (*i).second;
+
+	char *data = reinterpret_cast<char*>(std::malloc(st.size));
+	if (!mz_zip_reader_extract_to_mem(zip, st.index, data, st.size, 0)) {
+		printf("FileSourceZip::ReadFile: couldn't extract '%s'\n", path.c_str());
+		return RefCountedPtr<FileData>();
+	}
+
+	return RefCountedPtr<FileData>(new FileDataMalloc(st.info, st.size, data));
 }
 
 bool FileSourceZip::ReadDirectory(const std::string &path, std::vector<FileInfo> &output)
 {
+	const std::string base(path+"/");
+	if (m_index.find(base) == m_index.end()) return false;
+
+	for (FileMap::iterator i = m_index.begin(); i != m_index.end(); ++i)
+		if ((*i).first.size() > base.size() && (*i).first.substr(0, base.size()) == base)
+			output.push_back((*i).second.info);
+
+	return true;
 }
 
 }

src/FileSourceZip.h

@@ -2,6 +2,9 @@
 #define _FILESOURCEZIP_H
 
 #include "FileSystem.h"
+#include <SDL_stdinc.h>
+#include <map>
+#include <string>
 
 namespace FileSystem {
 
@@ -14,7 +17,18 @@ public:
 	virtual RefCountedPtr<FileData> ReadFile(const std::string &path);
 	virtual bool ReadDirectory(const std::string &path, std::vector<FileInfo> &output);
 
-	static void Init();
+private:
+	void *m_archive;
+
+	struct FileStat {
+		FileStat(Uint32 _index, Uint64 _size, FileInfo _info) : index(_index), size(_size), info(_info) {}
+		const Uint32 index;
+		const Uint64 size;
+		const FileInfo info;
+	};
+
+	typedef std::map<std::string,FileStat> FileMap;
+	FileMap m_index;
 };
 
 }