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

NOISSUE take forge xz download url base from the metadata file

Browse Source 
Instead of hardcoding it.
This commit is contained in:
Petr Mrázek 2018-11-04 13:41:21 +01:00
parent 58260da861
commit 8a7f1e405f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/minecraft/Library.cpp
View File

@ -105,7 +105,7 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class
if (isForge) if (isForge)
{ {
qDebug() << "XzDownload for:" << rawName() << "storage:" << storage << "url:" << url; qDebug() << "XzDownload for:" << rawName() << "storage:" << storage << "url:" << url;
out.append(ForgeXzDownload::make(storage, entry)); out.append(ForgeXzDownload::make(url, storage, entry));
} }
else else
{ {

4
api/logic/minecraft/forge/ForgeXzDownload.cpp
View File

@ -23,14 +23,14 @@
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
ForgeXzDownload::ForgeXzDownload(QString relative_path, MetaEntryPtr entry) : NetAction() ForgeXzDownload::ForgeXzDownload(QString url, QString relative_path, MetaEntryPtr entry) : NetAction()
{ {
m_entry = entry; m_entry = entry;
m_target_path = entry->getFullPath(); m_target_path = entry->getFullPath();
m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX"); m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX");
m_status = Job_NotStarted; m_status = Job_NotStarted;
m_url_path = relative_path; m_url_path = relative_path;
m_url = "https://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz"; m_url = url + ".pack.xz";
} }
void ForgeXzDownload::start() void ForgeXzDownload::start()

6
api/logic/minecraft/forge/ForgeXzDownload.h
View File

@ -35,10 +35,10 @@ public:
QString m_url_path; QString m_url_path;
public: public:
explicit ForgeXzDownload(QString relative_path, MetaEntryPtr entry); explicit ForgeXzDownload(QString url, QString relative_path, MetaEntryPtr entry);
static ForgeXzDownloadPtr make(QString relative_path, MetaEntryPtr entry) static ForgeXzDownloadPtr make(QString url, QString relative_path, MetaEntryPtr entry)
{ {
return ForgeXzDownloadPtr(new ForgeXzDownload(relative_path, entry)); return ForgeXzDownloadPtr(new ForgeXzDownload(url, relative_path, entry));
} }
virtual ~ForgeXzDownload(){}; virtual ~ForgeXzDownload(){};
bool canAbort() override; bool canAbort() override;