0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/deletion_harder

Browse Source
This commit is contained in:
Elise 2019-03-19 16:29:40 -04:00 committed by GitHub
commit 22db95ce3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/meta/BaseEntity.cpp
View File

@ -74,7 +74,7 @@ Meta::BaseEntity::~BaseEntity()
QUrl Meta::BaseEntity::url() const 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() bool Meta::BaseEntity::loadLocalFile()

5
api/logic/translations/TranslationsModel.cpp
View File

@ -133,6 +133,7 @@ TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractLi
{ {
d.reset(new Private); d.reset(new Private);
d->m_dir.setPath(path); d->m_dir.setPath(path);
FS::ensureFolderPathExists(path);
reloadLocalFiles(); reloadLocalFiles();
d->watcher = new QFileSystemWatcher(this); d->watcher = new QFileSystemWatcher(this);
@ -151,7 +152,7 @@ void TranslationsModel::translationDirChanged(const QString& path)
selectLanguage(selectedLanguage()); selectLanguage(selectedLanguage());
} }
void TranslationsModel::indexRecieved() void TranslationsModel::indexReceived()
{ {
qDebug() << "Got translations index!"; qDebug() << "Got translations index!";
d->m_index_job.reset(); 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_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index_v2.json"), entry);
d->m_index_job->addNetAction(d->m_index_task); 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::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(); d->m_index_job->start();
} }

2
api/logic/translations/TranslationsModel.h
View File

@ -52,7 +52,7 @@ private:
TranslationsModel &operator=(const TranslationsModel &) = delete; TranslationsModel &operator=(const TranslationsModel &) = delete;
private slots: private slots:
void indexRecieved(); void indexReceived();
void indexFailed(QString reason); void indexFailed(QString reason);
void dlFailed(QString reason); void dlFailed(QString reason);
void dlGood(); void dlGood();