From 07c1685ff11decf45c40eae35002ac1c6f8f92b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 8 Mar 2019 01:21:04 +0100 Subject: [PATCH 1/2] NOISSUE create translations folder before starting to watch it for changes Fixes issue where on first run, the translations don't show up. --- api/logic/meta/BaseEntity.cpp | 2 +- api/logic/translations/TranslationsModel.cpp | 5 +++-- api/logic/translations/TranslationsModel.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/logic/meta/BaseEntity.cpp b/api/logic/meta/BaseEntity.cpp index 33c349a1..1f108869 100644 --- a/api/logic/meta/BaseEntity.cpp +++ b/api/logic/meta/BaseEntity.cpp @@ -74,7 +74,7 @@ Meta::BaseEntity::~BaseEntity() QUrl Meta::BaseEntity::url() const { - return QUrl("https://v1.meta.multimc.org").resolved(localFilename()); + return QUrl("https://meta.multimc.org/v1").resolved(localFilename()); } bool Meta::BaseEntity::loadLocalFile() diff --git a/api/logic/translations/TranslationsModel.cpp b/api/logic/translations/TranslationsModel.cpp index 58ff4384..0d9eccbf 100644 --- a/api/logic/translations/TranslationsModel.cpp +++ b/api/logic/translations/TranslationsModel.cpp @@ -133,6 +133,7 @@ TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractLi { d.reset(new Private); d->m_dir.setPath(path); + FS::ensureFolderPathExists(path); reloadLocalFiles(); d->watcher = new QFileSystemWatcher(this); @@ -151,7 +152,7 @@ void TranslationsModel::translationDirChanged(const QString& path) selectLanguage(selectedLanguage()); } -void TranslationsModel::indexRecieved() +void TranslationsModel::indexReceived() { qDebug() << "Got translations index!"; d->m_index_job.reset(); @@ -558,7 +559,7 @@ void TranslationsModel::downloadIndex() d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index_v2.json"), entry); d->m_index_job->addNetAction(d->m_index_task); connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed); - connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexRecieved); + connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived); d->m_index_job->start(); } diff --git a/api/logic/translations/TranslationsModel.h b/api/logic/translations/TranslationsModel.h index fa0ae5f6..a0327fcd 100644 --- a/api/logic/translations/TranslationsModel.h +++ b/api/logic/translations/TranslationsModel.h @@ -52,7 +52,7 @@ private: TranslationsModel &operator=(const TranslationsModel &) = delete; private slots: - void indexRecieved(); + void indexReceived(); void indexFailed(QString reason); void dlFailed(QString reason); void dlGood(); From bf93ba02e9dd30599753d22e029e48d1ecc122a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 8 Mar 2019 02:04:08 +0100 Subject: [PATCH 2/2] NOISSUE fix metadata URL --- api/logic/meta/BaseEntity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/logic/meta/BaseEntity.cpp b/api/logic/meta/BaseEntity.cpp index 1f108869..ce0be859 100644 --- a/api/logic/meta/BaseEntity.cpp +++ b/api/logic/meta/BaseEntity.cpp @@ -74,7 +74,7 @@ Meta::BaseEntity::~BaseEntity() QUrl Meta::BaseEntity::url() const { - return QUrl("https://meta.multimc.org/v1").resolved(localFilename()); + return QUrl("https://meta.multimc.org/v1/").resolved(localFilename()); } bool Meta::BaseEntity::loadLocalFile()