Get rid of QNAM (now subclassed and less needy). Basic LWJGL download and extraction.

2 files changed, 0 insertions, 176 deletions

diff --git a/libutil/src/dlqueue.cpp b/libutil/src/dlqueue.cpp
deleted file mode 100644
index 65e0e31e..00000000
--- a/libutil/src/dlqueue.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "include/dlqueue.h"
-#include <include/pathutils.h>
-
-DownloadJob::DownloadJob (QUrl url,
-						  QString target_path,
-						  QString expected_md5 )
-	:Job()
-{
-	m_url = url;
-	m_target_path = target_path;
-	m_expected_md5 = expected_md5;
-
-	m_check_md5 = m_expected_md5.size();
-	m_save_to_file = m_target_path.size();
-	m_status = Job_NotStarted;
-	m_opened_for_saving = false;
-	m_manager.reset(new QNetworkAccessManager());
-}
-
-JobPtr DownloadJob::create (QUrl url,
-							QString target_path,
-							QString expected_md5 )
-{
-	return JobPtr ( new DownloadJob ( url, target_path, expected_md5 ) );
-}
-
-DownloadJob::DownloadJob (QSharedPointer<QNetworkAccessManager> net_mgr,
-						  QUrl url,
-						  QString target_path,
-						  QString expected_md5 )
-	:Job()
-{
-	m_url = url;
-	m_target_path = target_path;
-	m_expected_md5 = expected_md5;
-
-	m_check_md5 = m_expected_md5.size();
-	m_save_to_file = m_target_path.size();
-	m_status = Job_NotStarted;
-	m_opened_for_saving = false;
-	m_manager = net_mgr;
-}
-
-JobPtr DownloadJob::create (QSharedPointer<QNetworkAccessManager> net_mgr,
-							QUrl url,
-							QString target_path,
-							QString expected_md5 )
-{
-	return JobPtr ( new DownloadJob ( net_mgr, url, target_path, expected_md5 ) );
-}
-
-void DownloadJob::start()
-{
-	if ( m_save_to_file )
-	{
-		QString filename = m_target_path;
-		m_output_file.setFileName ( filename );
-		// 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 ) )
-		{
-			// 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 )
-			{
-				qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
-				emit finish();
-				return;
-			}
-			else
-			{
-				m_expected_md5 = hash;
-			}
-		}
-		if(!ensurePathExists(filename))
-		{
-			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 ) ) );
-	connect ( rep, SIGNAL ( finished() ), SLOT ( downloadFinished() ) );
-	connect ( rep, SIGNAL ( error ( QNetworkReply::NetworkError ) ), SLOT ( downloadError ( QNetworkReply::NetworkError ) ) );
-	connect ( rep, SIGNAL ( readyRead() ), SLOT ( downloadReadyRead() ) );
-}
-
-void DownloadJob::downloadProgress ( qint64 bytesReceived, qint64 bytesTotal )
-{
-	emit progress ( bytesReceived, bytesTotal );
-}
-
-void DownloadJob::downloadError ( QNetworkReply::NetworkError error )
-{
-	// error happened during download.
-	// TODO: log the reason why
-	m_status = Job_Failed;
-}
-
-void DownloadJob::downloadFinished()
-{
-	// if the download succeeded
-	if ( m_status != Job_Failed )
-	{
-		// nothing went wrong...
-		m_status = Job_Finished;
-		// save the data to the downloadable if we aren't saving to file
-		if ( !m_save_to_file )
-		{
-			m_data = m_reply->readAll();
-		}
-		else
-		{
-			m_output_file.close();
-		}
-
-		//TODO: check md5 here!
-		m_reply.clear();
-		emit finish();
-		return;
-	}
-	// else the download failed
-	else
-	{
-		if ( m_save_to_file )
-		{
-			m_output_file.close();
-			m_output_file.remove();
-		}
-		m_reply.clear();
-		emit fail();
-		return;
-	}
-}
-
-void DownloadJob::downloadReadyRead()
-{
-	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() );
-	}
-}
diff --git a/libutil/src/netutils.cpp b/libutil/src/netutils.cpp
deleted file mode 100644
index 57eead9b..00000000
--- a/libutil/src/netutils.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "include/netutils.h"