claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Second and last part of the icon indicator work.

Browse Source
This commit is contained in:
OBattler
2025-07-23 15:53:34 +02:00
parent c5681d8ba9
commit 9063bbe68b
31 changed files with 362 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/qt/qt_mediahistorymanager.cpp
View File

@@ -21,6 +21,9 @@
#include <QStringBuilder>
#include <utility>
#include "qt_mediahistorymanager.hpp"
#ifdef Q_OS_WINDOWS
#include <windows.h>
#endif
extern "C" {
#include <86box/timer.h>
@@ -205,6 +208,8 @@ MediaHistoryManager::initialDeduplication()
break;
}
deduplicateList(device_history, QVector<QString>(1, current_image));
device_history = removeMissingImages(device_history);
device_history = pathAdjustFull(device_history);
// Fill in missing, if any
int missing = MAX_PREV_IMAGES - device_history.size();
if (missing) {
@@ -213,6 +218,7 @@ MediaHistoryManager::initialDeduplication()
}
}
setHistoryListForDeviceIndex(device_index, device_type, device_history);
serializeImageHistoryType(device_type);
}
}
}
@@ -343,24 +349,42 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
char temp[MAX_IMAGE_PATH_LEN * 2] = { 0 };
if (path_abs(checked_path.toUtf8().data())) {
if (checked_path.length() > (MAX_IMAGE_PATH_LEN - 1))
fatal("removeMissingImages(): checked_path.length() > %i\n", MAX_IMAGE_PATH_LEN - 1);
else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", checked_path.toUtf8().constData());
if (checked_path.left(8) == "ioctl://") {
strncpy(temp, checked_path.toUtf8().data(), sizeof(temp));
temp[sizeof(temp) - 1] = '\0';
} else {
if ((strlen(usr_path) + strlen(path_get_slash(usr_path)) + checked_path.length()) > (MAX_IMAGE_PATH_LEN - 1))
fatal("removeMissingImages(): Combined absolute path length > %i\n", MAX_IMAGE_PATH_LEN - 1);
QString path_only;
if (checked_path.left(5) == "wp://")
path_only = checked_path.right(checked_path.length() - 5);
else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
path_get_slash(usr_path), checked_path.toUtf8().constData());
path_only = checked_path;
if (path_abs(path_only.toUtf8().data())) {
if (path_only.length() > (MAX_IMAGE_PATH_LEN - 1))
fatal("removeMissingImages(): path_only.length() > %i\n", MAX_IMAGE_PATH_LEN - 1);
else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", path_only.toUtf8().constData());
} else {
if ((strlen(usr_path) + strlen(path_get_slash(usr_path)) + path_only.length()) > (MAX_IMAGE_PATH_LEN - 1))
fatal("removeMissingImages(): Combined absolute path length > %i\n", MAX_IMAGE_PATH_LEN - 1);
else
snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
path_get_slash(usr_path), path_only.toUtf8().constData());
}
path_normalize(temp);
}
path_normalize(temp);
QString qstr = QString::fromUtf8(temp);
QFileInfo new_fi(qstr);
if ((new_fi.filePath().left(8) != "ioctl://") && !new_fi.exists()) {
bool file_exists = new_fi.exists();
#ifdef Q_OS_WINDOWS
if (new_fi.filePath().left(8) == "ioctl://")
file_exists = (GetDriveType(new_fi.filePath().right(2).toUtf8().data()) == DRIVE_CDROM);
#endif
if (!file_exists) {
qWarning("Image file %s does not exist - removing from history", qPrintable(new_fi.filePath()));
checked_path = "";
}