Merge lp:~jocke-karlsson/forssim/ftp into lp:forssim

[jocke]

[Martin Flodin (mflodin)]

We need an external ftp-server before this can be committed to the main branch. It also needs more comments in the code - something we still do to little of.

review: Needs Fixing

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-06-03 14:26:23 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-06-09 12:35:44 +0000
@@ -142,10 +142,12 @@
 	quitApplicationField.reset(new QuitApplicationField);
 	keySensor->keyPress->route( quitApplicationField );
 
+	/*This is done in ftpDownloadComplete() instead.
 	// Show the window where the user can register themselves
 	registerUserWindow.reset(new RegisterUserWindow(this));
 	registerUserWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 	registerUserWindow->showMaximized();
+*/
 
 	databasePassword = settings->value(databasePasswordKey, "").toString();
 	settings->setValue(databasePasswordKey, databasePassword);
@@ -162,6 +164,16 @@
 	else
 		forsDatabase.close();
 
+	/*Set up ftp connection and cd to correct directory on server.*/
+	ftp.reset(new QFtp(this));
+	connect(ftp.get(), SIGNAL(commandFinished(int, bool)),
+			this, SLOT(ftpCommandFinished(int, bool)));
+
+	ftp->connectToHost("10.66.5.197");
+	ftp->login("hiq","hiqhiq");
+	myCDcommand = ftp->cd("cases");
+	/*Ftp download of cases is started when cd command is finished.*/
+
 	this->restoreOverrideCursor();
 }
 
@@ -252,6 +264,7 @@
 	else
 		selectCaseWindow->initialize();
 
+	//Moved to showSelectCaseWindow() so can wait until all cases are shown.
 	selectCaseWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 	selectCaseWindow->showFullScreen();
 
@@ -259,6 +272,7 @@
 	registerUserWindow->close();
 
 	this->restoreOverrideCursor();
+
 }
 
 bool ApplicationNode::getIsMirrored()
@@ -497,3 +511,69 @@
 {
 	this->restoreOverrideCursor();
 }
+
+void ApplicationNode::ftpCommandFinished(int commandID, bool error)
+{
+	cout << "ApplicationNode ftpCommandFinished: " << endl;
+
+	cout << "state: " << ftp->state() << endl;
+
+	if (ftp->currentCommand() == QFtp::ConnectToHost) {
+		if (error) {
+			std::cout << "CommandError ConnectToHost" << std::endl;
+			return;
+		}
+		std::cout << "ApplicationNode CommandFinished ConnectToHost" << std::endl;
+		return;
+	}
+
+	if (ftp->currentCommand() == QFtp::Login) {
+		if (error) {
+			return;
+		}
+		std::cout << "ApplicationNode CommandFinished Login" << std::endl;
+		return;
+	}
+
+	if (ftp->currentCommand() == QFtp::Cd) {
+		if (error) {
+			std::cout << "ApplicationNode CommandError CD" << std::endl;
+			return;
+		}
+		std::cout << "ApplicationNode CommandFinished CD" << std::endl;
+		if (commandID == myCDcommand)
+		{
+			/*Create localCaselist and serverCaseList and download cases over ftp if not already downloaded.*/
+			localCaseList.reset(new LocalCaseList(this->getCaseDirectory(), this->getFtp()));
+			QObject::connect(this->getLocalCaseList(), SIGNAL(downloadComplete()),
+					this, SLOT(ftpDownloadComplete()));
+			serverCaseList.reset(new ServerCaseList(this->getForsDatabase()));
+			serverCaseList->syncWithLocal(*localCaseList.get());
+		}
+		return;
+	}
+}
+
+void ApplicationNode::ftpCommandStarted(int id)
+{
+	std::cout << "ApplicationNode CommandStarted: " << id << std::endl;
+}
+
+void ApplicationNode::ftpDownloadComplete()
+{
+	cout << "ApplicationNode::ftpDownloadComplete()" << endl;
+	// Show the window where the user can register themselves
+	registerUserWindow.reset(new RegisterUserWindow(this));
+	registerUserWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
+	registerUserWindow->showMaximized();
+}
+
+QFtp* ApplicationNode::getFtp()
+{
+	return ftp.get();
+}
+
+LocalCaseList* ApplicationNode::getLocalCaseList()
+{
+	return localCaseList.get();
+}

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-06-03 14:26:23 +0000
+++ FsWisdom/ApplicationNode.h	2009-06-09 12:35:44 +0000
@@ -24,11 +24,15 @@
 #include "SelectCaseWindow.h"
 #include "RemoveWisdomToothWindow.h"
 #include "GlWindowNode.h"
+#include "LocalCaseList.h"
+#include "ServerCaseList.h"
 
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QtSql/QSqlDatabase>
+#include <QtNetwork/QFtp>
+#include <QtNetwork/QUrlInfo>
 
 #include <stdexcept>
 #include <time.h>
@@ -153,6 +157,9 @@
 		return forsDatabase;
 	}
 
+	QFtp* getFtp();
+	LocalCaseList* getLocalCaseList();
+
 public slots:
 
 	/// Quit the application
@@ -164,13 +171,16 @@
 	/// Returns to the Register User Screen
 	void logout();
 
-
 	/**
 	 * Displays a save/exit popup
 	 * Data is stored in the database. Forbidden segements are stored with their segmentID negative.
 	 */
 	void exitX3DWithStandardGuiWindow();
 
+	void ftpCommandFinished(int commandID, bool error);
+	void ftpCommandStarted(int id);
+	void ftpDownloadComplete();
+
 private:
 
 	void RouteWidgets(bool isPlayback);
@@ -239,6 +249,12 @@
 	LoggingNode* loggingNode;
 
 	QSqlDatabase forsDatabase;
+
+    auto_ptr<LocalCaseList> localCaseList;
+    auto_ptr<ServerCaseList> serverCaseList;
+
+	auto_ptr<QFtp> ftp;
+	int myCDcommand;
 };
 
 }

=== modified file 'FsWisdom/FsWisdom.pro'
--- FsWisdom/FsWisdom.pro	2009-06-03 13:57:58 +0000
+++ FsWisdom/FsWisdom.pro	2009-06-09 12:35:44 +0000
@@ -8,12 +8,11 @@
     target.path = "C:\Program files\FsWisdom"
     INSTALLS += target
 }
-
 QT += core \
     gui \
     opengl \
-    sql
-
+    sql \
+    network
 HEADERS += Updater_QButton_SFBoolPB.h \
     Updater_QButton_SFFloat.h \
     Updater_QProgressBar_PlaybackProgressBar.h \
@@ -50,9 +49,7 @@
     ../quazip/quazipnewinfo.h \
     ../quazip/unzip.h \
     ../quazip/zip.h
-
 INCLUDEPATH += /usr/local/boost_1_39_0
-
 SOURCES += Updater_QButton_SFBoolPB.cpp \
     Updater_QButton_SFFloat.cpp \
     Updater_QProgressBar_PlaybackProgressBar.cpp \
@@ -86,14 +83,11 @@
     ../quazip/quazipnewinfo.cpp \
     ../quazip/unzip.c \
     ../quazip/zip.c
-
 FORMS += RemoveWisdomToothWindow.ui \
     RegisterUserWindow.ui \
     SelectCaseWindow.ui \
     RegisterUserWindow.ui
-
 RESOURCES += 
-
 LIBS += -lH3DAPI \
     -lH3DUtil \
     -lHAPI \

=== modified file 'FsWisdom/LocalCaseList.cpp'
--- FsWisdom/LocalCaseList.cpp	2009-05-18 11:56:11 +0000
+++ FsWisdom/LocalCaseList.cpp	2009-06-09 12:35:44 +0000
@@ -1,10 +1,9 @@
 #include "LocalCaseList.h"
-
+using namespace std;
 using namespace FS;
 
-LocalCaseList::LocalCaseList(const QDir& caseDirectory, QListWidget* const listWidget)
-	: caseDirectory(caseDirectory),
-	listWidget(listWidget)
+LocalCaseList::LocalCaseList(const QDir& caseDirectory, QFtp* Ftp)
+	: caseDirectory(caseDirectory)
 {
 	// build up a list of locally installed cases
 	QStringList directoryList = caseDirectory.entryList(QDir::Dirs, QDir::Name);
@@ -19,52 +18,89 @@
 		catch(const Case::CaseException&){}
 	}
 
-	// display a sorted list of cases in the listWidget
-	listWidget->clear();
-	listWidget->addItems(getStringList());
-	listWidget->setSortingEnabled(true);
+	this->ftp = Ftp;
+	connect(ftp, SIGNAL(commandFinished(int, bool)),
+			this, SLOT(ftpCommandFinished(int, bool)));
+}
+
+void LocalCaseList::ftpDownload(QString fileName)
+{
+	cout << "LocalCaseList::ftpDownload: " << fileName.toStdString() << endl;
+
+	if (fileName != NULL)
+	{
+		fileFtp = new QFile(QDir::tempPath() +  QDir::separator() + fileName);
+		if (!fileFtp->open(QIODevice::WriteOnly)) {
+			std::cout << "Unable to save the file" << std::endl;
+			delete fileFtp;
+			return;
+		}
+		ftp->get(fileName,fileFtp);
+	}
+	else
+	{
+		emit downloadComplete();
+	}
+}
+
+void LocalCaseList::ftpCommandFinished(int, bool error)
+{
+	cout << "LocalCaseList ftpCommandFinished: " << endl;
+
+	if (ftp->currentCommand() == QFtp::ConnectToHost) {
+		if (error) {
+			std::cout << "CommandError ConnectToHost" << std::endl;
+			return;
+		}
+		std::cout << "LocalCaseList CommandFinished ConnectToHost" << std::endl;
+		return;
+	}
+
+	if (ftp->currentCommand() == QFtp::Login) {
+		if (error) {
+			return;
+		}
+		std::cout << "LocalCaseList CommandFinished Login" << std::endl;
+		return;
+	}
+
+	if (ftp->currentCommand() == QFtp::Get) {
+		if (error) {
+			std::cout << "CommandError Get" << std::endl;
+			fileFtp->close();
+			fileFtp->remove();
+			delete fileFtp;
+		} else {
+			std::cout << "LocalCaseList CommandFinished Get: " << QFileInfo(*fileFtp).absoluteFilePath().toStdString() << std::endl;
+			fileFtp->close();
+			unzipFile(QFileInfo(*fileFtp).absoluteFilePath());
+			delete fileFtp;
+			if (ftpDownloadVector.size() > 0)
+			{
+				std::cout << "LocalCaseList Vector size: " << ftpDownloadVector.size() << std::endl;
+				ftpDownload(ftpDownloadVector.back());
+				ftpDownloadVector.pop_back();
+			}
+			else
+			{
+				std::cout << "LocalCaseList Vector size=0" << std::endl;
+				emit downloadComplete();
+			}
+		}
+	}
 }
 
 void LocalCaseList::addLocally(const Case& newCase, QSqlDatabase& forsDatabase)
 {
 	// check if we actually have anything to install in the first place
 	if(!beginCaseInstallation(newCase, false))
+	{
 		return;  // nothing to install
-
-	if(forsDatabase.open())
+	}
+	else
 	{
-		std::cout << "Installing locally the case: " << newCase << std::endl;
-
-		QSqlQuery query;
-
-		// read file from server
-		query.prepare("select archiveFile from forsCase left join forsCaseVersion on forsCase.forsCaseId = forsCaseVersion.forsCaseId where name = :name && version = :version;");
-		query.bindValue(":name",newCase.getName());
-		query.bindValue(":version",newCase.getVersion());
-		if(query.exec())
-		{
-			query.next();
-			QByteArray byteArray = query.value(0).toByteArray();
-
-			QFile file(QDir::tempPath() +  QDir::separator() + newCase.getFileArchiveName());
-			if (file.open(QIODevice::WriteOnly))
-			{
-				file.write(byteArray);
-				file.close();
-				std::cout << "File added to temp: " << QFileInfo(file).absoluteFilePath().toStdString() << std::endl;
-
-				unzipFile(QFileInfo(file).absoluteFilePath());
-			}
-			else
-				std::cout << "Failed to write to file: " << QFileInfo(file).absoluteFilePath().toStdString() << std::endl;
-		}
-		else
-			std::cout << "Failed to read archive file from server: " << newCase << std::endl;
-
-		forsDatabase.close();
+		ftpDownloadVector.push_back(newCase.getFileArchiveName());
 	}
-	else
-		std::cout << "Couldn't install case: " << newCase << " due to failure to connect to database"<< std::endl;
 }
 
 void LocalCaseList::addLocally(const QDir& archiveFilePath)
@@ -89,8 +125,9 @@
 }
 
 /*
- * returns true if we need to install this case. updates the map with this new case and updates the list widget.
- * also removes the old directory and creates the new directory which should then be filled
+ * Returns true if we need to install this case. Updates the map with this new case.
+ * OBS: The list widget is updated and populated in SelectCaseWindow::initialize().
+ * removes the old directory and creates the new directory which should then be filled.
  */
 bool LocalCaseList::beginCaseInstallation(const Case& newCase, bool ignoreVersion)
 {
@@ -112,16 +149,6 @@
 			if(!removeDirectory(directory))
 				throw LocalCaseListException("Failed to remove previous case directory");
 
-			// find entry in listWidget and remove it
-			for(int i = 0; i < listWidget->count();i++ )
-				if(listWidget->item(i)->text() == ((*localCase).second).getDirectoryName())
-				{
-					QListWidgetItem *listWidgetItem = listWidget->takeItem(i);
-					delete listWidgetItem;
-					break;
-				}
-
-				// remove from map also
 			erase(localCase);
 		}
 		else
@@ -134,7 +161,6 @@
 		std::cout << "Case not previously installed" << std::endl;
 
 	insert(begin(), std::pair<QString, Case>(newCase.getName(), newCase));
-	listWidget->addItem(newCase.getDirectoryName());
 
 	// create the new case directory within the cases directory
 	if(!caseDirectory.mkdir(caseDirectory.path() + QDir::separator() + newCase.getDirectoryName()))
@@ -145,6 +171,7 @@
 
 void LocalCaseList::unzipFile(const QDir& zipFilePath)
 {
+	std::cout << "Start unzip of: " << zipFilePath.path().toStdString() << std::endl;
 	QuaZip zip(zipFilePath.path());
 	if(!zip.open(QuaZip::mdUnzip))
 		throw LocalCaseListException("Failed to open file archive");  // zip.getZipError()
@@ -226,7 +253,7 @@
 	return(isSuccessful);
 }
 
-bool LocalCaseList::getX3dFilePathForSelectedRow(QDir& x3dFilePathForSelectedRow)
+bool LocalCaseList::getX3dFilePathForSelectedRow(QDir& x3dFilePathForSelectedRow, QListWidget* const listWidget)
 {
 	int currentlySelectedRowIndex = listWidget->currentRow();
 
@@ -240,9 +267,10 @@
 	return false;
 }
 
-const Case LocalCaseList::getCaseForSelectedRow()
+const Case LocalCaseList::getCaseForSelectedRow(QListWidget* const listWidget)
 {
 	int currentlySelectedRowIndex = listWidget->currentRow();
+	std::cout << "getCaseForSelectedRow: " << listWidget->item(currentlySelectedRowIndex)->text().toStdString() << std::endl;
 	return Case(listWidget->item(currentlySelectedRowIndex)->text());
 }
 

=== modified file 'FsWisdom/LocalCaseList.h'
--- FsWisdom/LocalCaseList.h	2009-05-18 11:56:11 +0000
+++ FsWisdom/LocalCaseList.h	2009-06-09 12:35:44 +0000
@@ -15,21 +15,31 @@
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>
 
+#include <QFile>
+#include <QFileInfo>
+#include <QtNetwork/QFtp>
+#include <QtNetwork/QUrlInfo>
 #include <iostream>
 #include <stdexcept>
+#include <memory>
+#include <vector>
 
 #include "../quazip/quazip.h"
 #include "../quazip/quazipfile.h"
 
+
 namespace FS
 {
 
-class LocalCaseList : public CaseList
+class LocalCaseList : public QObject, public CaseList
 {
+public:
+	Q_OBJECT
+
 private:
 	const QDir& caseDirectory;
 public:
-	LocalCaseList(const QDir& caseDirectory, QListWidget* const listWidget);
+	LocalCaseList(const QDir& caseDirectory, QFtp* Ftp);
 
 	// This will delete any version of this case if it exists and replace it with that
 	// referenced to via
@@ -40,8 +50,11 @@
 
 	void addLocally(const QDir& archiveFilePath);
 	void addLocally(const Case& newCase, QSqlDatabase& forsDatabase);
-	bool getX3dFilePathForSelectedRow(QDir& x3dFilePathForSelectedRow);
-	const Case getCaseForSelectedRow();
+	bool getX3dFilePathForSelectedRow(QDir& x3dFilePathForSelectedRow, QListWidget* const listWidget);
+	const Case getCaseForSelectedRow(QListWidget* const listWidget);
+
+	void ftpDownload(QString fileName);
+	std::vector<QString> ftpDownloadVector;
 
 	/**
 	 * Run time exception class for LocalCaseList
@@ -59,6 +72,12 @@
 				}
 	};
 
+signals:
+	void downloadComplete();
+
+private slots:
+	void ftpCommandFinished(int, bool error);
+
 private:
 	/**
 	 * returns a string list with the directory name of each case stored herein
@@ -66,10 +85,12 @@
 	 */
 	QStringList getStringList() const;
 	bool removeDirectory(QDir &directory);
-	QListWidget* const listWidget;
 
 	bool beginCaseInstallation(const Case& newCase, bool ignoreVersion);
 	void unzipFile(const QDir& zipFilePath);
+
+	QFtp* ftp;
+	QFile *fileFtp;
 };
 
 }

=== modified file 'FsWisdom/SelectCaseWindow.cpp'
--- FsWisdom/SelectCaseWindow.cpp	2009-05-28 13:25:00 +0000
+++ FsWisdom/SelectCaseWindow.cpp	2009-06-09 12:35:44 +0000
@@ -53,12 +53,16 @@
 
 void SelectCaseWindow::initialize()
 {
-	//	QString usernameLabel = "Username: " + applicationNode->getUsername();
-	//	ui.userNameLabel->setText(usernameLabel);
+	//Downloading of usecases is already done. Populate list-widget.
+	ui.caseListWidget->clear();
+	map<QString, Case>::iterator it = applicationNode->getLocalCaseList()->begin();
+	for(it=applicationNode->getLocalCaseList()->begin(); it!=applicationNode->getLocalCaseList()->end(); it++)
+	{
+		cout << "SelectCaseWindow::initialize(): "<< ((*it).second).getDirectoryName().toStdString() << endl;
+		ui.caseListWidget->addItem(((*it).second).getDirectoryName());
+	}
 
-	localCaseList.reset(new LocalCaseList(applicationNode->getCaseDirectory(), ui.caseListWidget));
-	serverCaseList.reset(new ServerCaseList(applicationNode->getForsDatabase()));
-	serverCaseList->syncWithLocal(*localCaseList.get());
+	ui.caseListWidget->setSortingEnabled(true);
 }
 
 SelectCaseWindow::~SelectCaseWindow()
@@ -118,8 +122,8 @@
 	applicationNode->processEvents();
 
 	// if a file is selected
-	if(!fileName.isEmpty())
-		localCaseList->addLocally(QDir(fileName));
+//	if(!fileName.isEmpty())
+	//	localCaseList->addLocally(QDir(fileName));
 
 	applicationNode->restoreNormalCursor();
 }
@@ -137,13 +141,13 @@
 void SelectCaseWindow::launchCase(bool isPlayback)
 {
 	QDir x3dFilePath;
-	if(localCaseList->getX3dFilePathForSelectedRow(x3dFilePath))
+	if(applicationNode->getLocalCaseList()->getX3dFilePathForSelectedRow(x3dFilePath, ui.caseListWidget))
 	{
 		int forsCaseVersionId = -1;
 
 		if(applicationNode->getForsDatabase().open())
 		{
-			const Case& selectedCase = localCaseList->getCaseForSelectedRow();
+			const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
 
 			QSqlQuery query;
 			query.prepare("select forsCaseVersionId from forsCase left join forsCaseVersion on forsCase.forsCaseId = forsCaseVersion.forsCaseId where name = :name && version = :version;");
@@ -176,7 +180,7 @@
 
 		if(applicationNode->getForsDatabase().open())
 		{
-			const Case& selectedCase = localCaseList->getCaseForSelectedRow();
+			const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
 
 			QSqlQuery query;
 
@@ -217,7 +221,7 @@
 	QStringList stringList;
 	if(applicationNode->getForsDatabase().open())
 	{
-		const Case& selectedCase = localCaseList->getCaseForSelectedRow();
+		const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
 
 		QSqlQuery query;
 		query.prepare("select dateAdded from userCase join user on user.userId = userCase.userId join forsCaseVersion on userCase.forsCaseVersionId = forsCaseVersion.forsCaseVersionId join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName && user.name = :userName;");
@@ -241,7 +245,8 @@
 {
 	if(applicationNode->getForsDatabase().open())
 	{
-		const Case& selectedCase = localCaseList->getCaseForSelectedRow();
+		const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
+
 
 		QSqlQuery query;
 		query.prepare("select anamnes from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName;");
@@ -259,7 +264,7 @@
 {
 	if(applicationNode->getForsDatabase().open())
 	{
-		const Case& selectedCase = localCaseList->getCaseForSelectedRow();
+		const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
 
 		QSqlQuery query;
 		query.prepare("select objectives from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName;");

=== modified file 'FsWisdom/ServerCaseList.cpp'
--- FsWisdom/ServerCaseList.cpp	2009-05-14 15:35:49 +0000
+++ FsWisdom/ServerCaseList.cpp	2009-06-09 12:35:44 +0000
@@ -34,4 +34,21 @@
 	// b) install the latest version of the case locally
 	for(serverCase=begin(); serverCase!=end(); serverCase++)
 		localCaseList.addLocally(Case(((*serverCase).second).getName(), ((*serverCase).second).getVersion()), forsDatabase);
+
+	//Start download over ftp.
+	if (localCaseList.ftpDownloadVector.size() != 0)
+	{
+		std::vector<QString>::iterator it ;
+		for(it=localCaseList.ftpDownloadVector.begin(); it!=localCaseList.ftpDownloadVector.end(); it++)
+			std::cout << "ftpDownloadVector: " << (*it).toStdString() << std::endl;
+
+		QString temp = localCaseList.ftpDownloadVector.back();
+		localCaseList.ftpDownloadVector.pop_back();
+		localCaseList.ftpDownload(temp);
+	}
+	else
+	{
+		localCaseList.ftpDownload(NULL);
+	}
+
 }

=== modified file 'FsWisdom/ServerCaseList.h'
--- FsWisdom/ServerCaseList.h	2009-05-14 15:35:49 +0000
+++ FsWisdom/ServerCaseList.h	2009-06-09 12:35:44 +0000
@@ -14,6 +14,7 @@
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
+#include <vector>
 
 namespace FS
 {