CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use UUID toString mode

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-02-23 19:08:35 -07:00
parent ae289c923c
commit dc5402349e
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/FileSystem.cpp
View File

@ -442,7 +442,7 @@ void create_link::runPrivileged(const QString& offset)
make_link_list(offset); make_link_list(offset);
QString serverName = BuildConfig.LAUNCHER_APP_BINARY_NAME + "_filelink_server" + StringUtils::getRandomAlphaNumeric(8); QString serverName = BuildConfig.LAUNCHER_APP_BINARY_NAME + "_filelink_server" + StringUtils::getRandomAlphaNumeric();
connect(&m_linkServer, &QLocalServer::newConnection, this, [&](){ connect(&m_linkServer, &QLocalServer::newConnection, this, [&](){

2
launcher/InstanceList.cpp
View File

@ -875,7 +875,7 @@ Task* InstanceList::wrapInstanceTask(InstanceTask* task)
QString InstanceList::getStagedInstancePath() QString InstanceList::getStagedInstancePath()
{ {
QString key = QUuid::createUuid().toString().remove("{").remove("}"); QString key = QUuid::createUuid().toString(QUuid::WithoutBraces);
QString tempDir = ".LAUNCHER_TEMP/"; QString tempDir = ".LAUNCHER_TEMP/";
QString relPath = FS::PathCombine(tempDir, key); QString relPath = FS::PathCombine(tempDir, key);
QDir rootPath(m_instDir); QDir rootPath(m_instDir);

14
launcher/StringUtils.cpp
View File

@ -1,6 +1,6 @@
#include "StringUtils.h" #include "StringUtils.h"
#include <QRandomGenerator> #include <QUuid>
/// If you're wondering where these came from exactly, then know you're not the only one =D /// If you're wondering where these came from exactly, then know you're not the only one =D
@ -77,15 +77,7 @@ int StringUtils::naturalCompare(const QString& s1, const QString& s2, Qt::CaseSe
return QString::compare(s1, s2, cs); return QString::compare(s1, s2, cs);
} }
QString StringUtils::getRandomAlphaNumeric(const int length) QString StringUtils::getRandomAlphaNumeric()
{ {
const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); return QUuid::createUuid().toString(QUuid::Id128);
QString randomString;
for(int i=0; i < length; ++i)
{
int index = QRandomGenerator::global()->bounded(0, possibleCharacters.length());
QChar nextChar = possibleCharacters.at(index);
randomString.append(nextChar);
}
return randomString;
} }

2
launcher/StringUtils.h
View File

@ -30,5 +30,5 @@ inline QString fromStdString(string s)
int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs); int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs);
QString getRandomAlphaNumeric(const int length); QString getRandomAlphaNumeric();
} // namespace StringUtils } // namespace StringUtils