PKG Viewer:

- Fixed crash when other file extensions are present in the same folder as the packages.
- Fixed display: check patch using serial and not name. fixed display when some games contain a semicolon in the title(STEINS;GATE 0)
- Fixed column resize on first run.
- Added status bar showing the number of packages.
- Removed: saving every single pkg path in config file.
This commit is contained in:
Jonah 2024-03-30 00:03:15 -06:00
parent aaa75a7ce1
commit c5e68ab819
3 changed files with 35 additions and 23 deletions

View File

@ -130,7 +130,7 @@ public:
} }
if (selected == &installPackage) { if (selected == &installPackage) {
QStringList pkg_app_ = m_pkg_app_list[itemIndex].split(";"); QStringList pkg_app_ = m_pkg_app_list[itemIndex].split(";;");
std::string pkg_to_install = pkg_app_[9].toStdString(); std::string pkg_to_install = pkg_app_[9].toStdString();
InstallDragDropPkg(pkg_to_install, 1, 1); InstallDragDropPkg(pkg_to_install, 1, 1);

View File

@ -13,7 +13,8 @@ PKGViewer::PKGViewer(std::shared_ptr<GameInfoClass> game_info_get,
m_gui_settings_ = m_gui_settings; m_gui_settings_ = m_gui_settings;
m_game_info = game_info_get; m_game_info = game_info_get;
dir_list = m_gui_settings->GetValue(gui::m_pkg_viewer).toStringList(); dir_list = m_gui_settings->GetValue(gui::m_pkg_viewer).toStringList();
statusBar = new QStatusBar(treeWidget);
this->setStatusBar(statusBar);
treeWidget = new QTreeWidget(this); treeWidget = new QTreeWidget(this);
treeWidget->setColumnCount(9); treeWidget->setColumnCount(9);
QStringList headers; QStringList headers;
@ -40,14 +41,8 @@ PKGViewer::PKGViewer(std::shared_ptr<GameInfoClass> game_info_get,
fileMenu->addAction(openFolderAct); fileMenu->addAction(openFolderAct);
this->setMenuBar(menuBar); this->setMenuBar(menuBar);
CheckPKGFolders(); // Check for new PKG files in existing folders. CheckPKGFolders(); // Check for new PKG files in existing folders.
if (!m_pkg_list.isEmpty())
ProcessPKGInfo(); ProcessPKGInfo();
for (int column = 0; column < treeWidget->columnCount() - 2; ++column) {
// Resize the column to fit its contents
treeWidget->resizeColumnToContents(column);
}
connect(openFolderAct, &QAction::triggered, this, &PKGViewer::OpenPKGFolder); connect(openFolderAct, &QAction::triggered, this, &PKGViewer::OpenPKGFolder);
connect(treeWidget, &QTreeWidget::customContextMenuRequested, this, connect(treeWidget, &QTreeWidget::customContextMenuRequested, this,
@ -63,19 +58,18 @@ void PKGViewer::OpenPKGFolder() {
QString folderPath = QString folderPath =
QFileDialog::getExistingDirectory(this, tr("Open Folder"), QDir::homePath()); QFileDialog::getExistingDirectory(this, tr("Open Folder"), QDir::homePath());
if (!dir_list.contains(folderPath)) { if (!dir_list.contains(folderPath)) {
dir_list.append(folderPath); dir_list.append(folderPath);
if (!folderPath.isEmpty()) { if (!folderPath.isEmpty()) {
QDir directory(folderPath);
for (const auto& dir : std::filesystem::directory_iterator(folderPath.toStdString())) { for (const auto& dir : std::filesystem::directory_iterator(folderPath.toStdString())) {
if (std::filesystem::is_regular_file(dir.path())) { QString file_ext =
QString::fromStdString(dir.path().extension().string()).toLower();
if (std::filesystem::is_regular_file(dir.path()) && file_ext == ".pkg") {
m_pkg_list.append(QString::fromStdString(dir.path().string())); m_pkg_list.append(QString::fromStdString(dir.path().string()));
} }
} }
std::sort(m_pkg_list.begin(), m_pkg_list.end()); std::sort(m_pkg_list.begin(), m_pkg_list.end());
ProcessPKGInfo(); ProcessPKGInfo();
m_gui_settings_->SetValue(gui::m_pkg_viewer, dir_list); m_gui_settings_->SetValue(gui::m_pkg_viewer, dir_list);
m_gui_settings_->SetValue(gui::m_pkg_viewer_pkg_list, m_pkg_list);
} }
} else { } else {
// qDebug() << "Folder selection canceled."; // qDebug() << "Folder selection canceled.";
@ -86,7 +80,8 @@ void PKGViewer::CheckPKGFolders() { // Check for new PKG file additions.
m_pkg_list.clear(); m_pkg_list.clear();
for (const QString& paths : dir_list) { for (const QString& paths : dir_list) {
for (const auto& dir : std::filesystem::directory_iterator(paths.toStdString())) { for (const auto& dir : std::filesystem::directory_iterator(paths.toStdString())) {
if (std::filesystem::is_regular_file(dir.path())) { QString file_ext = QString::fromStdString(dir.path().extension().string()).toLower();
if (std::filesystem::is_regular_file(dir.path()) && file_ext == ".pkg") {
m_pkg_list.append(QString::fromStdString(dir.path().string())); m_pkg_list.append(QString::fromStdString(dir.path().string()));
} }
} }
@ -97,6 +92,10 @@ void PKGViewer::CheckPKGFolders() { // Check for new PKG file additions.
void PKGViewer::ProcessPKGInfo() { void PKGViewer::ProcessPKGInfo() {
treeWidget->clear(); treeWidget->clear();
map_strings.clear(); map_strings.clear();
map_integers.clear();
m_pkg_app_list.clear();
m_pkg_patch_list.clear();
m_full_pkg_list.clear();
for (int i = 0; i < m_pkg_list.size(); i++) { for (int i = 0; i < m_pkg_list.size(); i++) {
Common::FS::IOFile file(m_pkg_list[i].toStdString(), Common::FS::FileAccessMode::Read); Common::FS::IOFile file(m_pkg_list[i].toStdString(), Common::FS::FileAccessMode::Read);
if (!file.IsOpen()) { if (!file.IsOpen()) {
@ -170,22 +169,22 @@ void PKGViewer::ProcessPKGInfo() {
QString pkg_info = ""; QString pkg_info = "";
if (title_category == "gd") { if (title_category == "gd") {
title_category = "App"; title_category = "App";
pkg_info = title_name + ";" + title_id + ";" + pkg_size + ";" + title_category + ";" + pkg_info = title_name + ";;" + title_id + ";;" + pkg_size + ";;" + title_category +
app_type + ";" + app_version + ";" + fw_ + ";" + GetRegion(region) + ";" + ";;" + app_type + ";;" + app_version + ";;" + fw_ + ";;" +
flagss + ";" + m_pkg_list[i]; GetRegion(region) + ";;" + flagss + ";;" + m_pkg_list[i];
m_pkg_app_list.append(pkg_info); m_pkg_app_list.append(pkg_info);
} else { } else {
title_category = "Patch"; title_category = "Patch";
pkg_info = title_name + ";" + title_id + ";" + pkg_size + ";" + title_category + ";" + pkg_info = title_name + ";;" + title_id + ";;" + pkg_size + ";;" + title_category +
app_type + ";" + app_version + ";" + fw_ + ";" + GetRegion(region) + ";" + ";;" + app_type + ";;" + app_version + ";;" + fw_ + ";;" +
flagss + ";" + m_pkg_list[i]; GetRegion(region) + ";;" + flagss + ";;" + m_pkg_list[i];
m_pkg_patch_list.append(pkg_info); m_pkg_patch_list.append(pkg_info);
} }
} }
std::sort(m_pkg_app_list.begin(), m_pkg_app_list.end()); std::sort(m_pkg_app_list.begin(), m_pkg_app_list.end());
for (int i = 0; i < m_pkg_app_list.size(); i++) { for (int i = 0; i < m_pkg_app_list.size(); i++) {
QTreeWidgetItem* treeItem = new QTreeWidgetItem(treeWidget); QTreeWidgetItem* treeItem = new QTreeWidgetItem(treeWidget);
QStringList pkg_app_ = m_pkg_app_list[i].split(";"); QStringList pkg_app_ = m_pkg_app_list[i].split(";;");
m_full_pkg_list.append(m_pkg_app_list[i]); m_full_pkg_list.append(m_pkg_app_list[i]);
treeItem->setExpanded(true); treeItem->setExpanded(true);
treeItem->setText(0, pkg_app_[0]); treeItem->setText(0, pkg_app_[0]);
@ -211,8 +210,8 @@ void PKGViewer::ProcessPKGInfo() {
} }
} }
for (const QString& item : m_pkg_patch_list) { for (const QString& item : m_pkg_patch_list) {
QStringList pkg_patch_ = item.split(";"); QStringList pkg_patch_ = item.split(";;");
if (pkg_patch_[0] == pkg_app_[0]) { // check patches. if (pkg_patch_[1] == pkg_app_[1]) { // check patches with serial.
m_full_pkg_list.append(item); m_full_pkg_list.append(item);
QTreeWidgetItem* childItem = new QTreeWidgetItem(treeItem); QTreeWidgetItem* childItem = new QTreeWidgetItem(treeItem);
childItem->setText(0, pkg_patch_[0]); childItem->setText(0, pkg_patch_[0]);
@ -235,6 +234,16 @@ void PKGViewer::ProcessPKGInfo() {
} }
} }
std::sort(m_full_pkg_list.begin(), m_full_pkg_list.end()); std::sort(m_full_pkg_list.begin(), m_full_pkg_list.end());
for (int column = 0; column < treeWidget->columnCount() - 2; ++column) {
// Resize the column to fit its contents
treeWidget->resizeColumnToContents(column);
}
// Update status bar.
statusBar->clearMessage();
int numPkgs = m_pkg_list.size();
QString statusMessage = QString::number(numPkgs) + " Package.";
statusBar->showMessage(statusMessage);
} }
QString PKGViewer::GetString(const std::string& key) { QString PKGViewer::GetString(const std::string& key) {

View File

@ -11,6 +11,7 @@
#include <QMainWindow> #include <QMainWindow>
#include <QMenu> #include <QMenu>
#include <QMenuBar> #include <QMenuBar>
#include <QStatusBar>
#include <QTreeWidget> #include <QTreeWidget>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
@ -54,6 +55,8 @@ private:
u32_be pkg_content_flag; u32_be pkg_content_flag;
std::shared_ptr<GameInfoClass> m_game_info; std::shared_ptr<GameInfoClass> m_game_info;
GameListUtils game_list_util; GameListUtils game_list_util;
// Status bar
QStatusBar* statusBar;
std::vector<std::pair<PKGContentFlag, std::string>> flagNames = { std::vector<std::pair<PKGContentFlag, std::string>> flagNames = {
{PKGContentFlag::FIRST_PATCH, "FIRST_PATCH"}, {PKGContentFlag::FIRST_PATCH, "FIRST_PATCH"},