Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-05 17:39:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(skin manager): accept files with same name

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-05-07 23:56:40 +03:00
parent a89fc7d1e0
commit e1cfae5e06
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
launcher/minecraft/skins/SkinList.cpp
View File

@ -268,6 +268,26 @@ void SkinList::installSkins(const QStringList& iconFiles)
installSkin(file); installSkin(file);
} }
QString getUniqueFile(const QString& root, const QString& file)
{
auto result = FS::PathCombine(root, file);
if (!QFileInfo::exists(result)) {
return result;
}
QString baseName = QFileInfo(file).completeBaseName();
QString extension = QFileInfo(file).suffix();
int tries = 0;
while (QFileInfo::exists(result)) {
if (++tries > 256)
return {};
QString key = QString("%1%2.%3").arg(baseName).arg(tries).arg(extension);
result = FS::PathCombine(root, key);
}
return result;
}
QString SkinList::installSkin(const QString& file, const QString& name) QString SkinList::installSkin(const QString& file, const QString& name)
{ {
if (file.isEmpty()) if (file.isEmpty())
@ -282,7 +302,7 @@ QString SkinList::installSkin(const QString& file, const QString& name)
if (fileinfo.suffix() != "png" && !SkinModel(fileinfo.absoluteFilePath()).isValid()) if (fileinfo.suffix() != "png" && !SkinModel(fileinfo.absoluteFilePath()).isValid())
return tr("Skin images must be 64x64 or 64x32 pixel PNG files."); return tr("Skin images must be 64x64 or 64x32 pixel PNG files.");
QString target = FS::PathCombine(m_dir.absolutePath(), name.isEmpty() ? fileinfo.fileName() : name); QString target = getUniqueFile(m_dir.absolutePath(), name.isEmpty() ? fileinfo.fileName() : name);
return QFile::copy(file, target) ? "" : tr("Unable to copy file"); return QFile::copy(file, target) ? "" : tr("Unable to copy file");
} }
@ -371,7 +391,8 @@ bool SkinList::setData(const QModelIndex& idx, const QVariant& value, int role)
auto& skin = m_skinList[row]; auto& skin = m_skinList[row];
auto newName = value.toString(); auto newName = value.toString();
if (skin.name() != newName) { if (skin.name() != newName) {
skin.rename(newName); if (!skin.rename(newName))
return false;
save(); save();
} }
return true; return true;

6
launcher/minecraft/skins/SkinModel.cpp
View File

@ -122,7 +122,11 @@ QString SkinModel::name() const
bool SkinModel::rename(QString newName) bool SkinModel::rename(QString newName)
{ {
auto info = QFileInfo(m_path); auto info = QFileInfo(m_path);
m_path = FS::PathCombine(info.absolutePath(), newName + ".png"); auto new_path = FS::PathCombine(info.absolutePath(), newName + ".png");
if (QFileInfo::exists(new_path)) {
return false;
}
m_path = new_path;
return FS::move(info.absoluteFilePath(), m_path); return FS::move(info.absoluteFilePath(), m_path);
} }