summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-09-06 14:28:44 +0200
committerJosJuice <josjuice@gmail.com>2015-09-11 16:02:14 +0200
commit047ddb94a223b7967423485e596a4de8373ed4d0 (patch)
tree36187906a27a00a3420133e64ca2c8595759c4fd /Source/Core
parentad978122d94cf7b87d6f37f4569688ccd15287c7 (diff)
DolphinQt: Support ELF and DOL files in the game list
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/GameList/GameFile.cpp45
-rw-r--r--Source/Core/DolphinQt/GameList/GameFile.h5
-rw-r--r--Source/Core/DolphinQt/GameList/GameTracker.cpp5
-rw-r--r--Source/Core/DolphinQt/Utils/Resources.cpp4
4 files changed, 44 insertions, 15 deletions
diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp
index 03c3ddd037..7e22d389c9 100644
--- a/Source/Core/DolphinQt/GameList/GameFile.cpp
+++ b/Source/Core/DolphinQt/GameList/GameFile.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include <algorithm>
#include <memory>
#include <QDataStream>
@@ -24,7 +25,7 @@
#include "DolphinQt/GameList/GameFile.h"
#include "DolphinQt/Utils/Utils.h"
-static const u32 CACHE_REVISION = 0x00B; // Last changed in PR 2598
+static const u32 CACHE_REVISION = 0x00C; // Last changed in PR 2993
static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
static QMap<DiscIO::IVolume::ELanguage, QString> ConvertLocalizedStrings(std::map<DiscIO::IVolume::ELanguage, std::string> strings)
@@ -71,6 +72,9 @@ static QString GetLanguageString(DiscIO::IVolume::ELanguage language, QMap<DiscI
GameFile::GameFile(const QString& fileName)
: m_file_name(fileName)
{
+ QFileInfo info(m_file_name);
+ m_folder_name = info.absoluteDir().dirName();
+
if (LoadFromCache())
{
m_valid = true;
@@ -111,9 +115,6 @@ GameFile::GameFile(const QString& fileName)
m_disc_number = volume->GetDiscNumber();
m_revision = volume->GetRevision();
- QFileInfo info(m_file_name);
- m_folder_name = info.absoluteDir().dirName();
-
ReadBanner(*volume);
m_valid = true;
@@ -132,6 +133,13 @@ GameFile::GameFile(const QString& fileName)
ini.GetIfExists("EmuState", "EmulationIssues", &issues_temp);
m_issues = QString::fromStdString(issues_temp);
}
+
+ if (!IsValid() && IsElfOrDol())
+ {
+ m_valid = true;
+ m_file_size = info.size();
+ m_platform = DiscIO::IVolume::ELF_DOL;
+ }
}
bool GameFile::LoadFromCache()
@@ -160,8 +168,7 @@ bool GameFile::LoadFromCache()
QMap<u8, QString> short_names;
QMap<u8, QString> long_names;
QMap<u8, QString> descriptions;
- stream >> m_folder_name
- >> short_names
+ stream >> short_names
>> long_names
>> descriptions
>> m_company
@@ -203,8 +210,7 @@ void GameFile::SaveToCache()
stream.setVersion(DATASTREAM_REVISION);
stream << CACHE_REVISION;
- stream << m_folder_name
- << CastLocalizedStrings<u8>(m_short_names)
+ stream << CastLocalizedStrings<u8>(m_short_names)
<< CastLocalizedStrings<u8>(m_long_names)
<< CastLocalizedStrings<u8>(m_descriptions)
<< m_company
@@ -219,7 +225,22 @@ void GameFile::SaveToCache()
<< m_revision;
}
-QString GameFile::CreateCacheFilename()
+bool GameFile::IsElfOrDol() const
+{
+ const std::string name = m_file_name.toStdString();
+ const size_t pos = name.rfind('.');
+
+ if (pos != std::string::npos)
+ {
+ std::string ext = name.substr(pos);
+ std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+ return ext == ".elf" || ext == ".dol";
+ }
+ return false;
+}
+
+QString GameFile::CreateCacheFilename() const
{
std::string filename, pathname, extension;
SplitPath(m_file_name.toStdString(), &pathname, &filename, &extension);
@@ -278,9 +299,9 @@ QString GameFile::GetName(bool prefer_long) const
if (name.isEmpty())
{
// No usable name, return filename (better than nothing)
- std::string nametemp;
- SplitPath(m_file_name.toStdString(), nullptr, &nametemp, nullptr);
- name = QString::fromStdString(nametemp);
+ std::string name_temp, extension;
+ SplitPath(m_file_name.toStdString(), nullptr, &name_temp, &extension);
+ name = QString::fromStdString(name_temp + extension);
}
return name;
}
diff --git a/Source/Core/DolphinQt/GameList/GameFile.h b/Source/Core/DolphinQt/GameList/GameFile.h
index e62fcd1a79..8fe94b67a9 100644
--- a/Source/Core/DolphinQt/GameList/GameFile.h
+++ b/Source/Core/DolphinQt/GameList/GameFile.h
@@ -66,7 +66,7 @@ private:
quint64 m_file_size = 0;
quint64 m_volume_size = 0;
- DiscIO::IVolume::ECountry m_country;
+ DiscIO::IVolume::ECountry m_country = DiscIO::IVolume::COUNTRY_UNKNOWN;
DiscIO::IVolume::EPlatform m_platform;
u16 m_revision = 0;
@@ -78,7 +78,8 @@ private:
bool LoadFromCache();
void SaveToCache();
- QString CreateCacheFilename();
+ bool IsElfOrDol() const;
+ QString CreateCacheFilename() const;
void ReadBanner(const DiscIO::IVolume& volume);
};
diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp
index 7213024fe1..e7221b0d35 100644
--- a/Source/Core/DolphinQt/GameList/GameTracker.cpp
+++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp
@@ -102,6 +102,11 @@ void DGameTracker::ScanForGames()
}
if (SConfig::GetInstance().m_ListWad)
exts.push_back("*.wad");
+ if (SConfig::GetInstance().m_ListElfDol)
+ {
+ exts.push_back("*.dol");
+ exts.push_back("*.elf");
+ }
auto rFilenames = DoFileSearch(exts, SConfig::GetInstance().m_ISOFolder, SConfig::GetInstance().m_RecursiveISOFolder);
QList<GameFile*> newItems;
diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp
index 25a9c4abfd..8456e958cd 100644
--- a/Source/Core/DolphinQt/Utils/Resources.cpp
+++ b/Source/Core/DolphinQt/Utils/Resources.cpp
@@ -40,7 +40,7 @@ void Resources::Init()
m_regions[DiscIO::IVolume::COUNTRY_WORLD].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder
m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(GIFN("Flag_Unknown"));
- m_platforms.resize(3);
+ m_platforms.resize(4);
m_platforms[0].load(GIFN("Platform_Gamecube"));
m_platforms[1].load(GIFN("Platform_Wii"));
m_platforms[2].load(GIFN("Platform_Wad"));
@@ -78,6 +78,8 @@ void Resources::UpdatePixmaps()
// TODO: toolbar[MEMCARD];
// TODO: toolbar[HOTKEYS];
m_pixmaps[BANNER_MISSING].load(GIFN("nobanner"));
+ // TODO: Make this consistent with the other files
+ m_platforms[3].load(GIFN("fileplatform"));
}
QString Resources::GetImageFilename(QString name, QString dir)