ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
This commit is contained in:
Alexandru Ionut Tripon 2024-09-16 16:46:01 +03:00 committed by GitHub
parent 0afdce8a31
commit 8d14060ad1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/java/download/SymlinkTask.cpp
View File

@ -43,7 +43,7 @@ QString findBinPath(QString root, QString pattern)
void SymlinkTask::executeTask() void SymlinkTask::executeTask()
{ {
setStatus(tr("Check Java bin")); setStatus(tr("Checking for Java binary path"));
const auto binPath = FS::PathCombine("bin", "java"); const auto binPath = FS::PathCombine("bin", "java");
const auto wantedPath = FS::PathCombine(m_path, binPath); const auto wantedPath = FS::PathCombine(m_path, binPath);
if (QFileInfo::exists(wantedPath)) { if (QFileInfo::exists(wantedPath)) {
@ -51,16 +51,16 @@ void SymlinkTask::executeTask()
return; return;
} }
setStatus(tr("Search for Java bin")); setStatus(tr("Searching for Java binary path"));
const auto contentsPartialPath = FS::PathCombine("Contents", "Home", binPath); const auto contentsPartialPath = FS::PathCombine("Contents", "Home", binPath);
const auto relativePathToBin = findBinPath(m_path, contentsPartialPath); const auto relativePathToBin = findBinPath(m_path, contentsPartialPath);
if (relativePathToBin.isEmpty()) { if (relativePathToBin.isEmpty()) {
emitFailed(tr("Failed to find bin java")); emitFailed(tr("Failed to find Java binary path"));
return; return;
} }
const auto folderToLink = relativePathToBin.chopped(binPath.length()); const auto folderToLink = relativePathToBin.chopped(binPath.length());
setStatus(tr("Collect folders to symlink")); setStatus(tr("Collecting folders to symlink"));
auto entries = QDir(folderToLink).entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries); auto entries = QDir(folderToLink).entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries);
QList<FS::LinkPair> files; QList<FS::LinkPair> files;
setProgress(0, entries.length()); setProgress(0, entries.length());
@ -68,7 +68,7 @@ void SymlinkTask::executeTask()
files.append({ entry.absoluteFilePath(), FS::PathCombine(m_path, entry.fileName()) }); files.append({ entry.absoluteFilePath(), FS::PathCombine(m_path, entry.fileName()) });
} }
setStatus(tr("Symlink Java")); setStatus(tr("Symlinking Java binary path"));
FS::create_link folderLink(files); FS::create_link folderLink(files);
connect(&folderLink, &FS::create_link::fileLinked, [this](QString src, QString dst) { setProgress(m_progress + 1, m_progressTotal); }); connect(&folderLink, &FS::create_link::fileLinked, [this](QString src, QString dst) { setProgress(m_progress + 1, m_progressTotal); });
if (!folderLink()) { if (!folderLink()) {