rewrote picture downloader

cockatrice/src/carddatabase.cpp

@@ -9,6 +9,9 @@
 #include <QPainter>
 #include <QUrl>
 #include <QSet>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 
 CardSet::CardSet(const QString &_shortName, const QString &_longName)
 	: shortName(_shortName), longName(_longName)
@@ -235,8 +238,8 @@ CardDatabase::CardDatabase(QObject *parent)
 	connect(settingsCache, SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabase()));
 	connect(settingsCache, SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
 	
-	http = new QHttp(this);
+	networkManager = new QNetworkAccessManager(this);
-	connect(http, SIGNAL(requestFinished(int, bool)), this, SLOT(picDownloadFinished(int, bool)));
+	connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(picDownloadFinished(QNetworkReply *)));
 
 	loadCardDatabase();
 
@@ -317,46 +320,54 @@ void CardDatabase::clearPixmapCache()
 
 void CardDatabase::startPicDownload(CardInfo *card)
 {
-	QBuffer *buffer = new QBuffer(this);
+	if (card->getPicURL().isEmpty())
-	buffer->open(QIODevice::ReadWrite);
-	QUrl url(card->getPicURL());
-	http->setHost(url.host(), url.port(80));
-	int dlID = http->get(url.path(), buffer);
-	downloadBuffers.insert(dlID, QPair<CardInfo *, QBuffer *>(card, buffer));
-}
-
-void CardDatabase::picDownloadFinished(int id, bool error)
-{
-	if (!downloadBuffers.contains(id))
 		return;
 	
-	const QPair<CardInfo *, QBuffer *> &temp = downloadBuffers.value(id);
+	cardsToDownload.append(card);
-	CardInfo *card = temp.first;
+	if (!downloadRunning)
-	QBuffer *buffer = temp.second;
+		startNextPicDownload();
-	downloadBuffers.remove(id);
+}
-	buffer->close();
+
-	
+void CardDatabase::startNextPicDownload()
-	if (!error) {
+{
-		QString picsPath = settingsCache->getPicsPath();
+	if (cardsToDownload.isEmpty()) {
-		const QByteArray &picData = buffer->data();
+		downloadRunning = false;
-		QPixmap testPixmap;
+		return;
-		if (testPixmap.loadFromData(picData)) {
-			if (!QDir(QString(picsPath + "/downloadedPics/")).exists()) {
-				QDir dir(picsPath);
-				if (!dir.exists())
-					return;
-				dir.mkdir("downloadedPics");
-			}
-			QFile newPic(picsPath + "/downloadedPics/" + card->getCorrectedName() + ".full.jpg");
-			if (!newPic.open(QIODevice::WriteOnly))
-				return;
-			newPic.write(picData);
-			newPic.close();
-			
-			card->updatePixmapCache();
-		}
 	}
-	delete buffer;
+	
+	downloadRunning = true;
+	
+	CardInfo *card = cardsToDownload.takeFirst();
+	QNetworkRequest req(QUrl(card->getPicURL()));
+	req.setOriginatingObject(card);
+	networkManager->get(req);
+}
+
+void CardDatabase::picDownloadFinished(QNetworkReply *reply)
+{
+	CardInfo *card = static_cast<CardInfo *>(reply->request().originatingObject());
+	
+	QString picsPath = settingsCache->getPicsPath();
+	const QByteArray &picData = reply->readAll();
+	QPixmap testPixmap;
+	if (testPixmap.loadFromData(picData)) {
+		if (!QDir(QString(picsPath + "/downloadedPics/")).exists()) {
+			QDir dir(picsPath);
+			if (!dir.exists())
+				return;
+			dir.mkdir("downloadedPics");
+		}
+		QFile newPic(picsPath + "/downloadedPics/" + card->getCorrectedName() + ".full.jpg");
+		if (!newPic.open(QIODevice::WriteOnly))
+			return;
+		newPic.write(picData);
+		newPic.close();
+		
+		card->updatePixmapCache();
+	}
+	
+	reply->deleteLater();
+	startNextPicDownload();
 }
 
 void CardDatabase::loadSetsFromXml(QXmlStreamReader &xml)

cockatrice/src/carddatabase.h

@@ -7,11 +7,12 @@
 #include <QDataStream>
 #include <QList>
 #include <QXmlStreamReader>
-#include <QHttp>
-#include <QBuffer>
 
 class CardDatabase;
 class CardInfo;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QNetworkRequest;
 
 class CardSet : public QList<CardInfo *> {
 private:
@@ -93,13 +94,14 @@ class CardDatabase : public QObject {
 protected:
 	QHash<QString, CardInfo *> cardHash;
 	QHash<QString, CardSet *> setHash;
-	QMap<int, QPair<CardInfo *, QBuffer *> > downloadBuffers;
+	QNetworkAccessManager *networkManager;
+	QList<CardInfo *> cardsToDownload;
+	bool downloadRunning;
 	CardInfo *noCard;
 private:
 	void loadCardsFromXml(QXmlStreamReader &xml);
 	void loadSetsFromXml(QXmlStreamReader &xml);
-	bool picDownload;
+	void startNextPicDownload();
-	QHttp *http;
 public:
 	CardDatabase(QObject *parent = 0);
 	~CardDatabase();
@@ -116,7 +118,7 @@ public:
 public slots:
 	void clearPixmapCache();
 private slots:
-	void picDownloadFinished(int id, bool error);
+	void picDownloadFinished(QNetworkReply *reply);
 	void loadCardDatabase();
 	void picDownloadChanged();
 };