DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-06 16:49:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Improve extraction

Browse Source
This commit is contained in:
Epicpkmn11
2020-04-27 23:25:20 -05:00
parent ce4c6bd6d4
commit c84ef3dca5
1 changed files with 49 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/utils/extract.cpp
+40 -54
View File
@@ -39,81 +39,67 @@ u64 extractSize = 0;
u64 writeOffset = 0; u64 writeOffset = 0;
Result extractArchive(std::string archivePath, std::string wantedFile, std::string outputPath) { Result extractArchive(std::string archivePath, std::string wantedFile, std::string outputPath) {
extractSize = 0; extractSize = 0, writeOffset = 0, filesExtracted = 0;
writeOffset = 0;
archive_entry *entry;
archive *a = archive_read_new(); archive *a = archive_read_new();
archive_entry *entry;
int flags;
/* Select which attributes we want to restore. */
flags = ARCHIVE_EXTRACT_TIME;
flags |= ARCHIVE_EXTRACT_PERM;
flags |= ARCHIVE_EXTRACT_ACL;
flags |= ARCHIVE_EXTRACT_FFLAGS;
a = archive_read_new();
archive_read_support_format_all(a); archive_read_support_format_all(a);
archive_read_support_format_raw(a);
if(archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) { if(archive_read_open_filename(a, archivePath.c_str(), 0x4000) != ARCHIVE_OK) {
Logging::writeToLog("EXTRACT_ERROR_ARCHIVE"); return EXTRACT_ERROR_OPENFILE;
return EXTRACT_ERROR_ARCHIVE;
} }
Result ret = EXTRACT_ERROR_FIND;
while(archive_read_next_header(a, &entry) == ARCHIVE_OK) { while(archive_read_next_header(a, &entry) == ARCHIVE_OK) {
std::string entryName(archive_entry_pathname(entry)); if(archive_entry_size(entry) > 0) { // Ignore folders
std::smatch match; std::smatch match;
std::string entryName(archive_entry_pathname(entry));
if(std::regex_search(entryName, match, std::regex(wantedFile))) { if(std::regex_search(entryName, match, std::regex(wantedFile))) {
extractingFile = (entryName.length() > wantedFile.length() ? entryName.substr(wantedFile.length()) : wantedFile); extractingFile = outputPath + match.suffix().str();
ret = EXTRACT_ERROR_NONE;
// make directories // make directories
std::string out = (outputPath + match.suffix().str());
int substrPos = 1; int substrPos = 1;
while(out.find("/", substrPos)) { while(extractingFile.find("/", substrPos)) {
mkdir(out.substr(0, substrPos).c_str(), 0777); mkdir(extractingFile.substr(0, substrPos).c_str(), 0777);
Logging::writeToLog(out.substr(0, substrPos)); substrPos = extractingFile.find("/", substrPos) + 1;
substrPos = out.find("/", substrPos)+1;
} }
Handle fileHandle; uint sizeLeft = archive_entry_size(entry);
Result res = openFile(&fileHandle, (outputPath + match.suffix().str()).c_str(), true); extractSize = sizeLeft;
if (R_FAILED(res)) {
Logging::writeToLog("EXTRACT_ERROR_OPENFILE");
ret = EXTRACT_ERROR_OPENFILE;
break;
}
u64 fileSize = archive_entry_size(entry);
extractSize = fileSize; // Get Size.
u32 toRead = 0x30000;
u8 * buf = (u8 *)memalign(0x1000, toRead);
if (buf == NULL) {
Logging::writeToLog("EXTRACT_ERROR_ALLOC");
ret = EXTRACT_ERROR_ALLOC;
FSFILE_Close(fileHandle);
break;
}
u32 bytesWritten = 0;
writeOffset = 0; writeOffset = 0;
do { FILE *file = fopen(extractingFile.c_str(), "wb");
if (toRead > fileSize) toRead = fileSize; if(!file) {
ssize_t size = archive_read_data(a, buf, toRead); return EXTRACT_ERROR_WRITEFILE;
if (size < 0) {
Logging::writeToLog("EXTRACT_ERROR_READFILE");
ret = EXTRACT_ERROR_READFILE;
break;
}
res = FSFILE_Write(fileHandle, &bytesWritten, writeOffset, buf, toRead, 0);
if (R_FAILED(res)) {
Logging::writeToLog("EXTRACT_ERROR_WRITEFILE");
ret = EXTRACT_ERROR_WRITEFILE;
break;
} }
writeOffset += bytesWritten; u8 *buf = new u8[0x30000];
fileSize -= bytesWritten; if(buf == nullptr) {
} while(fileSize); return EXTRACT_ERROR_ALLOC;
FSFILE_Close(fileHandle); }
free(buf);
while(sizeLeft > 0) {
u64 toRead = std::min(0x30000u, sizeLeft);
ssize_t size = archive_read_data(a, buf, toRead);
fwrite(buf, 1, size, file);
sizeLeft -= size;
writeOffset += size;
filesExtracted++; filesExtracted++;
} }
fclose(file);
delete[] buf;
}
}
} }
archive_read_close(a);
archive_read_free(a); archive_read_free(a);
return ret; return EXTRACT_ERROR_NONE;
} }