From 3d06fe88316c1880c9112a7334681b6abee38c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Thu, 15 Mar 2018 18:46:34 +0100
Subject: [PATCH] Also clear the error URLs when clearing the tile cache. Code
 cleanup.

---
 src/map/downloader.cpp | 36 ++++++++++++++++++++++++++----------
 src/map/downloader.h   | 24 +++++-------------------
 src/map/tileloader.cpp |  2 ++
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/map/downloader.cpp b/src/map/downloader.cpp
index c7543d71..858002a0 100644
--- a/src/map/downloader.cpp
+++ b/src/map/downloader.cpp
@@ -29,10 +29,10 @@
 #define TIMEOUT            30 /* s */
 
 
-class ReplyTimeout : public QObject
+class Downloader::ReplyTimeout : public QObject
 {
 public:
-	static void set(QNetworkReply *reply, int timeout)
+	static void setTimeout(QNetworkReply *reply, int timeout)
 	{
 		Q_ASSERT(reply);
 		new ReplyTimeout(reply, timeout);
@@ -57,13 +57,29 @@ private:
 	QBasicTimer _timer;
 };
 
+class Downloader::Redirect
+{
+public:
+	Redirect() : _level(0) {}
+	Redirect(const QUrl &origin, int level) :
+	  _origin(origin), _level(level) {}
+
+	const QUrl &origin() const {return _origin;}
+	int level() const {return _level;}
+
+private:
+	QUrl _origin;
+	int _level;
+};
+
+
 Downloader::Downloader(QObject *parent) : QObject(parent)
 {
 	connect(&_manager, SIGNAL(finished(QNetworkReply*)),
 	  SLOT(downloadFinished(QNetworkReply*)));
 }
 
-bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
+bool Downloader::doDownload(const Download &dl, const Redirect *redirect)
 {
 	QUrl url(dl.url());
 
@@ -74,16 +90,16 @@ bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
 
 	QNetworkRequest request(url);
 	request.setAttribute(ATTR_FILE, QVariant(dl.file()));
-	if (!redirect.isNull()) {
-		request.setAttribute(ATTR_ORIGIN, QVariant(redirect.origin()));
-		request.setAttribute(ATTR_LEVEL, QVariant(redirect.level()));
+	if (redirect) {
+		request.setAttribute(ATTR_ORIGIN, QVariant(redirect->origin()));
+		request.setAttribute(ATTR_LEVEL, QVariant(redirect->level()));
 	}
 	request.setRawHeader("User-Agent", USER_AGENT);
 
 	QNetworkReply *reply = _manager.get(request);
 	if (reply) {
-		_currentDownloads.insert(url, reply);
-		ReplyTimeout::set(reply, TIMEOUT);
+		_currentDownloads.insert(url);
+		ReplyTimeout::setTimeout(reply, TIMEOUT);
 	} else
 		return false;
 
@@ -143,14 +159,14 @@ void Downloader::downloadFinished(QNetworkReply *reply)
 			} else {
 				Redirect redirect(origin.isEmpty() ? url : origin, level + 1);
 				Download dl(location, filename);
-				doDownload(dl, redirect);
+				doDownload(dl, &redirect);
 			}
 		} else
 			if (!saveToDisk(filename, reply))
 				_errorDownloads.insert(url);
 	}
 
-	_currentDownloads.remove(url);
+	Q_ASSERT(_currentDownloads.remove(url));
 	reply->deleteLater();
 
 	if (_currentDownloads.isEmpty())
diff --git a/src/map/downloader.h b/src/map/downloader.h
index 5027bcbf..2db99f74 100644
--- a/src/map/downloader.h
+++ b/src/map/downloader.h
@@ -4,7 +4,6 @@
 #include <QNetworkAccessManager>
 #include <QUrl>
 #include <QList>
-#include <QMap>
 #include <QSet>
 
 class QNetworkReply;
@@ -31,6 +30,7 @@ public:
 	Downloader(QObject *parent = 0);
 
 	bool get(const QList<Download> &list);
+	void clearErrors() {_errorDownloads.clear();}
 
 signals:
 	void finished();
@@ -39,28 +39,14 @@ private slots:
 	void downloadFinished(QNetworkReply *reply);
 
 private:
-	class Redirect
-	{
-	public:
-		Redirect() : _level(0) {}
-		Redirect(const QUrl &origin, int level) :
-		  _origin(origin), _level(level) {}
+	class Redirect;
+	class ReplyTimeout;
 
-		const QUrl &origin() const {return _origin;}
-		int level() const {return _level;}
-
-		bool isNull() const {return (_level == 0);}
-
-	private:
-		QUrl _origin;
-		int _level;
-	};
-
-	bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
+	bool doDownload(const Download &dl, const Redirect *redirect = 0);
 	bool saveToDisk(const QString &filename, QIODevice *data);
 
 	QNetworkAccessManager _manager;
-	QMap<QUrl, QNetworkReply *> _currentDownloads;
+	QSet<QUrl> _currentDownloads;
 	QSet<QUrl> _errorDownloads;
 };
 
diff --git a/src/map/tileloader.cpp b/src/map/tileloader.cpp
index c7f4a7ac..94da08eb 100644
--- a/src/map/tileloader.cpp
+++ b/src/map/tileloader.cpp
@@ -77,6 +77,8 @@ void TileLoader::clearCache()
 
 	for (int i = 0; i < list.count(); i++)
 		dir.remove(list.at(i));
+
+	_downloader->clearErrors();
 }
 
 QString TileLoader::tileUrl(const Tile &tile) const