CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Split MultiMC app object into MultiMC and Env

Browse Source
This commit is contained in:
Petr Mrázek
2015-01-31 16:59:03 +01:00
parent e508728246
commit 6f3aa65bd6
44 changed files with 343 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/net/ByteArrayDownload.cpp
View File

@ -14,7 +14,7 @@
*/
#include "ByteArrayDownload.h"
#include "MultiMC.h"
#include "logic/Env.h"
#include "logger/QsLog.h"
ByteArrayDownload::ByteArrayDownload(QUrl url) : NetAction()
@ -28,7 +28,7 @@ void ByteArrayDownload::start()
QLOG_INFO() << "Downloading " << m_url.toString();
QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
auto worker = MMC->qnam();
auto worker = ENV.qnam();
QNetworkReply *rep = worker->get(request);
m_reply = std::shared_ptr<QNetworkReply>(rep);

6
logic/net/CacheDownload.cpp
View File

@ -13,7 +13,6 @@
* limitations under the License.
*/
#include "MultiMC.h"
#include "CacheDownload.h"
#include <pathutils.h>
@ -21,6 +20,7 @@
#include <QFileInfo>
#include <QDateTime>
#include "logger/QsLog.h"
#include "logic/Env.h"
CacheDownload::CacheDownload(QUrl url, MetaEntryPtr entry)
: NetAction(), md5sum(QCryptographicHash::Md5)
@ -74,7 +74,7 @@ void CacheDownload::start()
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Cached)");
auto worker = MMC->qnam();
auto worker = ENV.qnam();
QNetworkReply *rep = worker->get(request);
m_reply = std::shared_ptr<QNetworkReply>(rep);
@ -168,7 +168,7 @@ void CacheDownload::downloadFinished()
m_entry->local_changed_timestamp =
output_file_info.lastModified().toUTC().toMSecsSinceEpoch();
m_entry->stale = false;
MMC->metacache()->updateEntry(m_entry);
ENV.metacache()->updateEntry(m_entry);
m_reply.reset();
emit succeeded(m_index_within_job);

5
logic/net/HttpMetaCache.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "MultiMC.h"
#include "logic/Env.h"
#include "HttpMetaCache.h"
#include <pathutils.h>
@ -32,7 +32,8 @@
QString MetaEntry::getFullPath()
{
return PathCombine(MMC->metacache()->getBasePath(base), path);
// FIXME: make local?
return PathCombine(ENV.metacache()->getBasePath(base), path);
}
HttpMetaCache::HttpMetaCache(QString path) : QObject()

3
logic/net/HttpMetaCache.h
View File

@ -17,6 +17,9 @@
#include <QString>
#include <QMap>
#include <qtimer.h>
#include <memory>
class HttpMetaCache;
struct MetaEntry
{

4
logic/net/MD5EtagDownload.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "MultiMC.h"
#include "logic/Env.h"
#include "MD5EtagDownload.h"
#include <pathutils.h>
#include <QCryptographicHash>
@ -83,7 +83,7 @@ void MD5EtagDownload::start()
return;
}
auto worker = MMC->qnam();
auto worker = ENV.qnam();
QNetworkReply *rep = worker->get(request);
m_reply = std::shared_ptr<QNetworkReply>(rep);

4
logic/net/PasteUpload.cpp
View File

@ -1,5 +1,5 @@
#include "PasteUpload.h"
#include "MultiMC.h"
#include "logic/Env.h"
#include "logger/QsLog.h"
#include <QJsonObject>
#include <QJsonDocument>
@ -25,7 +25,7 @@ void PasteUpload::executeTask()
request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
request.setRawHeader("Content-Length", QByteArray::number(content.size()));
auto worker = MMC->qnam();
auto worker = ENV.qnam();
QNetworkReply *rep = worker->post(request, content);
m_reply = std::shared_ptr<QNetworkReply>(rep);