Piddle-farting with 1.6 instances. Now with more json!

3 files changed, 27 insertions, 24 deletions

diff --git a/libutil/include/dlqueue.h b/libutil/include/dlqueue.h
index 5fb9409c..14fa6e60 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();
 	
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 7e4d47eb..9a080c17 100644
--- a/libutil/src/dlqueue.cpp
+++ b/libutil/src/dlqueue.cpp
@@ -17,6 +17,13 @@ JobPtr DownloadJob::create ( QUrl url, QString target_path, QString 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()
 {
 	m_manager.reset ( new QNetworkAccessManager() );
@@ -24,34 +31,26 @@ void DownloadJob::start()
 	{
 		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_check_md5 && 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 ( 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;
 			}
 		}
-		QFileInfo a ( filename );
-		QDir dir;
-		if ( !dir.mkpath ( a.path() ) )
+		if(!ensurePathExists(filename))
 		{
-			/*
-			 * error when making the folder structure
-			 */
 			emit fail();
 			return;
 		}
+		
 		if ( !m_output_file.open ( QIODevice::WriteOnly ) )
 		{
 			/*