From 74b456c3314765a06fdfe8fed60b10d12fa0a1c5 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sat, 12 Nov 2016 07:40:48 +0900
Subject: [PATCH] Code cleanup
---
src/app/handlers/xdgurl.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/handlers/xdgurl.cpp b/src/app/handlers/xdgurl.cpp
index e14eaae..c5709c2 100644
--- a/src/app/handlers/xdgurl.cpp
+++ b/src/app/handlers/xdgurl.cpp
@@ -66,7 +66,6 @@ bool XdgUrl::isValid()
&& !filename.isEmpty()) {
return true;
}
-
return false;
}
@@ -194,14 +193,8 @@ void XdgUrl::installDownloadedFile(qtlibs::NetworkResource *resource)
{
QJsonObject result;
- QString type = metadata_["type"].toString();
- QString destination = destinations_[type].toString();
- QString path = destination + "/" + metadata_["filename"].toString();
QString tempPath = qtlibs::Dir::tempPath() + "/" + metadata_["filename"].toString();
- qtlibs::Dir(destination).make();
- qtlibs::File(path).remove(); // Remove previous downloaded file
-
if (!resource->saveData(tempPath)) {
result["status"] = QString("error_save");
result["message"] = QString("Failed to save data as " + tempPath);
@@ -211,6 +204,13 @@ void XdgUrl::installDownloadedFile(qtlibs::NetworkResource *resource)
qtlibs::Package package(tempPath);
+ QString type = metadata_["type"].toString();
+ QString destination = destinations_[type].toString();
+ QString path = destination + "/" + metadata_["filename"].toString();
+
+ qtlibs::Dir(destination).make();
+ qtlibs::File(path).remove(); // Remove previous downloaded file
+
if (type == "bin"
&& package.installAsProgram(path)) {
result["message"] = QString("The file has been installed into " + destination);
--
GitLab