From 116f293212694481f41f28007997e4b11f296b34 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 9 Oct 2016 00:57:02 +0900
Subject: [PATCH] Remove old methods
---
src/handlers/xdgurl.cpp | 77 +----------------------------------------
src/handlers/xdgurl.h | 4 ---
2 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index 97069e5..646ef59 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -3,13 +3,13 @@
#include <QUrlQuery>
#include <QTemporaryFile>
#include <QMimeDatabase>
-#include <QProcess>
#include <QNetworkReply>
#include "../core/config.h"
#include "../core/network.h"
#include "../utility/file.h"
#include "../utility/json.h"
+#include "../utility/package.h"
#include "xdgurl.h"
@@ -20,7 +20,6 @@ XdgUrl::XdgUrl(const QString &xdgUrl, Core::Config *appConfig, Core::Config *use
{
_metadata = _parse();
_destinations = _loadDestinations();
- _archiveTypes = _loadArchiveTypes();
}
QJsonObject XdgUrl::_parse()
@@ -116,80 +115,6 @@ QJsonObject XdgUrl::_loadDestinations()
return destinations;
}
-QJsonObject XdgUrl::_loadArchiveTypes()
-{
- QJsonObject archiveTypes;
- QJsonObject appConfigArchiveTypes = _appConfig->get("archive_types");
- QJsonObject userConfigArchiveTypes = _userConfig->get("archive_types");
-
- archiveTypes = appConfigArchiveTypes;
-
- if (!userConfigArchiveTypes.isEmpty()) {
- foreach (const QString key, userConfigArchiveTypes.keys()) {
- archiveTypes[key] = userConfigArchiveTypes.value(key);
- }
- }
-
- return archiveTypes;
-}
-
-bool XdgUrl::_installPlasmapkg(const QString &path, const QString &type)
-{
- QProcess process;
- QString program = "plasmapkg2"; // Use plasmapkg2 for now
- QStringList arguments;
- arguments << "-t" << type << "-i" << path;
-
- process.start(program, arguments);
-
- if (process.waitForFinished()) {
- return true;
- }
-
- return false;
-}
-
-bool XdgUrl::_uncompressArchive(const QString &path, const QString &targetDir)
-{
- QMimeDatabase mimeDb;
- QString mimeType = mimeDb.mimeTypeForFile(path).name();
- QString archiveType;
-
- QProcess process;
- QString program;
- QStringList arguments;
-
- if (_archiveTypes.contains(mimeType)) {
- archiveType = _archiveTypes[mimeType].toString();
-
- if (archiveType == "tar") {
- program = "tar";
- arguments << "-xf" << path << "-C" << targetDir;
- }
- else if (archiveType == "zip") {
- program = "unzip";
- arguments << "-o" << path << "-d" << targetDir;
- }
- else if (archiveType == "7z") {
- program = "7z";
- arguments << "x" << path << "-o" + targetDir; // No space between -o and directory
- }
- else if (archiveType == "rar") {
- program = "unrar";
- arguments << "e" << path << targetDir;
- }
-
- process.start(program, arguments);
-
- if (process.waitForFinished()) {
- process.waitForReadyRead();
- return true;
- }
- }
-
- return false;
-}
-
void XdgUrl::_saveDownloadedFile(QNetworkReply *reply)
{
QJsonObject result;
diff --git a/src/handlers/xdgurl.h b/src/handlers/xdgurl.h
index 9fcccc4..d3d87f3 100644
--- a/src/handlers/xdgurl.h
+++ b/src/handlers/xdgurl.h
@@ -25,7 +25,6 @@ private:
QJsonObject _metadata;
QJsonObject _destinations;
- QJsonObject _archiveTypes;
public:
explicit XdgUrl(const QString &xdgUrl, Core::Config *appConfig, Core::Config *userConfig, Core::Network *asyncNetwork, QObject *parent = 0);
@@ -34,9 +33,6 @@ private:
QJsonObject _parse();
QString _convertPathString(const QString &path);
QJsonObject _loadDestinations();
- QJsonObject _loadArchiveTypes();
- bool _installPlasmapkg(const QString &path, const QString &type = "plasmoid");
- bool _uncompressArchive(const QString &path, const QString &targetDir);
void _saveDownloadedFile(QNetworkReply *reply);
void _installDownloadedFile(QNetworkReply *reply);
--
GitLab