summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--logic/OneSixInstance.cpp55
-rw-r--r--logic/OneSixLibrary.cpp28
-rw-r--r--logic/OneSixLibrary.h1
-rw-r--r--logic/OneSixUpdate.cpp20
-rw-r--r--logic/auth/MojangAccount.cpp6
-rw-r--r--logic/lists/ForgeVersionList.cpp4
-rw-r--r--logic/net/CacheDownload.cpp21
-rw-r--r--logic/net/CacheDownload.h9
-rw-r--r--logic/updater/NotificationChecker.cpp2
9 files changed, 97 insertions, 49 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 16699a1d..3cfc1c76 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -93,39 +93,38 @@ QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version)
AssetsIndex index;
bool loadAssetsIndex = AssetsUtils::loadAssetsIndexJson(indexPath, &index);
- if (loadAssetsIndex)
+ if (loadAssetsIndex && index.isVirtual)
{
- if (index.isVirtual)
- {
- QLOG_INFO() << "Reconstructing virtual assets folder at" << virtualRoot.path();
+ QLOG_INFO() << "Reconstructing virtual assets folder at" << virtualRoot.path();
- for (QString map : index.objects.keys())
+ for (QString map : index.objects.keys())
+ {
+ AssetObject asset_object = index.objects.value(map);
+ QString target_path = PathCombine(virtualRoot.path(), map);
+ QFile target(target_path);
+
+ QString tlk = asset_object.hash.left(2);
+
+ QString original_path =
+ PathCombine(PathCombine(objectDir.path(), tlk), asset_object.hash);
+ QFile original(original_path);
+ if(!original.exists())
+ continue;
+ if (!target.exists())
{
- AssetObject asset_object = index.objects.value(map);
- QString target_path = PathCombine(virtualRoot.path(), map);
- QFile target(target_path);
-
- QString tlk = asset_object.hash.left(2);
-
- QString original_path =
- PathCombine(PathCombine(objectDir.path(), tlk), asset_object.hash);
- QFile original(original_path);
- if (!target.exists())
- {
- QFileInfo info(target_path);
- QDir target_dir = info.dir();
- // QLOG_DEBUG() << target_dir;
- if (!target_dir.exists())
- QDir("").mkpath(target_dir.path());
-
- bool couldCopy = original.copy(target_path);
- QLOG_DEBUG() << " Copying" << original_path << "to" << target_path
- << QString::number(couldCopy); // << original.errorString();
- }
+ QFileInfo info(target_path);
+ QDir target_dir = info.dir();
+ // QLOG_DEBUG() << target_dir;
+ if (!target_dir.exists())
+ QDir("").mkpath(target_dir.path());
+
+ bool couldCopy = original.copy(target_path);
+ QLOG_DEBUG() << " Copying" << original_path << "to" << target_path
+ << QString::number(couldCopy); // << original.errorString();
}
-
- // TODO: Write last used time to virtualRoot/.lastused
}
+
+ // TODO: Write last used time to virtualRoot/.lastused
}
return virtualRoot;
diff --git a/logic/OneSixLibrary.cpp b/logic/OneSixLibrary.cpp
index 1d69b660..cf29a832 100644
--- a/logic/OneSixLibrary.cpp
+++ b/logic/OneSixLibrary.cpp
@@ -136,6 +136,34 @@ QString OneSixLibrary::hint()
return m_hint;
}
+bool OneSixLibrary::filesExist()
+{
+ QString storage = storagePath();
+ if (storage.contains("${arch}"))
+ {
+ QString cooked_storage = storage;
+ cooked_storage.replace("${arch}", "32");
+ if (!QFileInfo::exists(PathCombine("libraries", cooked_storage)))
+ {
+ return false;
+ }
+ cooked_storage = storage;
+ cooked_storage.replace("${arch}", "64");
+ if (!QFileInfo::exists(PathCombine("libraries", cooked_storage)))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if (!QFileInfo::exists(PathCombine("libraries", storage)))
+ {
+ return false;
+ }
+ }
+ return true;
+}
+
bool OneSixLibrary::extractTo(QString target_dir)
{
QString storage = storagePath();
diff --git a/logic/OneSixLibrary.h b/logic/OneSixLibrary.h
index bc097348..227cdbef 100644
--- a/logic/OneSixLibrary.h
+++ b/logic/OneSixLibrary.h
@@ -128,4 +128,5 @@ public:
QString hint();
bool extractTo(QString target_dir);
+ bool filesExist();
};
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index ee355308..0119ab07 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -348,18 +348,26 @@ void OneSixUpdate::prepareForLaunch()
"it or changing the version.");
return;
}
-/*
- * emitFailed("Could not create the native library folder:\n" + natives_dir_raw +
- "\nMake sure MultiMC has appropriate permissions and there is enough space "
- "on the storage device.");
-*/
+ /*
+ * emitFailed("Could not create the native library folder:\n" + natives_dir_raw +
+ "\nMake sure MultiMC has appropriate permissions and there is enough
+ space "
+ "on the storage device.");
+ */
for (auto lib : version->getActiveNativeLibs())
{
+ if (!lib->filesExist())
+ {
+ emitFailed("Native library is missing some files:\n" + lib->storagePath() +
+ "\n\nRun the instance at least once in online mode to get all the "
+ "required files.");
+ return;
+ }
if (!lib->extractTo(natives_dir_raw))
{
emitFailed("Could not extract the native library:\n" + lib->storagePath() + " to " +
natives_dir_raw +
- "\nMake sure MultiMC has appropriate permissions and there is enough "
+ "\n\nMake sure MultiMC has appropriate permissions and there is enough "
"space on the storage device.");
return;
}
diff --git a/logic/auth/MojangAccount.cpp b/logic/auth/MojangAccount.cpp
index a462eda5..f41985ec 100644
--- a/logic/auth/MojangAccount.cpp
+++ b/logic/auth/MojangAccount.cpp
@@ -198,7 +198,11 @@ void MojangAccount::authFailed(QString reason)
{
// This is emitted when the yggdrasil tasks time out or are cancelled.
// -> we treat the error as no-op
- if (reason != "Yggdrasil task cancelled.")
+ if (reason == "Yggdrasil task cancelled.")
+ {
+ // do nothing
+ }
+ else
{
m_online = false;
m_accessToken = QString();
diff --git a/logic/lists/ForgeVersionList.cpp b/logic/lists/ForgeVersionList.cpp
index 38e033fa..4902dc64 100644
--- a/logic/lists/ForgeVersionList.cpp
+++ b/logic/lists/ForgeVersionList.cpp
@@ -187,7 +187,7 @@ bool ForgeListLoadTask::parseForgeList(QList<BaseVersionPtr> &out)
QByteArray data;
{
auto dlJob = listDownload;
- auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->m_target_path;
+ auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
QFile listFile(filename);
if (!listFile.open(QIODevice::ReadOnly))
{
@@ -303,7 +303,7 @@ bool ForgeListLoadTask::parseForgeGradleList(QList<BaseVersionPtr> &out)
QByteArray data;
{
auto dlJob = gradleListDownload;
- auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->m_target_path;
+ auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
QFile listFile(filename);
if (!listFile.open(QIODevice::ReadOnly))
{
diff --git a/logic/net/CacheDownload.cpp b/logic/net/CacheDownload.cpp
index 0022c361..d2a9bdee 100644
--- a/logic/net/CacheDownload.cpp
+++ b/logic/net/CacheDownload.cpp
@@ -40,7 +40,9 @@ void CacheDownload::start()
emit succeeded(m_index_within_job);
return;
}
- m_output_file.setFileName(m_target_path);
+ // create a new save file
+ m_output_file.reset(new QSaveFile(m_target_path));
+
// if there already is a file and md5 checking is in effect and it can be opened
if (!ensureFilePathExists(m_target_path))
{
@@ -49,7 +51,7 @@ void CacheDownload::start()
emit failed(m_index_within_job);
return;
}
- if (!m_output_file.open(QIODevice::WriteOnly))
+ if (!m_output_file->open(QIODevice::WriteOnly))
{
QLOG_ERROR() << "Could not open " + m_target_path + " for writing";
m_status = Job_Failed;
@@ -94,7 +96,7 @@ void CacheDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
void CacheDownload::downloadError(QNetworkReply::NetworkError error)
{
// error happened during download.
- QLOG_ERROR() << "Failed" << m_url.toString() << "with reason" << error;
+ QLOG_ERROR() << "Failed " << m_url.toString() << " with reason " << error;
m_status = Job_Failed;
}
void CacheDownload::downloadFinished()
@@ -102,17 +104,17 @@ void CacheDownload::downloadFinished()
// if the download succeeded
if (m_status == Job_Failed)
{
- m_output_file.cancelWriting();
+ m_output_file->cancelWriting();
m_reply.reset();
- m_status = Job_Failed;
emit failed(m_index_within_job);
return;
}
+ // if we wrote any data to the save file, we try to commit the data to the real file.
if (wroteAnyData)
{
// nothing went wrong...
- if (m_output_file.commit())
+ if (m_output_file->commit())
{
m_status = Job_Finished;
m_entry->md5sum = md5sum.result().toHex().constData();
@@ -120,7 +122,7 @@ void CacheDownload::downloadFinished()
else
{
QLOG_ERROR() << "Failed to commit changes to " << m_target_path;
- m_output_file.cancelWriting();
+ m_output_file->cancelWriting();
m_reply.reset();
m_status = Job_Failed;
emit failed(m_index_within_job);
@@ -132,6 +134,9 @@ void CacheDownload::downloadFinished()
m_status = Job_Finished;
}
+ // then get rid of the save file
+ m_output_file.reset();
+
QFileInfo output_file_info(m_target_path);
m_entry->etag = m_reply->rawHeader("ETag").constData();
@@ -153,7 +158,7 @@ void CacheDownload::downloadReadyRead()
{
QByteArray ba = m_reply->readAll();
md5sum.addData(ba);
- if (m_output_file.write(ba) != ba.size())
+ if (m_output_file->write(ba) != ba.size())
{
QLOG_ERROR() << "Failed writing into " + m_target_path;
m_status = Job_Failed;
diff --git a/logic/net/CacheDownload.h b/logic/net/CacheDownload.h
index 48be1dae..154f5988 100644
--- a/logic/net/CacheDownload.h
+++ b/logic/net/CacheDownload.h
@@ -24,12 +24,12 @@ typedef std::shared_ptr<class CacheDownload> CacheDownloadPtr;
class CacheDownload : public NetAction
{
Q_OBJECT
-public:
+private:
MetaEntryPtr m_entry;
/// if saving to file, use the one specified in this string
QString m_target_path;
/// this is the output file, if any
- QSaveFile m_output_file;
+ std::shared_ptr<QSaveFile> m_output_file;
/// the hash-as-you-download
QCryptographicHash md5sum;
@@ -41,7 +41,10 @@ public:
{
return CacheDownloadPtr(new CacheDownload(url, entry));
}
-
+ QString getTargetFilepath()
+ {
+ return m_target_path;
+ }
protected
slots:
virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp
index b2d67632..191e90a3 100644
--- a/logic/updater/NotificationChecker.cpp
+++ b/logic/updater/NotificationChecker.cpp
@@ -55,7 +55,7 @@ void NotificationChecker::downloadSucceeded(int)
{
m_entries.clear();
- QFile file(m_download->m_output_file.fileName());
+ QFile file(m_download->getTargetFilepath());
if (file.open(QFile::ReadOnly))
{
QJsonArray root = QJsonDocument::fromJson(file.readAll()).array();
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 17:29:18 +0000