deck list storage completed

common/protocol.cpp

@@ -71,6 +71,7 @@ void ProtocolItem::initializeHash()
 	ProtocolResponse::initializeHash();
 	itemNameHash.insert("respdeck_list", Response_DeckList::newItem);
 	itemNameHash.insert("respdeck_download", Response_DeckDownload::newItem);
+	itemNameHash.insert("respdeck_upload", Response_DeckUpload::newItem);
 	
 	itemNameHash.insert("generic_eventlist_games", Event_ListGames::newItem);
 	itemNameHash.insert("generic_eventlist_chat_channels", Event_ListChatChannels::newItem);
@@ -174,7 +175,7 @@ void ProtocolResponse::initializeHash()
 	responseHash.insert("spectators_not_allowed", RespSpectatorsNotAllowed);
 }
 
-bool Response_DeckList::File::readElement(QXmlStreamReader *xml)
+bool DeckList_File::readElement(QXmlStreamReader *xml)
 {
 	if (xml->isEndElement())
 		return true;
@@ -182,7 +183,7 @@ bool Response_DeckList::File::readElement(QXmlStreamReader *xml)
 		return false;
 }
 
-void Response_DeckList::File::writeElement(QXmlStreamWriter *xml)
+void DeckList_File::writeElement(QXmlStreamWriter *xml)
 {
 	xml->writeStartElement("file");
 	xml->writeAttribute("name", name);
@@ -191,13 +192,13 @@ void Response_DeckList::File::writeElement(QXmlStreamWriter *xml)
 	xml->writeEndElement();
 }
 
-Response_DeckList::Directory::~Directory()
+DeckList_Directory::~DeckList_Directory()
 {
 	for (int i = 0; i < size(); ++i)
 		delete at(i);
 }
 
-bool Response_DeckList::Directory::readElement(QXmlStreamReader *xml)
+bool DeckList_Directory::readElement(QXmlStreamReader *xml)
 {
 	if (currentItem) {
 		if (currentItem->readElement(xml))
@@ -205,10 +206,10 @@ bool Response_DeckList::Directory::readElement(QXmlStreamReader *xml)
 		return false;
 	}
 	if (xml->isStartElement() && (xml->name() == "directory")) {
-		currentItem = new Directory(xml->attributes().value("name").toString());
+		currentItem = new DeckList_Directory(xml->attributes().value("name").toString());
 		append(currentItem);
 	} else if (xml->isStartElement() && (xml->name() == "file")) {
-		currentItem = new File(xml->attributes().value("name").toString(), xml->attributes().value("id").toString().toInt(), QDateTime::fromTime_t(xml->attributes().value("upload_time").toString().toUInt()));
+		currentItem = new DeckList_File(xml->attributes().value("name").toString(), xml->attributes().value("id").toString().toInt(), QDateTime::fromTime_t(xml->attributes().value("upload_time").toString().toUInt()));
 		append(currentItem);
 	} else if (xml->isEndElement() && (xml->name() == "directory"))
 		return true;
@@ -216,7 +217,7 @@ bool Response_DeckList::Directory::readElement(QXmlStreamReader *xml)
 	return false;
 }
 
-void Response_DeckList::Directory::writeElement(QXmlStreamWriter *xml)
+void DeckList_Directory::writeElement(QXmlStreamWriter *xml)
 {
 	xml->writeStartElement("directory");
 	xml->writeAttribute("name", name);
@@ -225,7 +226,7 @@ void Response_DeckList::Directory::writeElement(QXmlStreamWriter *xml)
 	xml->writeEndElement();
 }
 
-Response_DeckList::Response_DeckList(int _cmdId, ResponseCode _responseCode, Directory *_root)
+Response_DeckList::Response_DeckList(int _cmdId, ResponseCode _responseCode, DeckList_Directory *_root)
 	: ProtocolResponse(_cmdId, _responseCode, "deck_list"), root(_root), readFinished(false)
 {
 }
@@ -242,7 +243,7 @@ bool Response_DeckList::readElement(QXmlStreamReader *xml)
 	
 	if (!root) {
 		if (xml->isStartElement() && (xml->name() == "directory")) {
-			root = new Directory;
+			root = new DeckList_Directory;
 			return true;
 		}
 		return false;
@@ -292,20 +293,38 @@ void Response_DeckDownload::writeElement(QXmlStreamWriter *xml)
 		deck->writeElement(xml);
 }
 
-Response_DeckUpload::Response_DeckUpload(int _cmdId, ResponseCode _responseCode, int _deckId)
-	: ProtocolResponse(_cmdId, _responseCode, "deck_upload"), deckId(_deckId)
+Response_DeckUpload::Response_DeckUpload(int _cmdId, ResponseCode _responseCode, DeckList_File *_file)
+	: ProtocolResponse(_cmdId, _responseCode, "deck_upload"), file(_file), readFinished(false)
 {
-	setParameter("deck_id", deckId);
 }
 
-void Response_DeckUpload::extractParameters()
+Response_DeckUpload::~Response_DeckUpload()
 {
-	ProtocolResponse::extractParameters();
+	delete file;
+}
+
+bool Response_DeckUpload::readElement(QXmlStreamReader *xml)
+{
+	if (readFinished)
+		return false;
 	
-	bool ok;
-	deckId = parameters["deck_id"].toInt(&ok);
-	if (!ok)
-		deckId = -1;
+	if (!file) {
+		if (xml->isStartElement() && (xml->name() == "file")) {
+			file = new DeckList_File(xml->attributes().value("name").toString(), xml->attributes().value("id").toString().toInt(), QDateTime::fromTime_t(xml->attributes().value("upload_time").toString().toUInt()));
+			return true;
+		}
+		return false;
+	}
+	
+	if (file->readElement(xml))
+		readFinished = true;
+	return true;
+}
+
+void Response_DeckUpload::writeElement(QXmlStreamWriter *xml)
+{
+	if (file)
+		file->writeElement(xml);
 }
 
 GenericEvent::GenericEvent(const QString &_eventName)

common/protocol.h

@@ -5,8 +5,7 @@
 #include <QMap>
 #include <QHash>
 #include <QObject>
-#include <QDebug>
-#include <QDateTime>
+#include <QVariant>
 #include "protocol_item_ids.h"
 #include "protocol_datastructures.h"
 
@@ -70,6 +69,7 @@ private:
 	int cmdId;
 	int ticks;
 	static int lastCmdId;
+	QVariant extraData;
 protected:
 	QString getItemType() const { return "cmd"; }
 	void extractParameters();
@@ -78,6 +78,8 @@ public:
 	int getCmdId() const { return cmdId; }
 	int tick() { return ++ticks; }
 	void processResponse(ProtocolResponse *response);
+	void setExtraData(const QVariant &_extraData) { extraData = _extraData; }
+	QVariant getExtraData() const { return extraData; }
 };
 
 class InvalidCommand : public Command {
@@ -168,48 +170,18 @@ public:
 
 class Response_DeckList : public ProtocolResponse {
 	Q_OBJECT
-public:
-	class TreeItem {
-	protected:
-		QString name;
-		int id;
-	public:
-		TreeItem(const QString &_name, int _id) : name(_name), id(_id) { }
-		QString getName() const { return name; }
-		int getId() const { return id; }
-		virtual bool readElement(QXmlStreamReader *xml) = 0;
-		virtual void writeElement(QXmlStreamWriter *xml) = 0;
-	};
-	class File : public TreeItem {
-	private:
-		QDateTime uploadTime;
-	public:
-		File(const QString &_name, int _id, QDateTime _uploadTime) : TreeItem(_name, _id), uploadTime(_uploadTime) { }
-		bool readElement(QXmlStreamReader *xml);
-		void writeElement(QXmlStreamWriter *xml);
-		QDateTime getUploadTime() const { return uploadTime; }
-	};
-	class Directory : public TreeItem, public QList<TreeItem *> {
-	private:
-		TreeItem *currentItem;
-	public:
-		Directory(const QString &_name = QString(), int _id = 0) : TreeItem(_name, _id), currentItem(0) { }
-		~Directory();
-		bool readElement(QXmlStreamReader *xml);
-		void writeElement(QXmlStreamWriter *xml);
-	};
 private:
-	Directory *root;
+	DeckList_Directory *root;
 	bool readFinished;
 protected:
 	bool readElement(QXmlStreamReader *xml);
 	void writeElement(QXmlStreamWriter *xml);
 public:
-	Response_DeckList(int _cmdId = -1, ResponseCode _responseCode = RespOk, Directory *_root = 0);
+	Response_DeckList(int _cmdId = -1, ResponseCode _responseCode = RespOk, DeckList_Directory *_root = 0);
 	~Response_DeckList();
 	int getItemId() const { return ItemId_Response_DeckList; }
 	static ProtocolItem *newItem() { return new Response_DeckList; }
-	Directory *getRoot() const { return root; }
+	DeckList_Directory *getRoot() const { return root; }
 };
 
 class Response_DeckDownload : public ProtocolResponse {
@@ -231,14 +203,17 @@ public:
 class Response_DeckUpload : public ProtocolResponse {
 	Q_OBJECT
 private:
-	int deckId;
+	DeckList_File *file;
+	bool readFinished;
 protected:
-	void extractParameters();
+	bool readElement(QXmlStreamReader *xml);
+	void writeElement(QXmlStreamWriter *xml);
 public:
-	Response_DeckUpload(int _cmdId = -1, ResponseCode _responseCode = RespOk, int _deckId = -1);
+	Response_DeckUpload(int _cmdId = -1, ResponseCode _responseCode = RespOk, DeckList_File *_file = 0);
+	~Response_DeckUpload();
 	int getItemId() const { return ItemId_Response_DeckUpload; }
 	static ProtocolItem *newItem() { return new Response_DeckUpload; }
-	int getDeckId() const { return deckId; }
+	DeckList_File *getFile() const { return file; }
 };
 
 // --------------

common/protocol_datastructures.h

@@ -3,6 +3,10 @@
 
 #include <QString>
 #include <QColor>
+#include <QDateTime>
+
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
 enum ResponseCode { RespNothing, RespOk, RespInvalidCommand, RespInvalidData, RespNameNotFound, RespLoginNeeded, RespContextError, RespWrongPassword, RespSpectatorsNotAllowed };
 
@@ -155,4 +159,34 @@ public:
 	QColor getColor() const { return color; }
 };
 
+class DeckList_TreeItem {
+protected:
+	QString name;
+	int id;
+public:
+	DeckList_TreeItem(const QString &_name, int _id) : name(_name), id(_id) { }
+	QString getName() const { return name; }
+	int getId() const { return id; }
+	virtual bool readElement(QXmlStreamReader *xml) = 0;
+	virtual void writeElement(QXmlStreamWriter *xml) = 0;
+};
+class DeckList_File : public DeckList_TreeItem {
+private:
+	QDateTime uploadTime;
+public:
+	DeckList_File(const QString &_name, int _id, QDateTime _uploadTime) : DeckList_TreeItem(_name, _id), uploadTime(_uploadTime) { }
+	bool readElement(QXmlStreamReader *xml);
+	void writeElement(QXmlStreamWriter *xml);
+	QDateTime getUploadTime() const { return uploadTime; }
+};
+class DeckList_Directory : public DeckList_TreeItem, public QList<DeckList_TreeItem *> {
+private:
+	DeckList_TreeItem *currentItem;
+public:
+	DeckList_Directory(const QString &_name = QString(), int _id = 0) : DeckList_TreeItem(_name, _id), currentItem(0) { }
+	~DeckList_Directory();
+	bool readElement(QXmlStreamReader *xml);
+	void writeElement(QXmlStreamWriter *xml);
+};
+
 #endif