ldforge: comparison src/download.cpp

-:8458cf2719d1
+:ec1e2059319b
 #include "gldraw.h"
 PartDownloader g_PartDownloader;
 cfg (str, net_downloadpath, "");
+cfg (bool, net_guesspaths, true);
+cfg (bool, net_autoclose, false);
 constexpr const char* PartDownloader::k_OfficialURL,
 	*PartDownloader::k_UnofficialURL;
 // =============================================================================
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadPrompt::modifyDest (str& dest) const {
 	dest = dest.simplified();
-	if (getSource() == CustomURL)
+	// If the user doesn't want us to guess, stop right here.
-		dest = basename (dest);
+	if (net_guesspaths == false)
+		return;
 	// Ensure .dat extension
 	if (dest.right (4) != ".dat") {
 		// Remove the existing extension, if any. It may be we're here over a
 		// typo in the .dat extension.
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadPrompt::startDownload() {
+	str dest = ui->fname->text();
+	setPrimaryFile (null);
+	if (getSource() == CustomURL)
+		dest = basename (getURL());
+	modifyDest (dest);
+	if (QFile::exists (PartDownloader::getDownloadPath() + dest)) {
+		const str overwritemsg = fmt (tr ("%1 already exists in download directory. Overwrite?"), dest);
+		if (!confirm (tr ("Overwrite?"), overwritemsg))
+			return;
+	}
 	ui->progress->setEnabled (true);
 	ui->buttonBox->setEnabled (false);
 	ui->fname->setEnabled (false);
 	ui->source->setEnabled (false);
-	str dest = ui->fname->text();
-	modifyDest (dest);
 	downloadFile (dest, getURL(), true);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadPrompt::checkIfFinished() {
+	bool failed = false;
 	// If there is some download still working, we're not finished.
-	for (PartDownloadRequest* req : m_requests)
+	for (PartDownloadRequest* req : m_requests) {
 		if (!req->isFinished())
 			return;
+		if (req->state() == PartDownloadRequest::Failed)
+			failed = true;
+	}
+	for (PartDownloadRequest* req : m_requests)
+		delete req;
 	// Update everything now
-	reloadAllSubfiles();
+	if (primaryFile()) {
-	g_win->fullRefresh();
+		LDFile::setCurrent (primaryFile());
-	g_win->R()->resetAngles();
+		reloadAllSubfiles();
+		g_win->fullRefresh();
-	// Allow the prompt be closed now.
+		g_win->R()->resetAngles();
-	ui->buttonBox->disconnect (SIGNAL (accepted()));
+		m_requests.clear();
-	connect (ui->buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
-	ui->buttonBox->setEnabled (true);
+		if (net_autoclose && !failed) {
-	ui->progress->setEnabled (false);
+			// Close automatically if desired.
+			accept();
-	// accept();
+		} else {
+			// Allow the prompt be closed now.
+			ui->buttonBox->disconnect (SIGNAL (accepted()));
+			connect (ui->buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
+			ui->buttonBox->setEnabled (true);
+			ui->progress->setEnabled (false);
+		}
+	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 PartDownloadRequest::PartDownloadRequest (str url, str dest, bool primary, PartDownloadPrompt* parent) :
 	m_dest (dest),
 	m_fpath (PartDownloader::getDownloadPath() + dest),
 	m_nam (new QNetworkAccessManager),
 	m_firstUpdate (true),
 	m_state (Requesting),
-	m_primary (primary)
+	m_primary (primary),
+	m_fp (null)
 {
-	m_fpath.replace ("\\", "/");
-	QFile::remove (m_fpath);
 	// Make sure that we have a valid destination.
 	str dirpath = dirname (m_fpath);
 	QDir dir (dirpath);
 	if (!dir.exists()) {
 		prog->setValue (m_bytesRead);
 		break;
 	case Finished:
 	case Failed:
-	case Aborted:
 		{
 			QLabel* lb = new QLabel ((m_state == Finished) ? "<b><span style=\"color: #080\">FINISHED</span></b>" :
 				"<b><span style=\"color: #800\">FAILED</span></b>");
 			lb->setAlignment (Qt::AlignCenter);
 			table->setCellWidget (tableRow(), ProgressColumn, lb);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadRequest::downloadFinished() {
-	m_state = m_reply->error() == QNetworkReply::NoError ? Finished : Failed;
+	if (m_reply->error() != QNetworkReply::NoError)
+		m_state = Failed;
+	elif (state() != Failed)
+		m_state = Finished;
 	m_bytesRead = m_bytesTotal;
 	updateToTable();
+	if (m_fp) {
+		m_fp->close();
+		delete m_fp;
+		m_fp = null;
+	}
 	if (m_state != Finished) {
 		m_prompt->checkIfFinished();
 		return;
 	}
+	print ("state: %1\n", (int) m_state);
 	// Try to load this file now.
 	LDFile* f = openDATFile (m_fpath, false);
 	if (!f)
 		return;
 		m_prompt->modifyDest (dest);
 		m_prompt->downloadFile (dest, str (PartDownloader::k_UnofficialURL) + dest, false);
 	}
 	if (m_primary)
-		LDFile::setCurrent (f);
+		m_prompt->setPrimaryFile (f);
 	m_prompt->checkIfFinished();
 }
 // =============================================================================
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadRequest::readyRead() {
-	QFile f (m_fpath);
+	if (state() == Failed)
-	if (!f.open (QIODevice::Append))
+		return;
-		return;
+	if (m_fp == null) {
-	f.write (m_reply->readAll());
+		m_fpath.replace ("\\", "/");
-	f.close();
+		// We have already asked the user whether we can overwrite so we're good
+		// to go here.
+		m_fp = new QFile (m_fpath);
+		if (!m_fp->open (QIODevice::WriteOnly)) {
+			critical (fmt (tr ("Couldn't open %1 for writing: %2"), m_fpath, strerror (errno)));
+			m_state = Failed;
+			m_reply->abort();
+			updateToTable();
+			m_prompt->checkIfFinished();
+			return;
+		}
+	}
+	m_fp->write (m_reply->readAll());
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void PartDownloadRequest::downloadError() {
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 bool PartDownloadRequest::isFinished() const {
-	return m_state == Finished || m_state == Failed || m_state == Aborted;
+	return m_state == Finished || m_state == Failed;
+}
+// =============================================================================
+// -----------------------------------------------------------------------------
+const PartDownloadRequest::State& PartDownloadRequest::state() const {
+	return m_state;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 DEFINE_ACTION (DownloadFrom, 0) {

Mercurial > ldforge / file comparison

comparison: src/download.cpp

src/download.cpp