Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

VFS: Add support for opening zip files through a Content URI

Browse Source
This commit is contained in:
Henrik Rydgård 2023-03-06 16:34:52 +01:00
parent 53172eff63
commit ac94d3febf
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Common/File/VFS/ZipFileReader.cpp
View File

@ -13,6 +13,7 @@
#include "Common/Common.h"
#include "Common/Log.h"
#include "Common/File/VFS/ZipFileReader.h"
#include "Common/StringUtils.h"
static uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size) {
// Figure out the file size first.
@ -33,21 +34,17 @@ static uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size) {
return contents;
}
ZipFileReader::ZipFileReader(const char *zip_file, const char *in_zip_path) {
zip_file_ = zip_open(zip_file, 0, NULL);
strcpy(in_zip_path_, in_zip_path);
if (!zip_file_) {
ERROR_LOG(IO, "Failed to open %s as a zip file", zip_file);
ZipFileReader::ZipFileReader(const Path &zipFile, const char *inZipPath) {
int error = 0;
if (zipFile.Type() == PathType::CONTENT_URI) {
int fd = File::OpenFD(zipFile, File::OPEN_READ);
zip_file_ = zip_fdopen(fd, 0, &error);
} else {
zip_file_ = zip_open(zipFile.c_str(), 0, &error);
}
std::vector<File::FileInfo> info;
GetFileListing("assets", &info, 0);
for (size_t i = 0; i < info.size(); i++) {
if (info[i].isDirectory) {
DEBUG_LOG(IO, "Directory: %s", info[i].name.c_str());
} else {
DEBUG_LOG(IO, "File: %s", info[i].name.c_str());
}
truncate_cpy(inZipPath_, inZipPath);
if (!zip_file_) {
ERROR_LOG(IO, "Failed to open %s as a zip file", zipFile.c_str());
}
}
@ -58,7 +55,7 @@ ZipFileReader::~ZipFileReader() {
uint8_t *ZipFileReader::ReadFile(const char *path, size_t *size) {
char temp_path[2048];
snprintf(temp_path, sizeof(temp_path), "%s%s", in_zip_path_, path);
snprintf(temp_path, sizeof(temp_path), "%s%s", inZipPath_, path);
std::lock_guard<std::mutex> guard(lock_);
return ReadFromZip(zip_file_, temp_path, size);
@ -66,7 +63,7 @@ uint8_t *ZipFileReader::ReadFile(const char *path, size_t *size) {
bool ZipFileReader::GetFileListing(const char *orig_path, std::vector<File::FileInfo> *listing, const char *filter = 0) {
char path[2048];
snprintf(path, sizeof(path), "%s%s", in_zip_path_, orig_path);
snprintf(path, sizeof(path), "%s%s", inZipPath_, orig_path);
std::set<std::string> filters;
std::string tmp;
@ -94,7 +91,7 @@ bool ZipFileReader::GetFileListing(const char *orig_path, std::vector<File::File
info.name = *diter;
// Remove the "inzip" part of the fullname.
info.fullName = Path(std::string(path).substr(strlen(in_zip_path_))) / *diter;
info.fullName = Path(std::string(path).substr(strlen(inZipPath_))) / *diter;
info.exists = true;
info.isWritable = false;
info.isDirectory = true;
@ -105,7 +102,7 @@ bool ZipFileReader::GetFileListing(const char *orig_path, std::vector<File::File
std::string fpath = path;
File::FileInfo info;
info.name = *fiter;
info.fullName = Path(std::string(path).substr(strlen(in_zip_path_))) / *fiter;
info.fullName = Path(std::string(path).substr(strlen(inZipPath_))) / *fiter;
info.exists = true;
info.isWritable = false;
info.isDirectory = false;
@ -151,7 +148,7 @@ void ZipFileReader::GetZipListings(const char *path, std::set<std::string> &file
bool ZipFileReader::GetFileInfo(const char *path, File::FileInfo *info) {
struct zip_stat zstat;
char temp_path[1024];
snprintf(temp_path, sizeof(temp_path), "%s%s", in_zip_path_, path);
snprintf(temp_path, sizeof(temp_path), "%s%s", inZipPath_, path);
if (0 != zip_stat(zip_file_, temp_path, ZIP_FL_NOCASE | ZIP_FL_UNCHANGED, &zstat)) {
// ZIP files do not have real directories, so we'll end up here if we
// try to stat one. For now that's fine.

6
Common/File/VFS/ZipFileReader.h
View File

@ -16,14 +16,14 @@
class ZipFileReader : public VFSBackend {
public:
ZipFileReader(const char *zip_file, const char *in_zip_path);
ZipFileReader(const Path &zipFile, const char *inZipPath);
~ZipFileReader();
// use delete[] on the returned value.
uint8_t *ReadFile(const char *path, size_t *size) override;
bool GetFileListing(const char *path, std::vector<File::FileInfo> *listing, const char *filter) override;
bool GetFileInfo(const char *path, File::FileInfo *info) override;
std::string toString() const override {
return in_zip_path_;
return inZipPath_;
}
private:
@ -31,5 +31,5 @@ private:
zip *zip_file_;
std::mutex lock_;
char in_zip_path_[256];
char inZipPath_[256];
};

4
android/jni/app-android.cpp
View File

@ -695,8 +695,8 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init
androidVersion = jAndroidVersion;
deviceType = jdeviceType;
std::string apkPath = GetJavaString(env, japkpath);
g_VFS.Register("", new ZipFileReader(apkPath.c_str(), "assets/"));
Path apkPath(GetJavaString(env, japkpath));
g_VFS.Register("", new ZipFileReader(apkPath, "assets/"));
systemName = GetJavaString(env, jmodel);
langRegion = GetJavaString(env, jlangRegion);