diff --git a/src/libs/qtlibs/config.cpp b/src/libs/qtlibs/config.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2dd6fc91c4e4f50d984319e482bda15af5fb83e9
--- /dev/null
+++ b/src/libs/qtlibs/config.cpp
@@ -0,0 +1,55 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "config.h"
+
+#include "file.h"
+#include "dir.h"
+#include "json.h"
+
+namespace qtlibs {
+
+Config::Config(const QString &configDirPath, QObject *parent) :
+ QObject(parent), configDirPath_(configDirPath)
+{}
+
+QString Config::configDirPath() const
+{
+ return configDirPath_;
+}
+
+void Config::setConfigDirPath(const QString &configDirPath)
+{
+ configDirPath_ = configDirPath;
+}
+
+QJsonObject Config::get(const QString &name)
+{
+ QString configFilePath = configDirPath() + "/" + name + ".json";
+ QByteArray json = qtlibs::File(configFilePath).readData();
+ if (json.isEmpty()) {
+ json = QString("{}").toUtf8(); // Blank JSON data as default
+ }
+ return qtlibs::Json(json).toObject();
+}
+
+bool Config::set(const QString &name, const QJsonObject &object)
+{
+ QString configFilePath = configDirPath() + "/" + name + ".json";
+ QByteArray json = qtlibs::Json(object).toJson();
+ qtlibs::Dir(configDirPath()).make();
+ if (qtlibs::File(configFilePath).writeData(json)) {
+ return true;
+ }
+ return false;
+}
+
+} // namespace qtlibs
diff --git a/src/libs/utils/config.h b/src/libs/qtlibs/config.h
similarity index 56%
rename from src/libs/utils/config.h
rename to src/libs/qtlibs/config.h
index 9949407873709013bd414ff9b695c31e21c05f6d..567fbfe44f4f8a03f9e4443dd05ed7cd3322805e 100644
--- a/src/libs/utils/config.h
+++ b/src/libs/qtlibs/config.h
@@ -6,7 +6,7 @@
* @author Akira Ohgaki <akiraohgaki@gmail.com>
* @copyright Akira Ohgaki
* @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
+ * @link https://github.com/akiraohgaki/qtlibs
*/
#pragma once
@@ -14,21 +14,23 @@
#include <QObject>
#include <QJsonObject>
-namespace utils {
+namespace qtlibs {
class Config : public QObject
{
Q_OBJECT
public:
- explicit Config(const QString &configsDir, QObject *parent = 0);
+ explicit Config(const QString &configDirPath, QObject *parent = 0);
+
+ QString configDirPath() const;
+ void setConfigDirPath(const QString &configDirPath);
QJsonObject get(const QString &name);
- bool set(const QString &name, const QJsonObject &jsonObj);
+ bool set(const QString &name, const QJsonObject &object);
private:
- QString configsDir_;
- QJsonObject cacheData_;
+ QString configDirPath_;
};
-} // namespace utils
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/dir.cpp b/src/libs/qtlibs/dir.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e244881a89d6bb538374d749e478ed8afb4eb99d
--- /dev/null
+++ b/src/libs/qtlibs/dir.cpp
@@ -0,0 +1,149 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "dir.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QStandardPaths>
+
+namespace qtlibs {
+
+Dir::Dir(const QString &path, QObject *parent) :
+ QObject(parent), path_(path)
+{}
+
+QString Dir::path() const
+{
+ return path_;
+}
+
+void Dir::setPath(const QString &path)
+{
+ path_ = path;
+}
+
+bool Dir::exists()
+{
+ QDir dir(path());
+ return dir.exists();
+}
+
+QFileInfoList Dir::list()
+{
+ QDir dir(path());
+ dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
+ //dir.setSorting(QDir::DirsFirst | QDir::Name);
+ return dir.entryInfoList();
+}
+
+bool Dir::make()
+{
+ // This function will create all parent directories
+ QDir dir(path());
+ if (!dir.exists() && dir.mkpath(path())) {
+ return true;
+ }
+ return false;
+}
+
+bool Dir::copy(const QString &newPath)
+{
+ // This function will copy files recursively
+ return copyRecursively(path(), newPath);
+}
+
+bool Dir::move(const QString &newPath)
+{
+ QDir dir(path());
+ return dir.rename(path(), newPath);
+}
+
+bool Dir::remove()
+{
+ // This function will remove files recursively
+ QDir dir(path());
+ return dir.removeRecursively();
+}
+
+QString Dir::rootPath()
+{
+ return QDir::rootPath();
+}
+
+QString Dir::tempPath()
+{
+ return QDir::tempPath();
+}
+
+QString Dir::homePath()
+{
+ return QDir::homePath();
+}
+
+QString Dir::genericDataPath()
+{
+ return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+}
+
+QString Dir::genericConfigPath()
+{
+ return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
+}
+
+QString Dir::genericCachePath()
+{
+ return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
+}
+
+QString Dir::kdehomePath()
+{
+ // KDE System Administration/Environment Variables
+ // https://userbase.kde.org/KDE_System_Administration/Environment_Variables
+
+ // KDE 4 maybe uses $KDEHOME
+ QString kdehomePath = QString::fromLocal8Bit(qgetenv("KDEHOME").constData());
+ if (kdehomePath.isEmpty()) {
+ kdehomePath = homePath() + "/.kde";
+ }
+ return kdehomePath;
+}
+
+bool Dir::copyRecursively(const QString &srcPath, const QString &newPath)
+{
+ QFileInfo fileInfo(srcPath);
+ if (fileInfo.isFile()) {
+ QFile file(srcPath);
+ if (file.copy(newPath)) {
+ return true;
+ }
+ }
+ else if (fileInfo.isDir()) {
+ QDir newDir(newPath);
+ QString newDirName = newDir.dirName();
+ newDir.cdUp();
+ if (newDir.mkdir(newDirName)) {
+ QDir dir(srcPath);
+ dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
+ QStringList entries = dir.entryList();
+ foreach (const QString &entry, entries) {
+ if (!copyRecursively(srcPath + "/" + entry, newPath + "/" + entry)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+}
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/dir.h b/src/libs/qtlibs/dir.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf0b90797f7017609469087781608d0095941794
--- /dev/null
+++ b/src/libs/qtlibs/dir.h
@@ -0,0 +1,50 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QFileInfoList>
+
+namespace qtlibs {
+
+class Dir : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit Dir(const QString &path, QObject *parent = 0);
+
+ QString path() const;
+ void setPath(const QString &path);
+
+ bool exists();
+ QFileInfoList list();
+ bool make();
+ bool copy(const QString &newPath);
+ bool move(const QString &newPath);
+ bool remove();
+
+ static QString rootPath();
+ static QString tempPath();
+ static QString homePath();
+ static QString genericDataPath();
+ static QString genericConfigPath();
+ static QString genericCachePath();
+ static QString kdehomePath();
+
+private:
+ bool copyRecursively(const QString &srcPath, const QString &newPath);
+
+ QString path_;
+};
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/file.cpp b/src/libs/qtlibs/file.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7bb4ef7796856ff4fdda0d77a360d6d381a8266b
--- /dev/null
+++ b/src/libs/qtlibs/file.cpp
@@ -0,0 +1,106 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "file.h"
+
+#include <QIODevice>
+#include <QTextStream>
+#include <QFile>
+
+namespace qtlibs {
+
+File::File(const QString &path, QObject *parent) :
+ QObject(parent), path_(path)
+{}
+
+QString File::path() const
+{
+ return path_;
+}
+
+void File::setPath(const QString &path)
+{
+ path_ = path;
+}
+
+bool File::exists()
+{
+ QFile file(path());
+ return file.exists();
+}
+
+QByteArray File::readData()
+{
+ QByteArray data;
+ QFile file(path());
+ if (file.exists() && file.open(QIODevice::ReadOnly)) {
+ data = file.readAll();
+ file.close();
+ }
+ return data;
+}
+
+bool File::writeData(const QByteArray &data)
+{
+ QFile file(path());
+ if (file.open(QIODevice::WriteOnly)) {
+ file.write(data);
+ file.close();
+ return true;
+ }
+ return false;
+}
+
+QString File::readText()
+{
+ QString data;
+ QFile file(path());
+ if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ QTextStream in(&file);
+ in.setCodec("UTF-8");
+ data = in.readAll();
+ file.close();
+ }
+ return data;
+}
+
+bool File::writeText(const QString &data)
+{
+ QFile file(path());
+ if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ QTextStream out(&file);
+ out.setCodec("UTF-8");
+ out << data;
+ file.close();
+ return true;
+ }
+ return false;
+}
+
+bool File::copy(const QString &newPath)
+{
+ QFile file(path());
+ return file.copy(newPath);
+}
+
+bool File::move(const QString &newPath)
+{
+ QFile file(path());
+ return file.rename(newPath);
+}
+
+bool File::remove()
+{
+ QFile file(path());
+ return file.remove();
+}
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/file.h b/src/libs/qtlibs/file.h
new file mode 100644
index 0000000000000000000000000000000000000000..2e23cdcd961a021d59869bbcb2347708e7977de4
--- /dev/null
+++ b/src/libs/qtlibs/file.h
@@ -0,0 +1,41 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#pragma once
+
+#include <QObject>
+
+namespace qtlibs {
+
+class File : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit File(const QString &path, QObject *parent = 0);
+
+ QString path() const;
+ void setPath(const QString &path);
+
+ bool exists();
+ QByteArray readData();
+ bool writeData(const QByteArray &data);
+ QString readText();
+ bool writeText(const QString &data);
+ bool copy(const QString &newPath);
+ bool move(const QString &newPath);
+ bool remove();
+
+private:
+ QString path_;
+};
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/json.cpp b/src/libs/qtlibs/json.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2ea9f1c556e0a4477bb9deb6cc548b7316c62f29
--- /dev/null
+++ b/src/libs/qtlibs/json.cpp
@@ -0,0 +1,93 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "json.h"
+
+#include <QJsonDocument>
+#include <QJsonParseError>
+
+namespace qtlibs {
+
+Json::Json(const QByteArray &json, QObject *parent) :
+ QObject(parent), json_(json)
+{}
+
+Json::Json(const QString &string, QObject *parent) :
+ QObject(parent)
+{
+ setJson(string.toUtf8());
+}
+
+Json::Json(const QJsonObject &object, QObject *parent) :
+ QObject(parent)
+{
+ QJsonDocument doc(object);
+ setJson(doc.toJson());
+}
+
+Json::Json(const QJsonArray &array, QObject *parent) :
+ QObject(parent)
+{
+ QJsonDocument doc(array);
+ setJson(doc.toJson());
+}
+
+QByteArray Json::json() const
+{
+ return json_;
+}
+
+void Json::setJson(const QByteArray &json)
+{
+ json_ = json;
+}
+
+bool Json::isValid()
+{
+ QJsonParseError parseError;
+ QJsonDocument::fromJson(json(), &parseError);
+ if (parseError.error == QJsonParseError::NoError) {
+ return true;
+ }
+ return false;
+}
+
+bool Json::isObject()
+{
+ QJsonDocument doc = QJsonDocument::fromJson(json());
+ return doc.isObject();
+}
+
+bool Json::isArray()
+{
+ QJsonDocument doc = QJsonDocument::fromJson(json());
+ return doc.isArray();
+}
+
+QByteArray Json::toJson()
+{
+ QJsonDocument doc = QJsonDocument::fromJson(json());
+ return doc.toJson();
+}
+
+QJsonObject Json::toObject()
+{
+ QJsonDocument doc = QJsonDocument::fromJson(json());
+ return doc.object();
+}
+
+QJsonArray Json::toArray()
+{
+ QJsonDocument doc = QJsonDocument::fromJson(json());
+ return doc.array();
+}
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/json.h b/src/libs/qtlibs/json.h
new file mode 100644
index 0000000000000000000000000000000000000000..ae9bee5ce8087061fbd80326c2fbaf481060198b
--- /dev/null
+++ b/src/libs/qtlibs/json.h
@@ -0,0 +1,44 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QJsonObject>
+#include <QJsonArray>
+
+namespace qtlibs {
+
+class Json : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit Json(const QByteArray &json, QObject *parent = 0);
+ explicit Json(const QString &string, QObject *parent = 0);
+ explicit Json(const QJsonObject &object, QObject *parent = 0);
+ explicit Json(const QJsonArray &array, QObject *parent = 0);
+
+ QByteArray json() const;
+ void setJson(const QByteArray &json);
+
+ bool isValid();
+ bool isObject();
+ bool isArray();
+ QByteArray toJson();
+ QJsonObject toObject();
+ QJsonArray toArray();
+
+private:
+ QByteArray json_;
+};
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/networkresource.cpp b/src/libs/qtlibs/networkresource.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..74b24d3ae6bc4a63e583359130b17b592190240f
--- /dev/null
+++ b/src/libs/qtlibs/networkresource.cpp
@@ -0,0 +1,184 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "networkresource.h"
+
+#include <QEventLoop>
+
+#include "file.h"
+
+namespace qtlibs {
+
+NetworkResource::NetworkResource(const QString &name, const QUrl &url, const bool &async, QObject *parent) :
+ QObject(parent), name_(name), url_(url), async_(async)
+{
+ setManager(new QNetworkAccessManager(this));
+}
+
+NetworkResource::~NetworkResource()
+{
+ manager()->deleteLater();
+}
+
+QString NetworkResource::name() const
+{
+ return name_;
+}
+
+void NetworkResource::setName(const QString &name)
+{
+ name_ = name;
+}
+
+QUrl NetworkResource::url() const
+{
+ return url_;
+}
+
+void NetworkResource::setUrl(const QUrl &url)
+{
+ url_ = url;
+}
+
+bool NetworkResource::async() const
+{
+ return async_;
+}
+
+void NetworkResource::setAsync(const bool &async)
+{
+ async_ = async;
+}
+
+QNetworkRequest NetworkResource::request() const
+{
+ return request_;
+}
+
+void NetworkResource::setRequest(const QNetworkRequest &request)
+{
+ request_ = request;
+}
+
+QNetworkAccessManager *NetworkResource::manager() const
+{
+ return manager_;
+}
+
+QNetworkReply *NetworkResource::reply() const
+{
+ return reply_;
+}
+
+QString NetworkResource::method() const
+{
+ return method_;
+}
+
+NetworkResource *NetworkResource::head()
+{
+ setMethod("HEAD");
+ QNetworkRequest networkRequest = request();
+ networkRequest.setUrl(url());
+ return send(async(), networkRequest);
+}
+
+NetworkResource *NetworkResource::get()
+{
+ setMethod("GET");
+ QNetworkRequest networkRequest = request();
+ networkRequest.setUrl(url());
+ return send(async(), networkRequest);
+}
+
+QByteArray NetworkResource::readData()
+{
+ QByteArray data;
+ if (reply()->isFinished()) {
+ data = reply()->readAll();
+ }
+ return data;
+}
+
+bool NetworkResource::saveData(const QString &path)
+{
+ if (reply()->isFinished()) {
+ return qtlibs::File(path).writeData(readData());
+ }
+ return false;
+}
+
+void NetworkResource::abort()
+{
+ if (reply()->isRunning()) {
+ reply()->abort();
+ }
+}
+
+void NetworkResource::replyFinished()
+{
+ if (reply()->error() == QNetworkReply::NoError) {
+ // Check if redirection
+ // Note: An auto redirection option is available since Qt 5.6
+ QString newUrl;
+ if (reply()->hasRawHeader("Location")) {
+ newUrl = QString(reply()->rawHeader("Location"));
+ }
+ else if (reply()->hasRawHeader("Refresh")) {
+ newUrl = QString(reply()->rawHeader("Refresh")).split("url=").last();
+ }
+ if (!newUrl.isEmpty()) {
+ if (newUrl.startsWith("/")) {
+ newUrl = reply()->url().authority() + newUrl;
+ }
+ QNetworkRequest networkRequest = request();
+ networkRequest.setUrl(QUrl(newUrl));
+ send(true, networkRequest);
+ return;
+ }
+ }
+ emit finished(this);
+}
+
+void NetworkResource::setManager(QNetworkAccessManager *manager)
+{
+ manager_ = manager;
+}
+
+void NetworkResource::setReply(QNetworkReply *reply)
+{
+ reply_ = reply;
+}
+
+void NetworkResource::setMethod(const QString &method)
+{
+ method_ = method;
+}
+
+NetworkResource *NetworkResource::send(const bool &async, const QNetworkRequest &request)
+{
+ if (method() == "HEAD") {
+ setReply(manager()->head(request));
+ }
+ else if (method() == "GET") {
+ setReply(manager()->get(request));
+ connect(reply(), &QNetworkReply::downloadProgress, this, &NetworkResource::downloadProgress);
+ }
+ connect(reply(), &QNetworkReply::finished, this, &NetworkResource::replyFinished);
+ if (!async) {
+ QEventLoop eventLoop;
+ connect(this, &NetworkResource::finished, &eventLoop, &QEventLoop::quit);
+ eventLoop.exec();
+ }
+ return this;
+}
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/networkresource.h b/src/libs/qtlibs/networkresource.h
new file mode 100644
index 0000000000000000000000000000000000000000..23e11f38977f3db0fe76ebac783d6c16fada6adf
--- /dev/null
+++ b/src/libs/qtlibs/networkresource.h
@@ -0,0 +1,73 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QUrl>
+#include <QNetworkRequest>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+namespace qtlibs {
+
+class NetworkResource : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit NetworkResource(const QString &name, const QUrl &url, const bool &async = true, QObject *parent = 0);
+ ~NetworkResource();
+
+ QString name() const;
+ void setName(const QString &name);
+ QUrl url() const;
+ void setUrl(const QUrl &url);
+ bool async() const;
+ void setAsync(const bool &async);
+ QNetworkRequest request() const;
+ void setRequest(const QNetworkRequest &request);
+ QNetworkAccessManager *manager() const;
+ QNetworkReply *reply() const;
+ QString method() const;
+
+ NetworkResource *head();
+ NetworkResource *get();
+ QByteArray readData();
+ bool saveData(const QString &path);
+
+signals:
+ void finished(NetworkResource *resource);
+ void downloadProgress(const qint64 &bytesReceived, const qint64 &bytesTotal);
+
+public slots:
+ void abort();
+
+private slots:
+ void replyFinished();
+
+private:
+ void setManager(QNetworkAccessManager *manager);
+ void setReply(QNetworkReply *reply);
+ void setMethod(const QString &method);
+
+ NetworkResource *send(const bool &async, const QNetworkRequest &request);
+
+ QString name_;
+ QUrl url_;
+ bool async_;
+ QNetworkRequest request_;
+ QNetworkAccessManager *manager_;
+ QNetworkReply *reply_;
+ QString method_;
+};
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/package.cpp b/src/libs/qtlibs/package.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8869b018a8fec6fa26b20129372207b95e09313f
--- /dev/null
+++ b/src/libs/qtlibs/package.cpp
@@ -0,0 +1,152 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#include "package.h"
+
+#ifdef QTLIBS_UNIX
+#include <QJsonObject>
+#include <QMimeDatabase>
+#include <QProcess>
+#endif
+
+#ifdef Q_OS_ANDROID
+#include <QAndroidJniObject>
+#endif
+
+namespace qtlibs {
+
+Package::Package(const QString &path, QObject *parent) :
+ QObject(parent), path_(path)
+{}
+
+QString Package::path() const
+{
+ return path_;
+}
+
+void Package::setPath(const QString &path)
+{
+ path_ = path;
+}
+
+#ifdef QTLIBS_UNIX
+bool Package::installAsProgram(const QString &newPath)
+{
+ QStringList arguments;
+ arguments << "-m" << "755" << "-p" << path() << newPath;
+ return execute("install", arguments);
+}
+
+bool Package::installAsFile(const QString &newPath)
+{
+ QStringList arguments;
+ arguments << "-m" << "644" << "-p" << path() << newPath;
+ return execute("install", arguments);
+}
+
+bool Package::installAsArchive(const QString &destinationDirPath)
+{
+ QJsonObject archiveTypes;
+ archiveTypes["application/x-tar"] = QString("tar");
+ archiveTypes["application/x-gzip"] = QString("tar");
+ archiveTypes["application/gzip"] = QString("tar");
+ archiveTypes["application/x-bzip"] = QString("tar");
+ archiveTypes["application/x-bzip2"] = QString("tar");
+ archiveTypes["application/x-xz"] = QString("tar");
+ archiveTypes["application/x-lzma"] = QString("tar");
+ archiveTypes["application/x-lzip"] = QString("tar");
+ archiveTypes["application/x-compressed-tar"] = QString("tar");
+ archiveTypes["application/x-bzip-compressed-tar"] = QString("tar");
+ archiveTypes["application/x-bzip2-compressed-tar"] = QString("tar");
+ archiveTypes["application/x-xz-compressed-tar"] = QString("tar");
+ archiveTypes["application/x-lzma-compressed-tar"] = QString("tar");
+ archiveTypes["application/x-lzip-compressed-tar"] = QString("tar");
+ archiveTypes["application/zip"] = QString("zip");
+ archiveTypes["application/x-7z-compressed"] = QString("7z");
+ archiveTypes["application/x-rar"] = QString("rar");
+ archiveTypes["application/x-rar-compressed"] = QString("rar");
+
+ QMimeDatabase mimeDb;
+ QString mimeType = mimeDb.mimeTypeForFile(path()).name();
+
+ if (archiveTypes.contains(mimeType)) {
+ QString archiveType = archiveTypes[mimeType].toString();
+ QString program;
+ QStringList arguments;
+ if (archiveType == "tar") {
+ program = "tar";
+ arguments << "-xf" << path() << "-C" << destinationDirPath;
+ }
+ else if (archiveType == "zip") {
+ program = "unzip";
+ arguments << "-o" << path() << "-d" << destinationDirPath;
+ }
+ else if (archiveType == "7z") {
+ program = "7z";
+ arguments << "x" << path() << "-o" + destinationDirPath; // No space between -o and directory
+ }
+ else if (archiveType == "rar") {
+ program = "unrar";
+ arguments << "e" << path() << destinationDirPath;
+ }
+ return execute(program, arguments);
+ }
+ return false;
+}
+
+bool Package::installAsPlasmapkg(const QString &type)
+{
+ QStringList arguments;
+ arguments << "-t" << type << "-i" << path();
+ return execute("plasmapkg2", arguments);
+}
+
+bool Package::uninstallAsPlasmapkg(const QString &type)
+{
+ QStringList arguments;
+ arguments << "-t" << type << "-r" << path();
+ return execute("plasmapkg2", arguments);
+}
+#endif
+
+#ifdef Q_OS_ANDROID
+bool Package::installAsApk()
+{
+ QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+ if (activity.isValid()) {
+ QAndroidJniObject fileUri = QAndroidJniObject::fromString(path());
+ QAndroidJniObject parsedUri = QAndroidJniObject::callStaticObjectMethod("android/net/Uri", "parse", "(Ljava/lang/String;)Landroid/net/Uri;", fileUri.object());
+ QAndroidJniObject mimeType = QAndroidJniObject::fromString("application/vnd.android.package-archive");
+ QAndroidJniObject activityKind = QAndroidJniObject::fromString("android.intent.action.VIEW");
+ QAndroidJniObject intent("android/content/Intent", "(Ljava/lang/String;)V", activityKind.object());
+ intent = intent.callObjectMethod("setDataAndType", "(Landroid/net/Uri;Ljava/lang/String;)Landroid/content/Intent;", parsedUri.object(), mimeType.object());
+ intent = intent.callObjectMethod("setFlags", "(I)Landroid/content/Intent;", 0x10000000); // 0x10000000 = FLAG_ACTIVITY_NEW_TASK
+ activity.callObjectMethod("startActivity", "(Landroid/content/Intent;)V", intent.object());
+ return true;
+ }
+ return false;
+}
+#endif
+
+#ifdef QTLIBS_UNIX
+bool Package::execute(const QString &program, const QStringList &arguments)
+{
+ QProcess process;
+ process.start(program, arguments);
+ if (process.waitForFinished()) {
+ process.waitForReadyRead();
+ return true;
+ }
+ return false;
+}
+#endif
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/package.h b/src/libs/qtlibs/package.h
new file mode 100644
index 0000000000000000000000000000000000000000..3f22b52c0d1baaddc1a4254427c5554b2e654720
--- /dev/null
+++ b/src/libs/qtlibs/package.h
@@ -0,0 +1,48 @@
+/**
+ * A library for Qt app
+ *
+ * LICENSE: The GNU Lesser General Public License, version 3.0
+ *
+ * @author Akira Ohgaki <akiraohgaki@gmail.com>
+ * @copyright Akira Ohgaki
+ * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
+ * @link https://github.com/akiraohgaki/qtlibs
+ */
+
+#pragma once
+
+#include <QObject>
+
+namespace qtlibs {
+
+class Package : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit Package(const QString &path, QObject *parent = 0);
+
+ QString path() const;
+ void setPath(const QString &path);
+
+#ifdef QTLIBS_UNIX
+ bool installAsProgram(const QString &newPath);
+ bool installAsFile(const QString &newPath);
+ bool installAsArchive(const QString &destinationDirPath);
+ bool installAsPlasmapkg(const QString &type = "plasmoid");
+ bool uninstallAsPlasmapkg(const QString &type = "plasmoid");
+#endif
+
+#ifdef Q_OS_ANDROID
+ bool installAsApk();
+#endif
+
+private:
+#ifdef QTLIBS_UNIX
+ bool execute(const QString &program, const QStringList &arguments);
+#endif
+
+ QString path_;
+};
+
+} // namespace qtlibs
diff --git a/src/libs/qtlibs/qtlibs.pri b/src/libs/qtlibs/qtlibs.pri
new file mode 100644
index 0000000000000000000000000000000000000000..704199f9bb5e812eba45aee2e985650aee8b477d
--- /dev/null
+++ b/src/libs/qtlibs/qtlibs.pri
@@ -0,0 +1,29 @@
+QT += \
+ core \
+ network
+
+HEADERS += \
+ $${PWD}/file.h \
+ $${PWD}/dir.h \
+ $${PWD}/json.h \
+ $${PWD}/config.h \
+ $${PWD}/networkresource.h \
+ $${PWD}/package.h
+
+SOURCES += \
+ $${PWD}/file.cpp \
+ $${PWD}/dir.cpp \
+ $${PWD}/json.cpp \
+ $${PWD}/config.cpp \
+ $${PWD}/networkresource.cpp \
+ $${PWD}/package.cpp
+
+# Unix
+unix:!ios:!android {
+ DEFINES += QTLIBS_UNIX
+}
+
+# Android
+android {
+ QT += androidextras
+}
diff --git a/src/libs/utils/android.cpp b/src/libs/utils/android.cpp
deleted file mode 100644
index 9cca280565c8b419b83065f6fb63e671a61970db..0000000000000000000000000000000000000000
--- a/src/libs/utils/android.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "android.h"
-
-#include <QAndroidJniObject>
-
-namespace utils {
-
-Android::Android(QObject *parent) : QObject(parent)
-{}
-
-bool Android::openApk(const QString &uri)
-{
- QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
- if (activity.isValid()) {
- QAndroidJniObject fileUri = QAndroidJniObject::fromString(uri);
- QAndroidJniObject parsedUri = QAndroidJniObject::callStaticObjectMethod("android/net/Uri", "parse", "(Ljava/lang/String;)Landroid/net/Uri;", fileUri.object());
- QAndroidJniObject mimeType = QAndroidJniObject::fromString("application/vnd.android.package-archive");
- QAndroidJniObject activityKind = QAndroidJniObject::fromString("android.intent.action.VIEW");
- QAndroidJniObject intent("android/content/Intent", "(Ljava/lang/String;)V", activityKind.object());
- intent = intent.callObjectMethod("setDataAndType", "(Landroid/net/Uri;Ljava/lang/String;)Landroid/content/Intent;", parsedUri.object(), mimeType.object());
- intent = intent.callObjectMethod("setFlags", "(I)Landroid/content/Intent;", 0x10000000); // 0x10000000 = FLAG_ACTIVITY_NEW_TASK
- activity.callObjectMethod("startActivity", "(Landroid/content/Intent;)V", intent.object());
- return true;
- }
- return false;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/android.h b/src/libs/utils/android.h
deleted file mode 100644
index bbbccd36a693dc5ca086cfa1db8d4b87eabaa0e0..0000000000000000000000000000000000000000
--- a/src/libs/utils/android.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#pragma once
-
-#include <QObject>
-
-namespace utils {
-
-class Android : public QObject
-{
- Q_OBJECT
-
-public:
- explicit Android(QObject *parent = 0);
-
- static bool openApk(const QString &uri);
-};
-
-} // namespace utils
diff --git a/src/libs/utils/config.cpp b/src/libs/utils/config.cpp
deleted file mode 100644
index 13b1018af9a1ee4f0feab0315794875aa8a3bb43..0000000000000000000000000000000000000000
--- a/src/libs/utils/config.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "config.h"
-
-#include "file.h"
-#include "json.h"
-
-namespace utils {
-
-Config::Config(const QString &configsDir, QObject *parent) :
- QObject(parent), configsDir_(configsDir)
-{}
-
-QJsonObject Config::get(const QString &name)
-{
- QString configFile = configsDir_ + "/" + name + ".json";
-
- if (!cacheData_.contains(name)) {
- QString json = utils::File::readText(configFile);
- if (json.isEmpty()) {
- json = "{}"; // Blank JSON data as default
- }
- cacheData_[name] = utils::Json::convertStrToObj(json);
- }
- return cacheData_[name].toObject();
-}
-
-bool Config::set(const QString &name, const QJsonObject &jsonObj)
-{
- QString configFile = configsDir_ + "/" + name + ".json";
- QString json = utils::Json::convertObjToStr(jsonObj);
-
- utils::File::makeDir(configsDir_);
- if (utils::File::writeText(configFile, json)) {
- cacheData_[name] = jsonObj;
- return true;
- }
- return false;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/file.cpp b/src/libs/utils/file.cpp
deleted file mode 100644
index 459292abf14210ace0df70dde873e9e71612f6ca..0000000000000000000000000000000000000000
--- a/src/libs/utils/file.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "file.h"
-
-#include <QIODevice>
-#include <QStandardPaths>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-
-namespace utils {
-
-File::File(QObject *parent) : QObject(parent)
-{}
-
-QString File::rootPath()
-{
- return QDir::rootPath();
-}
-
-QString File::tempPath()
-{
- return QDir::tempPath();
-}
-
-QString File::homePath()
-{
- return QDir::homePath();
-}
-
-QString File::genericDataPath()
-{
- return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
-}
-
-QString File::genericConfigPath()
-{
- return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
-}
-
-QString File::genericCachePath()
-{
- return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
-}
-
-QString File::kdehomePath()
-{
- // KDE System Administration/Environment Variables
- // https://userbase.kde.org/KDE_System_Administration/Environment_Variables
-
- // KDE 4 maybe uses $KDEHOME
- QString path = QString::fromLocal8Bit(qgetenv("KDEHOME").constData());
- if (path.isEmpty()) {
- path = homePath() + "/.kde";
- }
- return path;
-}
-
-QFileInfoList File::readDir(const QString &path)
-{
- QDir dir(path);
- dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
- //dir.setSorting(QDir::DirsFirst | QDir::Name);
- return dir.entryInfoList();
-}
-
-bool File::makeDir(const QString &path)
-{
- // This function will create all parent directories
- QDir dir(path);
- if (!dir.exists() && dir.mkpath(path)) {
- return true;
- }
- return false;
-}
-
-QString File::readText(const QString &path)
-{
- QString data;
- QFile file(path);
- if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QTextStream in(&file);
- in.setCodec("UTF-8");
- data = in.readAll();
- file.close();
- }
- return data;
-}
-
-bool File::writeText(const QString &path, const QString &data)
-{
- QFile file(path);
- if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- QTextStream out(&file);
- out.setCodec("UTF-8");
- out << data;
- file.close();
- return true;
- }
- return false;
-}
-
-QByteArray File::readBinary(const QString &path)
-{
- QByteArray data;
- QFile file(path);
- if (file.exists() && file.open(QIODevice::ReadOnly)) {
- data = file.readAll();
- file.close();
- }
- return data;
-}
-
-bool File::writeBinary(const QString &path, const QByteArray &data)
-{
- QFile file(path);
- if (file.open(QIODevice::WriteOnly)) {
- file.write(data);
- file.close();
- return true;
- }
- return false;
-}
-
-bool File::copy(const QString &path, const QString &targetPath)
-{
- // This function will copy files recursively
- QFileInfo fileInfo(path);
- if (fileInfo.isFile()) {
- QFile file(path);
- if (file.copy(targetPath)) {
- return true;
- }
- }
- else if (fileInfo.isDir()) {
- QDir targetDir(targetPath);
- QString targetDirName = targetDir.dirName();
- targetDir.cdUp();
- if (targetDir.mkdir(targetDirName)) {
- QDir dir(path);
- dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
- QStringList entries = dir.entryList();
- foreach (const QString &entry, entries) {
- if (!copy(path + "/" + entry, targetPath + "/" + entry)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
-}
-
-bool File::move(const QString &path, const QString &targetPath)
-{
- QFileInfo fileInfo(path);
- if (fileInfo.isFile()) {
- QFile file(path);
- if (file.rename(targetPath)) {
- return true;
- }
- }
- else if (fileInfo.isDir()) {
- QDir dir(path);
- if (dir.rename(path, targetPath)) {
- return true;
- }
- }
- return false;
-}
-
-bool File::remove(const QString &path)
-{
- // This function will remove files recursively
- QFileInfo fileInfo(path);
- if (fileInfo.isFile()) {
- QFile file(path);
- if (file.remove()) {
- return true;
- }
- }
- else if (fileInfo.isDir()) {
- QDir dir(path);
- if (dir.removeRecursively()) {
- return true;
- }
- }
- return false;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/file.h b/src/libs/utils/file.h
deleted file mode 100644
index 0ec6548a0c14fb4efe3d616e31fa80c57666ef90..0000000000000000000000000000000000000000
--- a/src/libs/utils/file.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#pragma once
-
-#include <QObject>
-
-class QFileInfo;
-typedef QList<QFileInfo> QFileInfoList;
-
-namespace utils {
-
-class File : public QObject
-{
- Q_OBJECT
-
-public:
- explicit File(QObject *parent = 0);
-
- static QString rootPath();
- static QString tempPath();
- static QString homePath();
- static QString genericDataPath();
- static QString genericConfigPath();
- static QString genericCachePath();
- static QString kdehomePath();
- static QFileInfoList readDir(const QString &path);
- static bool makeDir(const QString &path);
- static QString readText(const QString &path);
- static bool writeText(const QString &path, const QString &data);
- static QByteArray readBinary(const QString &path);
- static bool writeBinary(const QString &path, const QByteArray &data);
- static bool copy(const QString &path, const QString &targetPath);
- static bool move(const QString &path, const QString &targetPath);
- static bool remove(const QString &path);
-};
-
-} // namespace utils
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp
deleted file mode 100644
index 1573c847890f2d0c6365b9372542b9a4db355ec1..0000000000000000000000000000000000000000
--- a/src/libs/utils/json.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "json.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonParseError>
-
-namespace utils {
-
-Json::Json(QObject *parent) : QObject(parent)
-{}
-
-QString Json::convertObjToStr(const QJsonObject &jsonObj)
-{
- QJsonDocument jsonDoc(jsonObj);
- return QString::fromUtf8(jsonDoc.toJson());
-}
-
-QJsonObject Json::convertStrToObj(const QString &json)
-{
- QJsonObject jsonObj;
- QJsonParseError jsonError;
- QJsonDocument jsonDoc = QJsonDocument::fromJson(json.toUtf8(), &jsonError);
- if (jsonError.error == QJsonParseError::NoError && jsonDoc.isObject()) {
- jsonObj = jsonDoc.object();
- }
- return jsonObj;
-}
-
-bool Json::isValid(const QString &json)
-{
- QJsonParseError jsonError;
- QJsonDocument::fromJson(json.toUtf8(), &jsonError);
- if (jsonError.error == QJsonParseError::NoError) {
- return true;
- }
- return false;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h
deleted file mode 100644
index f53527ad12b13650f4a5634d005f52e4bcaf5cfe..0000000000000000000000000000000000000000
--- a/src/libs/utils/json.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#pragma once
-
-#include <QObject>
-
-namespace utils {
-
-class Json : public QObject
-{
- Q_OBJECT
-
-public:
- explicit Json(QObject *parent = 0);
-
- static QString convertObjToStr(const QJsonObject &jsonObj);
- static QJsonObject convertStrToObj(const QString &json);
- static bool isValid(const QString &json);
-};
-
-} // namespace utils
diff --git a/src/libs/utils/network.cpp b/src/libs/utils/network.cpp
deleted file mode 100644
index 2256a941a0a761bd76ddc39fb2c57ea7138c8a47..0000000000000000000000000000000000000000
--- a/src/libs/utils/network.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "network.h"
-
-#include <QEventLoop>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-namespace utils {
-
-Network::Network(const bool &async, QObject *parent) :
- QObject(parent), async_(async)
-{
- manager_ = new QNetworkAccessManager(this);
- connect(manager_, &QNetworkAccessManager::finished, this, &utils::Network::finished);
- if (!async_) {
- eventLoop_ = new QEventLoop();
- connect(manager_, &QNetworkAccessManager::finished, eventLoop_, &QEventLoop::quit);
- }
-}
-
-Network::~Network()
-{
- manager_->deleteLater();
- if (!async_) {
- delete eventLoop_;
- }
-}
-
-QNetworkReply *Network::head(const QUrl &uri)
-{
- QNetworkReply *reply = manager_->head(QNetworkRequest(uri));
- if (!async_) {
- eventLoop_->exec();
- }
- return reply;
-}
-
-QNetworkReply *Network::get(const QUrl &uri)
-{
- QNetworkReply *reply = manager_->get(QNetworkRequest(uri));
- connect(reply, &QNetworkReply::downloadProgress, this, &utils::Network::downloadProgress);
- if (!async_) {
- eventLoop_->exec();
- }
- return reply;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/network.h b/src/libs/utils/network.h
deleted file mode 100644
index fcb835028def3b28e0e99d72f792a813a561a5bd..0000000000000000000000000000000000000000
--- a/src/libs/utils/network.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#pragma once
-
-#include <QObject>
-
-class QEventLoop;
-class QNetworkAccessManager;
-class QNetworkReply;
-
-namespace utils {
-
-class Network : public QObject
-{
- Q_OBJECT
-
-public:
- explicit Network(const bool &async = true, QObject *parent = 0);
- ~Network();
-
- QNetworkReply *head(const QUrl &uri);
- QNetworkReply *get(const QUrl &uri);
-
-signals:
- void finished(QNetworkReply *reply);
- void downloadProgress(const qint64 &received, const qint64 &total);
-
-private:
- bool async_;
- QNetworkAccessManager *manager_;
- QEventLoop *eventLoop_;
-};
-
-} // namespace utils
diff --git a/src/libs/utils/package.cpp b/src/libs/utils/package.cpp
deleted file mode 100644
index 6196c063404fc176325665e6a0fba447b58abc83..0000000000000000000000000000000000000000
--- a/src/libs/utils/package.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#include "package.h"
-
-#include <QJsonObject>
-#include <QMimeDatabase>
-#include <QProcess>
-
-namespace utils {
-
-Package::Package(QObject *parent) : QObject(parent)
-{}
-
-bool Package::installProgram(const QString &path, const QString &targetPath)
-{
- QString program = "install";
- QStringList arguments;
- arguments << "-m" << "755" << "-p" << path << targetPath;
- return execute(program, arguments);
-}
-
-bool Package::installFile(const QString &path, const QString &targetPath)
-{
- QString program = "install";
- QStringList arguments;
- arguments << "-m" << "644" << "-p" << path << targetPath;
- return execute(program, arguments);
-}
-
-bool Package::installPlasmapkg(const QString &path, const QString &type)
-{
- QString program = "plasmapkg2";
- QStringList arguments;
- arguments << "-t" << type << "-i" << path;
- return execute(program, arguments);
-}
-
-bool Package::uninstallPlasmapkg(const QString &path, const QString &type)
-{
- QString program = "plasmapkg2";
- QStringList arguments;
- arguments << "-t" << type << "-r" << path;
- return execute(program, arguments);
-}
-
-bool Package::uncompressArchive(const QString &path, const QString &targetDir)
-{
- QJsonObject archiveTypes;
- archiveTypes["application/x-tar"] = QString("tar");
- archiveTypes["application/x-gzip"] = QString("tar");
- archiveTypes["application/gzip"] = QString("tar");
- archiveTypes["application/x-bzip"] = QString("tar");
- archiveTypes["application/x-bzip2"] = QString("tar");
- archiveTypes["application/x-xz"] = QString("tar");
- archiveTypes["application/x-lzma"] = QString("tar");
- archiveTypes["application/x-lzip"] = QString("tar");
- archiveTypes["application/x-compressed-tar"] = QString("tar");
- archiveTypes["application/x-bzip-compressed-tar"] = QString("tar");
- archiveTypes["application/x-bzip2-compressed-tar"] = QString("tar");
- archiveTypes["application/x-xz-compressed-tar"] = QString("tar");
- archiveTypes["application/x-lzma-compressed-tar"] = QString("tar");
- archiveTypes["application/x-lzip-compressed-tar"] = QString("tar");
- archiveTypes["application/zip"] = QString("zip");
- archiveTypes["application/x-7z-compressed"] = QString("7z");
- archiveTypes["application/x-rar"] = QString("rar");
- archiveTypes["application/x-rar-compressed"] = QString("rar");
-
- QMimeDatabase mimeDb;
- QString mimeType = mimeDb.mimeTypeForFile(path).name();
-
- if (archiveTypes.contains(mimeType)) {
- QString archiveType = archiveTypes[mimeType].toString();
-
- QString program;
- QStringList arguments;
-
- 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;
- }
-
- return execute(program, arguments);
- }
-
- return false;
-}
-
-bool Package::execute(const QString &program, const QStringList &arguments)
-{
- QProcess process;
- process.start(program, arguments);
- if (process.waitForFinished()) {
- process.waitForReadyRead();
- return true;
- }
- return false;
-}
-
-} // namespace utils
diff --git a/src/libs/utils/package.h b/src/libs/utils/package.h
deleted file mode 100644
index 9f086dded976aa2384584a8c9e05d204f9681daf..0000000000000000000000000000000000000000
--- a/src/libs/utils/package.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * A library for Qt app
- *
- * LICENSE: The GNU Lesser General Public License, version 3.0
- *
- * @author Akira Ohgaki <akiraohgaki@gmail.com>
- * @copyright Akira Ohgaki
- * @license https://opensource.org/licenses/LGPL-3.0 The GNU Lesser General Public License, version 3.0
- * @link https://github.com/akiraohgaki/qt-libs
- */
-
-#pragma once
-
-#include <QObject>
-
-namespace utils {
-
-class Package : public QObject
-{
- Q_OBJECT
-
-public:
- explicit Package(QObject *parent = 0);
-
- static bool installProgram(const QString &path, const QString &targetPath);
- static bool installFile(const QString &path, const QString &targetPath);
- static bool installPlasmapkg(const QString &path, const QString &type = "plasmoid");
- static bool uninstallPlasmapkg(const QString &path, const QString &type = "plasmoid");
- static bool uncompressArchive(const QString &path, const QString &targetDir);
-
-private:
- static bool execute(const QString &program, const QStringList &arguments);
-};
-
-} // namespace utils