From a8851a51f19577f153a3fa5d1021be5794f0921a Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Oct 2020 23:41:26 +0100 Subject: Switch to libarchive --- src/frontend/qt_sdl/ArchiveUtil.cpp | 101 ++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 src/frontend/qt_sdl/ArchiveUtil.cpp (limited to 'src/frontend/qt_sdl/ArchiveUtil.cpp') diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp new file mode 100644 index 0000000..6457b4f --- /dev/null +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -0,0 +1,101 @@ +/* + Copyright 2016-2020 Arisotura, WaluigiWare64 + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + +#include "ArchiveUtil.h" + +namespace Archive +{ + +QVector ListArchive(const char* path) +{ + struct archive *a; + struct archive_entry *entry; + int r; + + QVector fileList = {"OK"}; + + a = archive_read_new(); + archive_read_support_filter_all(a); + archive_read_support_format_all(a); + r = archive_read_open_filename(a, path, 10240); + if (r != ARCHIVE_OK) + { + return QVector {"Err"}; + } + + while (archive_read_next_header(a, &entry) == ARCHIVE_OK) + { + fileList.push_back(archive_entry_pathname(entry)); + archive_read_data_skip(a); + } + archive_read_close(a); + archive_read_free(a); + if (r != ARCHIVE_OK) + { + return QVector {"Err"}; + } + + return fileList; +} + +QVector ExtractFileFromArchive(const char* path, const char* wantedFile) +{ + struct archive *a = archive_read_new(); + struct archive_entry *entry; + int r; + + archive_read_support_format_all(a); + archive_read_support_filter_all(a); + + r = archive_read_open_filename(a, path, 10240); + if (r != ARCHIVE_OK) + { + return QVector {"Err"}; + } + while (archive_read_next_header(a, &entry) == ARCHIVE_OK) { + if (wantedFile == nullptr) + { + break; + } + if (strcmp(wantedFile, archive_entry_pathname(entry)) == 0) + { + break; + } + } + size_t bytesToWrite = archive_entry_size(entry); + auto archiveBuffer = std::make_unique(bytesToWrite); + ssize_t bytesRead = archive_read_data(a, archiveBuffer.get(), bytesToWrite); + if (bytesRead < 0) + { + printf(archive_error_string(a)); + archiveBuffer.reset(nullptr); + return QVector {"Err", archive_error_string(a)}; + } + + const char* fileToWrite = archive_entry_pathname(entry); + std::ofstream(fileToWrite, std::ofstream::binary).write((char*)archiveBuffer.get(), bytesToWrite); + + archiveBuffer.reset(nullptr); + archive_read_close(a); + archive_read_free(a); + return QVector {QDir::toNativeSeparators(QDir::currentPath() + "/" + fileToWrite)}; + +} + + +} -- cgit v1.2.3 From d6cade25f4ac6b2ebac9d4830ab7b10294bc4c89 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Sat, 19 Dec 2020 17:41:51 +0000 Subject: Extract ROM to new folder next to archive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example if DS_ROMS.zip had game.nds, the directory structure would be: ├── DS_ROMS │   └── game.nds └── DS_ROMS.zip --- src/frontend/qt_sdl/ArchiveUtil.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/frontend/qt_sdl/ArchiveUtil.cpp') diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp index 6457b4f..9885191 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.cpp +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -87,8 +87,9 @@ QVector ExtractFileFromArchive(const char* path, const char* wantedFile return QVector {"Err", archive_error_string(a)}; } - const char* fileToWrite = archive_entry_pathname(entry); - std::ofstream(fileToWrite, std::ofstream::binary).write((char*)archiveBuffer.get(), bytesToWrite); + QString fileToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(dirToWrite).baseName() + "/" + archive_entry_pathname(entry); + + std::ofstream(fileToWrite.toUtf8().constData(), std::ofstream::binary).write((char*)archiveBuffer.get(), bytesToWrite); archiveBuffer.reset(nullptr); archive_read_close(a); -- cgit v1.2.3 From 0be3f449a778f9f3ce0fd3ef16d4751be01cbbfd Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Sat, 19 Dec 2020 17:46:09 +0000 Subject: fix for the last commit --- src/frontend/qt_sdl/ArchiveUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/frontend/qt_sdl/ArchiveUtil.cpp') diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp index 9885191..e007095 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.cpp +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -87,7 +87,7 @@ QVector ExtractFileFromArchive(const char* path, const char* wantedFile return QVector {"Err", archive_error_string(a)}; } - QString fileToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(dirToWrite).baseName() + "/" + archive_entry_pathname(entry); + QString fileToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(path).baseName() + "/" + archive_entry_pathname(entry); std::ofstream(fileToWrite.toUtf8().constData(), std::ofstream::binary).write((char*)archiveBuffer.get(), bytesToWrite); -- cgit v1.2.3 From f070eafce473c49979cfe8ec1d2dd65de9084884 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Sun, 3 Jan 2021 15:29:03 +0000 Subject: Fix return value of Archive::ExtractFileFromArchive --- src/frontend/qt_sdl/ArchiveUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/frontend/qt_sdl/ArchiveUtil.cpp') diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp index e007095..f7ca8e6 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.cpp +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -94,7 +94,7 @@ QVector ExtractFileFromArchive(const char* path, const char* wantedFile archiveBuffer.reset(nullptr); archive_read_close(a); archive_read_free(a); - return QVector {QDir::toNativeSeparators(QDir::currentPath() + "/" + fileToWrite)}; + return QVector {fileToWrite}; } -- cgit v1.2.3 From 00e9a5e0c7afcea3502e8627db7066cc14aa2536 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Tue, 5 Jan 2021 15:34:28 +0000 Subject: Allow melonDS to write the file The directory wasn't created, so the file was not being written --- src/frontend/qt_sdl/ArchiveUtil.cpp | 19 +++++++++++++------ src/frontend/qt_sdl/ArchiveUtil.h | 2 -- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'src/frontend/qt_sdl/ArchiveUtil.cpp') diff --git a/src/frontend/qt_sdl/ArchiveUtil.cpp b/src/frontend/qt_sdl/ArchiveUtil.cpp index f7ca8e6..ba6e4b6 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.cpp +++ b/src/frontend/qt_sdl/ArchiveUtil.cpp @@ -18,6 +18,11 @@ #include "ArchiveUtil.h" +#ifdef _WIN32 + #include + #define mkdir(dir, mode) _mkdir(dir) +#endif + namespace Archive { @@ -86,15 +91,17 @@ QVector ExtractFileFromArchive(const char* path, const char* wantedFile archiveBuffer.reset(nullptr); return QVector {"Err", archive_error_string(a)}; } - - QString fileToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(path).baseName() + "/" + archive_entry_pathname(entry); - - std::ofstream(fileToWrite.toUtf8().constData(), std::ofstream::binary).write((char*)archiveBuffer.get(), bytesToWrite); - + QString nameToWrite = QFileInfo(path).absolutePath() + "/" + QFileInfo(path).baseName() + "/" + archive_entry_pathname(entry); + + mkdir(QFileInfo(path).baseName().toUtf8().constData(), 600); // Create directory otherwise fopen will not open the file + FILE* fileToWrite = fopen(nameToWrite.toUtf8().constData(), "wb"); + fwrite((char*)archiveBuffer.get(), bytesToWrite, 1, fileToWrite); + fclose(fileToWrite); + archiveBuffer.reset(nullptr); archive_read_close(a); archive_read_free(a); - return QVector {fileToWrite}; + return QVector {nameToWrite}; } diff --git a/src/frontend/qt_sdl/ArchiveUtil.h b/src/frontend/qt_sdl/ArchiveUtil.h index 5b03a59..a6f404a 100644 --- a/src/frontend/qt_sdl/ArchiveUtil.h +++ b/src/frontend/qt_sdl/ArchiveUtil.h @@ -4,8 +4,6 @@ #include #include -#include -#include #include #include -- cgit v1.2.3