Fixes for SaveInformation::canSave

fnkkio · fnkkio · commit e7f602bc44fa · 2019-11-22T15:21:34.000+02:00
diff --git a/src/core/TransfersManager.cpp b/src/core/TransfersManager.cpp
@@ -265,11 +265,11 @@ void Transfer::start(QNetworkReply *reply, const QString &target)
 		{
 			m_isSelectingPath = true;
 
-			const SaveInformation information(Utils::getSavePath(fileName, directory));
+			const SaveInformation saveInfo(Utils::getSavePath(fileName, directory));
 
 			m_isSelectingPath = false;
 
-			if (!information.canSave)
+			if (!saveInfo.canSave())
 			{
 				if (m_reply)
 				{
@@ -283,7 +283,7 @@ void Transfer::start(QNetworkReply *reply, const QString &target)
 				return;
 			}
 
-			finalTarget = information.path;
+			finalTarget = saveInfo.path;
 			canOverwriteExisting = true;
 		}
 
@@ -879,16 +879,16 @@ bool Transfer::setTarget(const QString &target, bool canOverwriteExisting)
 		if (result == QMessageBox::No)
 		{
 			const QFileInfo information(target);
-			const QString path(Utils::getSavePath(information.fileName(), information.path(), {}, true).path);
+			const SaveInformation saveInfo(Utils::getSavePath(information.fileName(), information.path(), {}, true));
 
-			if (path.isEmpty())
+			if (!saveInfo.canSave())
 			{
 				cancel();
 
 				return false;
 			}
 
-			mutableTarget = path;
+			mutableTarget = saveInfo.path;
 		}
 		else if (result == QMessageBox::Cancel)
 		{
diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp
@@ -655,8 +655,6 @@ SaveInformation getSavePath(const QString &fileName, const QString &directory, Q
 			}
 
 			information.filter = dialog.selectedNameFilter();
-			information.canSave = true;
-
 			path = dialog.selectedFiles().value(0);
 		}
 
@@ -687,11 +685,7 @@ SaveInformation getSavePath(const QString &fileName, const QString &directory, Q
 	}
 	while (true);
 
-	if (path.isEmpty())
-	{
-		information.canSave = false;
-	}
-	else
+	if (!path.isEmpty())
 	{
 		SettingsManager::setOption(SettingsManager::Paths_SaveFileOption, QFileInfo(path).dir().canonicalPath());
 	}
diff --git a/src/core/Utils.h b/src/core/Utils.h
@@ -85,7 +85,11 @@ struct SaveInformation final
 {
 	QString path;
 	QString filter;
-	bool canSave = false;
+
+	bool canSave() const
+	{
+		return !path.isEmpty();
+	}
 };
 
 namespace Utils
diff --git a/src/modules/backends/web/qtwebengine/QtWebEngineWebWidget.cpp b/src/modules/backends/web/qtwebengine/QtWebEngineWebWidget.cpp
@@ -249,11 +249,11 @@ void QtWebEngineWebWidget::triggerAction(int identifier, const QVariantMap &para
 		case ActionsManager::SaveAction:
 			if (m_page->isViewingMedia())
 			{
-				const SaveInformation information(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));
+                                const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));
 
-				if (information.canSave)
+                                if (saveInfo.canSave())
 				{
-					m_page->save(information.path, QWebEngineDownloadItem::SingleHtmlSaveFormat);
+                                        m_page->save(saveInfo.path, QWebEngineDownloadItem::SingleHtmlSaveFormat);
 				}
 			}
 			else
diff --git a/src/modules/backends/web/qtwebkit/QtWebKitWebWidget.cpp b/src/modules/backends/web/qtwebkit/QtWebKitWebWidget.cpp
@@ -402,16 +402,16 @@ void QtWebKitWebWidget::handleDownloadRequested(const QNetworkRequest &request)
 
 			if (device && device->size() > 0)
 			{
-				const QString path(Utils::getSavePath(request.url().fileName()).path);
+				const SaveInformation saveInfo(Utils::getSavePath(request.url().fileName()));
 
-				if (path.isEmpty())
+				if (!saveInfo.canSave())
 				{
 					device->deleteLater();
 
 					return;
 				}
 
-				QFile file(path);
+				QFile file(saveInfo.path);
 
 				if (!file.open(QIODevice::WriteOnly))
 				{
@@ -435,15 +435,15 @@ void QtWebKitWebWidget::handleDownloadRequested(const QNetworkRequest &request)
 		{
 			const QString imageUrl(hitResult.imageUrl.url());
 			const QString imageType(imageUrl.mid(11, (imageUrl.indexOf(QLatin1Char(';')) - 11)));
-			const QString path(Utils::getSavePath(tr("file") + QLatin1Char('.') + imageType).path);
+			const SaveInformation saveInfo(Utils::getSavePath(tr("file") + QLatin1Char('.') + imageType));
 
-			if (!path.isEmpty())
+			if (saveInfo.canSave())
 			{
-				QImageWriter writer(path);
+				QImageWriter writer(saveInfo.path);
 
 				if (!writer.write(QImage::fromData(QByteArray::fromBase64(imageUrl.mid(imageUrl.indexOf(QLatin1String(";base64,")) + 7).toUtf8()), imageType.toStdString().c_str())))
 				{
-					Console::addMessage(tr("Failed to save image: %1").arg(writer.errorString()), Console::OtherCategory, Console::ErrorLevel, path, -1, getWindowIdentifier());
+					Console::addMessage(tr("Failed to save image: %1").arg(writer.errorString()), Console::OtherCategory, Console::ErrorLevel, saveInfo.path, -1, getWindowIdentifier());
 				}
 			}
 
@@ -875,14 +875,14 @@ void QtWebKitWebWidget::triggerAction(int identifier, const QVariantMap &paramet
 		case ActionsManager::SaveAction:
 			if (m_page->isViewingMedia())
 			{
-				const SaveInformation information(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));
+				const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));
 
-				if (information.canSave)
+				if (saveInfo.canSave())
 				{
 					QNetworkRequest request(getUrl());
 					request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
 
-					TransfersManager::startTransfer(m_networkManager->get(request), information.path, (Transfer::CanAskForPathOption | Transfer::CanAutoDeleteOption | Transfer::CanOverwriteOption | Transfer::IsPrivateOption));
+					TransfersManager::startTransfer(m_networkManager->get(request), saveInfo.path, (Transfer::CanAskForPathOption | Transfer::CanAutoDeleteOption | Transfer::CanOverwriteOption | Transfer::IsPrivateOption));
 				}
 			}
 			else
@@ -1598,11 +1598,11 @@ void QtWebKitWebWidget::triggerAction(int identifier, const QVariantMap &paramet
 				m_page->setViewportSize(viewportSize);
 
 				const QStringList filters({tr("PNG image (*.png)"), tr("JPEG image (*.jpg *.jpeg)")});
-				const SaveInformation result(Utils::getSavePath(suggestSaveFileName(QLatin1String(".png")), {}, filters));
+				const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(QLatin1String(".png")), {}, filters));
 
-				if (result.canSave)
+				if (saveInfo.canSave())
 				{
-					pixmap.save(result.path, ((filters.indexOf(result.filter) == 0) ? "PNG" : "JPEG"));
+					pixmap.save(saveInfo.path, ((filters.indexOf(saveInfo.filter) == 0) ? "PNG" : "JPEG"));
 				}
 			}
 
diff --git a/src/ui/SourceViewerWebWidget.cpp b/src/ui/SourceViewerWebWidget.cpp
@@ -69,11 +69,11 @@ void SourceViewerWebWidget::triggerAction(int identifier, const QVariantMap &par
 	{
 		case ActionsManager::SaveAction:
 			{
-				const QString path(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)).path);
+				const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));
 
-				if (!path.isEmpty())
+				if (saveInfo.canSave())
 				{
-					QFile file(path);
+					QFile file(saveInfo.path);
 
 					if (file.open(QIODevice::WriteOnly))
 					{
@@ -84,7 +84,7 @@ void SourceViewerWebWidget::triggerAction(int identifier, const QVariantMap &par
 					}
 					else
 					{
-						Console::addMessage(tr("Failed to save file: %1").arg(file.errorString()), Console::OtherCategory, Console::ErrorLevel, path);
+						Console::addMessage(tr("Failed to save file: %1").arg(file.errorString()), Console::OtherCategory, Console::ErrorLevel, saveInfo.path);
 
 						QMessageBox::warning(nullptr, tr("Error"), tr("Failed to save file."), QMessageBox::Close);
 					}
diff --git a/src/ui/TransferDialog.cpp b/src/ui/TransferDialog.cpp
@@ -134,9 +134,9 @@ void TransferDialog::handleButtonClicked(QAbstractButton *button)
 			dialog = dialog->parentWidget();
 		}
 
-		const QString path(Utils::getSavePath(m_transfer->getSuggestedFileName()).path);
+		const SaveInformation saveInfo(Utils::getSavePath(m_transfer->getSuggestedFileName()));
 
-		if (path.isEmpty())
+		if (!saveInfo.canSave())
 		{
 			m_transfer->cancel();
 
@@ -145,13 +145,13 @@ void TransferDialog::handleButtonClicked(QAbstractButton *button)
 			return;
 		}
 
-		m_transfer->setTarget(path, true);
+		m_transfer->setTarget(saveInfo.path, true);
 
 		if (m_ui->rememberChoiceCheckBox->isChecked())
 		{
 			HandlersManager::HandlerDefinition definition;
 			definition.transferMode = HandlersManager::HandlerDefinition::SaveTransfer;
-			definition.downloadsPath = QFileInfo(path).canonicalPath();
+			definition.downloadsPath = QFileInfo(saveInfo.path).canonicalPath();
 
 			HandlersManager::setHandler(m_transfer->getMimeType(), definition);
 		}
diff --git a/src/ui/WebWidget.cpp b/src/ui/WebWidget.cpp
@@ -201,17 +201,17 @@ void WebWidget::startTransfer(Transfer *transfer)
 			break;
 		case HandlersManager::HandlerDefinition::SaveAsTransfer:
 			{
-				const QString path(Utils::getSavePath(transfer->getSuggestedFileName(), handler.downloadsPath, {}, true).path);
+				const SaveInformation saveInfo(Utils::getSavePath(transfer->getSuggestedFileName(), handler.downloadsPath, {}, true));
 
-				if (path.isEmpty())
+				if (!saveInfo.canSave())
 				{
 					transfer->cancel();
 					transfer->deleteLater();
 
 					return;
 				}
 
-				transfer->setTarget(path, true);
+				transfer->setTarget(saveInfo.path, true);
 
 				TransfersManager::addTransfer(transfer);
 			}
@@ -776,16 +776,16 @@ QString WebWidget::getSavePath(const QVector<SaveFormat> &allowedFormats, SaveFo
 		filters.append(formats.value(allowedFormats.at(i)));
 	}
 
-	const SaveInformation result(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat), {}, filters));
+	const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat), {}, filters));
 
-	if (!result.canSave)
+	if (!saveInfo.canSave())
 	{
 		return {};
 	}
 
-	*selectedFormat = formats.key(result.filter);
+	*selectedFormat = formats.key(saveInfo.filter);
 
-	return result.path;
+	return saveInfo.path;
 }
 
 QString WebWidget::getOpenActionText(SessionsManager::OpenHints hints) const

Original file line number	Diff line number	Diff line change
`@@ -265,11 +265,11 @@ void Transfer::start(QNetworkReply *reply, const QString &target)`
`265`	`265`	`{`
`266`	`266`	`m_isSelectingPath = true;`
`267`	`267`
`268`		`- const SaveInformation information(Utils::getSavePath(fileName, directory));`
	`268`	`+ const SaveInformation saveInfo(Utils::getSavePath(fileName, directory));`
`269`	`269`
`270`	`270`	`m_isSelectingPath = false;`
`271`	`271`
`272`		`- if (!information.canSave)`
	`272`	`+ if (!saveInfo.canSave())`
`273`	`273`	`{`
`274`	`274`	`if (m_reply)`
`275`	`275`	`{`
`@@ -283,7 +283,7 @@ void Transfer::start(QNetworkReply *reply, const QString &target)`
`283`	`283`	`return;`
`284`	`284`	`}`
`285`	`285`
`286`		`- finalTarget = information.path;`
	`286`	`+ finalTarget = saveInfo.path;`
`287`	`287`	`canOverwriteExisting = true;`
`288`	`288`	`}`
`289`	`289`
`@@ -879,16 +879,16 @@ bool Transfer::setTarget(const QString &target, bool canOverwriteExisting)`
`879`	`879`	`if (result == QMessageBox::No)`
`880`	`880`	`{`
`881`	`881`	`const QFileInfo information(target);`
`882`		`- const QString path(Utils::getSavePath(information.fileName(), information.path(), {}, true).path);`
	`882`	`+ const SaveInformation saveInfo(Utils::getSavePath(information.fileName(), information.path(), {}, true));`
`883`	`883`
`884`		`- if (path.isEmpty())`
	`884`	`+ if (!saveInfo.canSave())`
`885`	`885`	`{`
`886`	`886`	`cancel();`
`887`	`887`
`888`	`888`	`return false;`
`889`	`889`	`}`
`890`	`890`
`891`		`- mutableTarget = path;`
	`891`	`+ mutableTarget = saveInfo.path;`
`892`	`892`	`}`
`893`	`893`	`else if (result == QMessageBox::Cancel)`
`894`	`894`	`{`
Original file line number	Diff line number	Diff line change
`@@ -655,8 +655,6 @@ SaveInformation getSavePath(const QString &fileName, const QString &directory, Q`
`655`	`655`	`}`
`656`	`656`
`657`	`657`	`information.filter = dialog.selectedNameFilter();`
`658`		`- information.canSave = true;`
`659`		`-`
`660`	`658`	`path = dialog.selectedFiles().value(0);`
`661`	`659`	`}`
`662`	`660`
`@@ -687,11 +685,7 @@ SaveInformation getSavePath(const QString &fileName, const QString &directory, Q`
`687`	`685`	`}`
`688`	`686`	`while (true);`
`689`	`687`
`690`		`- if (path.isEmpty())`
`691`		`- {`
`692`		`- information.canSave = false;`
`693`		`- }`
`694`		`- else`
	`688`	`+ if (!path.isEmpty())`
`695`	`689`	`{`
`696`	`690`	`SettingsManager::setOption(SettingsManager::Paths_SaveFileOption, QFileInfo(path).dir().canonicalPath());`
`697`	`691`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,11 +249,11 @@ void QtWebEngineWebWidget::triggerAction(int identifier, const QVariantMap &para`
`249`	`249`	`case ActionsManager::SaveAction:`
`250`	`250`	`if (m_page->isViewingMedia())`
`251`	`251`	`{`
`252`		`- const SaveInformation information(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));`
	`252`	`+ const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));`
`253`	`253`
`254`		`- if (information.canSave)`
	`254`	`+ if (saveInfo.canSave())`
`255`	`255`	`{`
`256`		`- m_page->save(information.path, QWebEngineDownloadItem::SingleHtmlSaveFormat);`
	`256`	`+ m_page->save(saveInfo.path, QWebEngineDownloadItem::SingleHtmlSaveFormat);`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`else`
Original file line number	Diff line number	Diff line change
`@@ -402,16 +402,16 @@ void QtWebKitWebWidget::handleDownloadRequested(const QNetworkRequest &request)`
`402`	`402`
`403`	`403`	`if (device && device->size() > 0)`
`404`	`404`	`{`
`405`		`- const QString path(Utils::getSavePath(request.url().fileName()).path);`
	`405`	`+ const SaveInformation saveInfo(Utils::getSavePath(request.url().fileName()));`
`406`	`406`
`407`		`- if (path.isEmpty())`
	`407`	`+ if (!saveInfo.canSave())`
`408`	`408`	`{`
`409`	`409`	`device->deleteLater();`
`410`	`410`
`411`	`411`	`return;`
`412`	`412`	`}`
`413`	`413`
`414`		`- QFile file(path);`
	`414`	`+ QFile file(saveInfo.path);`
`415`	`415`
`416`	`416`	`if (!file.open(QIODevice::WriteOnly))`
`417`	`417`	`{`
`@@ -435,15 +435,15 @@ void QtWebKitWebWidget::handleDownloadRequested(const QNetworkRequest &request)`
`435`	`435`	`{`
`436`	`436`	`const QString imageUrl(hitResult.imageUrl.url());`
`437`	`437`	`const QString imageType(imageUrl.mid(11, (imageUrl.indexOf(QLatin1Char(';')) - 11)));`
`438`		`- const QString path(Utils::getSavePath(tr("file") + QLatin1Char('.') + imageType).path);`
	`438`	`+ const SaveInformation saveInfo(Utils::getSavePath(tr("file") + QLatin1Char('.') + imageType));`
`439`	`439`
`440`		`- if (!path.isEmpty())`
	`440`	`+ if (saveInfo.canSave())`
`441`	`441`	`{`
`442`		`- QImageWriter writer(path);`
	`442`	`+ QImageWriter writer(saveInfo.path);`
`443`	`443`
`444`	`444`	`if (!writer.write(QImage::fromData(QByteArray::fromBase64(imageUrl.mid(imageUrl.indexOf(QLatin1String(";base64,")) + 7).toUtf8()), imageType.toStdString().c_str())))`
`445`	`445`	`{`
`446`		`- Console::addMessage(tr("Failed to save image: %1").arg(writer.errorString()), Console::OtherCategory, Console::ErrorLevel, path, -1, getWindowIdentifier());`
	`446`	`+ Console::addMessage(tr("Failed to save image: %1").arg(writer.errorString()), Console::OtherCategory, Console::ErrorLevel, saveInfo.path, -1, getWindowIdentifier());`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`
`@@ -875,14 +875,14 @@ void QtWebKitWebWidget::triggerAction(int identifier, const QVariantMap &paramet`
`875`	`875`	`case ActionsManager::SaveAction:`
`876`	`876`	`if (m_page->isViewingMedia())`
`877`	`877`	`{`
`878`		`- const SaveInformation information(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));`
	`878`	`+ const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));`
`879`	`879`
`880`		`- if (information.canSave)`
	`880`	`+ if (saveInfo.canSave())`
`881`	`881`	`{`
`882`	`882`	`QNetworkRequest request(getUrl());`
`883`	`883`	`request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);`
`884`	`884`
`885`		`- TransfersManager::startTransfer(m_networkManager->get(request), information.path, (Transfer::CanAskForPathOption \| Transfer::CanAutoDeleteOption \| Transfer::CanOverwriteOption \| Transfer::IsPrivateOption));`
	`885`	`+ TransfersManager::startTransfer(m_networkManager->get(request), saveInfo.path, (Transfer::CanAskForPathOption \| Transfer::CanAutoDeleteOption \| Transfer::CanOverwriteOption \| Transfer::IsPrivateOption));`
`886`	`886`	`}`
`887`	`887`	`}`
`888`	`888`	`else`
`@@ -1598,11 +1598,11 @@ void QtWebKitWebWidget::triggerAction(int identifier, const QVariantMap &paramet`
`1598`	`1598`	`m_page->setViewportSize(viewportSize);`
`1599`	`1599`
`1600`	`1600`	`const QStringList filters({tr("PNG image (.png)"), tr("JPEG image (.jpg *.jpeg)")});`
`1601`		`- const SaveInformation result(Utils::getSavePath(suggestSaveFileName(QLatin1String(".png")), {}, filters));`
	`1601`	`+ const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(QLatin1String(".png")), {}, filters));`
`1602`	`1602`
`1603`		`- if (result.canSave)`
	`1603`	`+ if (saveInfo.canSave())`
`1604`	`1604`	`{`
`1605`		`- pixmap.save(result.path, ((filters.indexOf(result.filter) == 0) ? "PNG" : "JPEG"));`
	`1605`	`+ pixmap.save(saveInfo.path, ((filters.indexOf(saveInfo.filter) == 0) ? "PNG" : "JPEG"));`
`1606`	`1606`	`}`
`1607`	`1607`	`}`
`1608`	`1608`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ void SourceViewerWebWidget::triggerAction(int identifier, const QVariantMap &par`
`69`	`69`	`{`
`70`	`70`	`case ActionsManager::SaveAction:`
`71`	`71`	`{`
`72`		`- const QString path(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)).path);`
	`72`	`+ const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat)));`
`73`	`73`
`74`		`- if (!path.isEmpty())`
	`74`	`+ if (saveInfo.canSave())`
`75`	`75`	`{`
`76`		`- QFile file(path);`
	`76`	`+ QFile file(saveInfo.path);`
`77`	`77`
`78`	`78`	`if (file.open(QIODevice::WriteOnly))`
`79`	`79`	`{`
`@@ -84,7 +84,7 @@ void SourceViewerWebWidget::triggerAction(int identifier, const QVariantMap &par`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- Console::addMessage(tr("Failed to save file: %1").arg(file.errorString()), Console::OtherCategory, Console::ErrorLevel, path);`
	`87`	`+ Console::addMessage(tr("Failed to save file: %1").arg(file.errorString()), Console::OtherCategory, Console::ErrorLevel, saveInfo.path);`
`88`	`88`
`89`	`89`	`QMessageBox::warning(nullptr, tr("Error"), tr("Failed to save file."), QMessageBox::Close);`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ void TransferDialog::handleButtonClicked(QAbstractButton *button)`
`134`	`134`	`dialog = dialog->parentWidget();`
`135`	`135`	`}`
`136`	`136`
`137`		`- const QString path(Utils::getSavePath(m_transfer->getSuggestedFileName()).path);`
	`137`	`+ const SaveInformation saveInfo(Utils::getSavePath(m_transfer->getSuggestedFileName()));`
`138`	`138`
`139`		`- if (path.isEmpty())`
	`139`	`+ if (!saveInfo.canSave())`
`140`	`140`	`{`
`141`	`141`	`m_transfer->cancel();`
`142`	`142`
`@@ -145,13 +145,13 @@ void TransferDialog::handleButtonClicked(QAbstractButton *button)`
`145`	`145`	`return;`
`146`	`146`	`}`
`147`	`147`
`148`		`- m_transfer->setTarget(path, true);`
	`148`	`+ m_transfer->setTarget(saveInfo.path, true);`
`149`	`149`
`150`	`150`	`if (m_ui->rememberChoiceCheckBox->isChecked())`
`151`	`151`	`{`
`152`	`152`	`HandlersManager::HandlerDefinition definition;`
`153`	`153`	`definition.transferMode = HandlersManager::HandlerDefinition::SaveTransfer;`
`154`		`- definition.downloadsPath = QFileInfo(path).canonicalPath();`
	`154`	`+ definition.downloadsPath = QFileInfo(saveInfo.path).canonicalPath();`
`155`	`155`
`156`	`156`	`HandlersManager::setHandler(m_transfer->getMimeType(), definition);`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,17 +201,17 @@ void WebWidget::startTransfer(Transfer *transfer)`
`201`	`201`	`break;`
`202`	`202`	`case HandlersManager::HandlerDefinition::SaveAsTransfer:`
`203`	`203`	`{`
`204`		`- const QString path(Utils::getSavePath(transfer->getSuggestedFileName(), handler.downloadsPath, {}, true).path);`
	`204`	`+ const SaveInformation saveInfo(Utils::getSavePath(transfer->getSuggestedFileName(), handler.downloadsPath, {}, true));`
`205`	`205`
`206`		`- if (path.isEmpty())`
	`206`	`+ if (!saveInfo.canSave())`
`207`	`207`	`{`
`208`	`208`	`transfer->cancel();`
`209`	`209`	`transfer->deleteLater();`
`210`	`210`
`211`	`211`	`return;`
`212`	`212`	`}`
`213`	`213`
`214`		`- transfer->setTarget(path, true);`
	`214`	`+ transfer->setTarget(saveInfo.path, true);`
`215`	`215`
`216`	`216`	`TransfersManager::addTransfer(transfer);`
`217`	`217`	`}`
`@@ -776,16 +776,16 @@ QString WebWidget::getSavePath(const QVector<SaveFormat> &allowedFormats, SaveFo`
`776`	`776`	`filters.append(formats.value(allowedFormats.at(i)));`
`777`	`777`	`}`
`778`	`778`
`779`		`- const SaveInformation result(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat), {}, filters));`
	`779`	`+ const SaveInformation saveInfo(Utils::getSavePath(suggestSaveFileName(SingleFileSaveFormat), {}, filters));`
`780`	`780`
`781`		`- if (!result.canSave)`
	`781`	`+ if (!saveInfo.canSave())`
`782`	`782`	`{`
`783`	`783`	`return {};`
`784`	`784`	`}`
`785`	`785`
`786`		`- *selectedFormat = formats.key(result.filter);`
	`786`	`+ *selectedFormat = formats.key(saveInfo.filter);`
`787`	`787`
`788`		`- return result.path;`
	`788`	`+ return saveInfo.path;`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`QString WebWidget::getOpenActionText(SessionsManager::OpenHints hints) const`