Merge remote-tracking branch 'upstream/master'

Conflicts:
	gui/mainwindow.cpp

3 files changed, 55 insertions, 40 deletions

diff --git a/libutil/include/dlqueue.h b/libutil/include/dlqueue.h
index 9041e762..69fc22a6 100644
--- a/libutil/include/dlqueue.h
+++ b/libutil/include/dlqueue.h
@@ -5,13 +5,16 @@
 /**
  * A single file for the downloader/cache to process.
  */
-class DownloadJob : public Job
+class LIBUTIL_EXPORT DownloadJob : public Job
 {
 	Q_OBJECT
 public:
 	DownloadJob(QUrl url, QString rel_target_path = QString(), QString expected_md5 = QString());
 	static JobPtr create(QUrl url, QString rel_target_path = QString(), QString expected_md5 = QString());
 	
+	
+public:
+	static bool ensurePathExists(QString filenamepath);
 public slots:
 	virtual void start();
 	
@@ -37,8 +40,10 @@ public:
 	
 	/// save to file?
 	bool m_save_to_file;
+	/// is the saving file already open?
+	bool m_opened_for_saving;
 	/// if saving to file, use the one specified in this string
-	QString m_rel_target_path;
+	QString m_target_path;
 	/// this is the output file, if any
 	QFile m_output_file;
 	/// if not saving to file, downloaded data is placed here
diff --git a/libutil/include/jobqueue.h b/libutil/include/jobqueue.h
index 061686f6..26f49307 100644
--- a/libutil/include/jobqueue.h
+++ b/libutil/include/jobqueue.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <QtCore>
+#include "libutil_config.h"
 
 enum JobStatus
 {
@@ -11,7 +12,7 @@ enum JobStatus
 
 class JobList;
 
-class Job : public QObject
+class LIBUTIL_EXPORT Job : public QObject
 {
 	Q_OBJECT
 protected:
@@ -30,7 +31,7 @@ typedef QSharedPointer<Job> JobPtr;
 /**
  * A list of jobs, to be processed one by one.
  */
-class JobList : public QObject
+class LIBUTIL_EXPORT JobList : public QObject
 {
 	friend class JobListQueue;
 	Q_OBJECT
@@ -127,7 +128,7 @@ typedef QSharedPointer<JobList> JobListPtr;
 /**
  * A queue of job lists! The job lists fail or finish as units.
  */
-class JobListQueue : public QObject
+class LIBUTIL_EXPORT JobListQueue : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libutil/src/dlqueue.cpp b/libutil/src/dlqueue.cpp
index dfc51f36..1ef8e212 100644
--- a/libutil/src/dlqueue.cpp
+++ b/libutil/src/dlqueue.cpp
@@ -1,20 +1,28 @@
 #include "include/dlqueue.h"
 
-DownloadJob::DownloadJob ( QUrl url, QString rel_target_path, QString expected_md5 )
+DownloadJob::DownloadJob ( QUrl url, QString target_path, QString expected_md5 )
 	:Job()
 {
 	m_url = url;
-	m_rel_target_path = rel_target_path;
+	m_target_path = target_path;
 	m_expected_md5 = expected_md5;
 
 	m_check_md5 = m_expected_md5.size();
-	m_save_to_file = m_rel_target_path.size();
+	m_save_to_file = m_target_path.size();
 	m_status = Job_NotStarted;
+	m_opened_for_saving = false;
 }
 
-JobPtr DownloadJob::create ( QUrl url, QString rel_target_path, QString expected_md5 )
+JobPtr DownloadJob::create ( QUrl url, QString target_path, QString expected_md5 )
 {
-	return JobPtr ( new DownloadJob ( url, rel_target_path, expected_md5 ) );
+	return JobPtr ( new DownloadJob ( url, target_path, expected_md5 ) );
+}
+
+bool DownloadJob::ensurePathExists(QString filenamepath)
+{
+	QFileInfo a ( filenamepath );
+	QDir dir;
+	return (dir.mkpath ( a.path() ));
 }
 
 void DownloadJob::start()
@@ -22,47 +30,35 @@ void DownloadJob::start()
 	m_manager.reset ( new QNetworkAccessManager() );
 	if ( m_save_to_file )
 	{
-		QString filename = m_rel_target_path;
+		QString filename = m_target_path;
 		m_output_file.setFileName ( filename );
-		// if there already is a file and md5 checking is in effect
-		if ( m_output_file.exists() && m_check_md5 )
+		// if there already is a file and md5 checking is in effect and it can be opened
+		if ( m_output_file.exists() && m_output_file.open ( QIODevice::ReadOnly ) )
 		{
-			// and it can be opened
-			if ( m_output_file.open ( QIODevice::ReadOnly ) )
+			// check the md5 against the expected one
+			QString hash = QCryptographicHash::hash ( m_output_file.readAll(), QCryptographicHash::Md5 ).toHex().constData();
+			m_output_file.close();
+			// skip this file if they match
+			if ( m_check_md5 && hash == m_expected_md5 )
 			{
-				// check the md5 against the expected one
-				QString hash = QCryptographicHash::hash ( m_output_file.readAll(), QCryptographicHash::Md5 ).toHex().constData();
-				m_output_file.close();
-				// skip this file if they match
-				if ( hash == m_expected_md5 )
-				{
-					qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
-					emit finish();
-					return;
-				}
+				qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
+				emit finish();
+				return;
+			}
+			else
+			{
+				m_expected_md5 = hash;
 			}
 		}
-		QFileInfo a ( filename );
-		QDir dir;
-		if ( !dir.mkpath ( a.path() ) )
-		{
-			/*
-			 * error when making the folder structure
-			 */
-			emit fail();
-			return;
-		}
-		if ( !m_output_file.open ( QIODevice::WriteOnly ) )
+		if(!ensurePathExists(filename))
 		{
-			/*
-			 * Can't open the file... the job failed
-			 */
 			emit fail();
 			return;
 		}
 	}
 	qDebug() << "Downloading " << m_url.toString();
 	QNetworkRequest request ( m_url );
+	request.setRawHeader(QString("If-None-Match").toLatin1(), m_expected_md5.toLatin1()); 
 	QNetworkReply * rep = m_manager->get ( request );
 	m_reply = QSharedPointer<QNetworkReply> ( rep, &QObject::deleteLater );
 	connect ( rep, SIGNAL ( downloadProgress ( qint64,qint64 ) ), SLOT ( downloadProgress ( qint64,qint64 ) ) );
@@ -121,8 +117,21 @@ void DownloadJob::downloadFinished()
 
 void DownloadJob::downloadReadyRead()
 {
-	if ( m_save_to_file )
+	if( m_save_to_file )
 	{
+		if(!m_opened_for_saving)
+		{
+			if ( !m_output_file.open ( QIODevice::WriteOnly ) )
+			{
+				/*
+				* Can't open the file... the job failed
+				*/
+				m_reply->abort();
+				emit fail();
+				return;
+			}
+			m_opened_for_saving = true;
+		}
 		m_output_file.write ( m_reply->readAll() );
 	}
 }