Skip to content
Permalink
Browse files

Merge branch 'develop' into feature/deletion_harder

  • Loading branch information...
robotbrain committed Mar 19, 2019
2 parents a5e531d + bf93ba0 commit 22db95ce3b696a580688223e5d40b6b7b3ed88a3
@@ -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()
@@ -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();
}

@@ -52,7 +52,7 @@ class MULTIMC_LOGIC_EXPORT TranslationsModel : public QAbstractListModel
TranslationsModel &operator=(const TranslationsModel &) = delete;

private slots:
void indexRecieved();
void indexReceived();
void indexFailed(QString reason);
void dlFailed(QString reason);
void dlGood();

0 comments on commit 22db95c

Please sign in to comment.
You can’t perform that action at this time.