From dd0e996081ae820a0f16b5a6854a8a6274c5edf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 28 Oct 2016 02:19:19 +0200 Subject: GH-1697 always stale files tolerate errors if a local copy is present This fixes the situation when liteloader snapshot site is broken and there's an older local snapshot already present. --- api/logic/net/Download.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'api/logic/net/Download.h') diff --git a/api/logic/net/Download.h b/api/logic/net/Download.h index fab39ffe..d417f660 100644 --- a/api/logic/net/Download.h +++ b/api/logic/net/Download.h @@ -28,14 +28,20 @@ class MULTIMC_LOGIC_EXPORT Download : public NetAction public: /* types */ typedef std::shared_ptr Ptr; + enum class Option + { + NoOptions = 0, + AcceptLocalFiles = 1 + }; + Q_DECLARE_FLAGS(Options, Option) protected: /* con/des */ explicit Download(); public: virtual ~Download(){}; - static Download::Ptr makeCached(QUrl url, MetaEntryPtr entry); - static Download::Ptr makeByteArray(QUrl url, QByteArray *output); - static Download::Ptr makeFile(QUrl url, QString path); + static Download::Ptr makeCached(QUrl url, MetaEntryPtr entry, Options options = Option::NoOptions); + static Download::Ptr makeByteArray(QUrl url, QByteArray *output, Options options = Option::NoOptions); + static Download::Ptr makeFile(QUrl url, QString path, Options options = Option::NoOptions); public: /* methods */ QString getTargetFilepath() @@ -62,5 +68,8 @@ private: /* data */ // FIXME: remove this, it has no business being here. QString m_target_path; std::unique_ptr m_sink; + Options m_options; }; -} \ No newline at end of file +} + +Q_DECLARE_OPERATORS_FOR_FLAGS(Net::Download::Options) -- cgit v1.2.3