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

fix offline mode for meta

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-23 01:47:49 +03:00
parent 0a95b57c0a
commit 715c99636d
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/meta/BaseEntity.cpp
View File

@ -102,7 +102,7 @@ void BaseEntityLoadTask::executeTask()
{ {
const QString fname = QDir("meta").absoluteFilePath(m_entity->localFilename()); const QString fname = QDir("meta").absoluteFilePath(m_entity->localFilename());
// load local file if nothing is loaded yet // load local file if nothing is loaded yet
if (m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && QFile::exists(fname)) { if (m_entity->m_load_status == BaseEntity::LoadStatus::NotLoaded && QFile::exists(fname)) {
setStatus(tr("Loading local file")); setStatus(tr("Loading local file"));
try { try {
auto fileData = FS::read(fname); auto fileData = FS::read(fname);
@ -125,7 +125,6 @@ void BaseEntityLoadTask::executeTask()
auto hashMatches = !m_entity->m_sha256.isEmpty() && m_entity->m_sha256 == m_entity->m_file_sha256; auto hashMatches = !m_entity->m_sha256.isEmpty() && m_entity->m_sha256 == m_entity->m_file_sha256;
auto wasLoadedOffline = m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && m_mode == Net::Mode::Offline; auto wasLoadedOffline = m_entity->m_load_status != BaseEntity::LoadStatus::NotLoaded && m_mode == Net::Mode::Offline;
if (wasLoadedOffline || hashMatches) { if (wasLoadedOffline || hashMatches) {
m_entity->m_load_status = BaseEntity::LoadStatus::Local;
emitSucceeded(); emitSucceeded();
return; return;
} }
@ -142,6 +141,7 @@ void BaseEntityLoadTask::executeTask()
dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha256, m_entity->m_sha256)); dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Algorithm::Sha256, m_entity->m_sha256));
dl->addValidator(new ParsingValidator(m_entity)); dl->addValidator(new ParsingValidator(m_entity));
m_task->addNetAction(dl); m_task->addNetAction(dl);
m_task->setAskRetry(false);
connect(m_task.get(), &Task::failed, this, &BaseEntityLoadTask::emitFailed); connect(m_task.get(), &Task::failed, this, &BaseEntityLoadTask::emitFailed);
connect(m_task.get(), &Task::succeeded, this, &BaseEntityLoadTask::emitSucceeded); connect(m_task.get(), &Task::succeeded, this, &BaseEntityLoadTask::emitSucceeded);
connect(m_task.get(), &Task::succeeded, this, [this]() { connect(m_task.get(), &Task::succeeded, this, [this]() {