From 34bfe5a6c085ea6f9ada25b8c2f886fdbab021cc Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 25 Sep 2020 10:50:46 +0300 Subject: [PATCH] Code refactoring - remove configenterprise for s3 --- src/core/controller.cpp | 2 -- src/tools/storage/imguploader.cpp | 12 ------- src/tools/storage/imguploader.h | 1 - src/tools/storage/s3/imgs3settings.cpp | 43 ++++++++++++++++++++------ src/tools/storage/s3/imgs3settings.h | 8 +++-- src/tools/storage/s3/imgs3uploader.cpp | 14 +++------ src/tools/storage/s3/imgs3uploader.h | 1 - src/utils/CMakeLists.txt | 1 - src/utils/configenterprise.cpp | 32 ------------------- src/utils/configenterprise.h | 17 ---------- 10 files changed, 45 insertions(+), 86 deletions(-) delete mode 100644 src/utils/configenterprise.cpp delete mode 100644 src/utils/configenterprise.h diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 6c804ac1..ce8a81c5 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -17,7 +17,6 @@ #include "controller.h" #include "src/config/configwindow.h" -#include "src/utils/configenterprise.h" #include "src/utils/confighandler.h" #include "src/utils/history.h" #include "src/utils/screengrabber.h" @@ -32,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/src/tools/storage/imguploader.cpp b/src/tools/storage/imguploader.cpp index 2f0d2d59..266478a6 100644 --- a/src/tools/storage/imguploader.cpp +++ b/src/tools/storage/imguploader.cpp @@ -16,32 +16,20 @@ // along with Flameshot. If not, see . #include "imguploader.h" -#include "src/utils/configenterprise.h" #include "src/utils/confighandler.h" -#include "src/utils/filenamehandler.h" -#include "src/utils/history.h" -#include "src/utils/systemnotification.h" #include "src/widgets/imagelabel.h" #include "src/widgets/loadspinner.h" #include "src/widgets/notificationwidget.h" #include -#include #include -#include #include -#include #include #include -#include #include #include #include -#include #include #include -#include -#include -#include #include #include #include diff --git a/src/tools/storage/imguploader.h b/src/tools/storage/imguploader.h index 5369f183..c67d348c 100644 --- a/src/tools/storage/imguploader.h +++ b/src/tools/storage/imguploader.h @@ -32,7 +32,6 @@ class LoadSpinner; class QPushButton; class QUrl; class NotificationWidget; -class ConfigEnterprise; class ImageLabel; class ImgUploader : public QWidget diff --git a/src/tools/storage/s3/imgs3settings.cpp b/src/tools/storage/s3/imgs3settings.cpp index fcf23ec0..351ac9a1 100644 --- a/src/tools/storage/s3/imgs3settings.cpp +++ b/src/tools/storage/s3/imgs3settings.cpp @@ -1,16 +1,15 @@ #include "imgs3settings.h" -#include "src/utils/configenterprise.h" +#include +#include #include ImgS3Settings::ImgS3Settings() { - m_configEnterprise = new ConfigEnterprise(); + initSettings(); // get s3 credentials - QSettings* settings = m_configEnterprise->settings(); - settings->beginGroup("S3"); - - m_credsUrl = settings->value("S3_CREDS_URL").toString(); + m_settings->beginGroup("S3"); + m_credsUrl = m_settings->value("S3_CREDS_URL").toString(); m_credsUrl = m_credsUrl + ((m_credsUrl.length() > 0 && m_credsUrl[m_credsUrl.length() - 1] == '/') @@ -18,14 +17,40 @@ ImgS3Settings::ImgS3Settings() : "/") + S3_API_IMG_PATH; - m_xApiKey = settings->value("S3_X_API_KEY").toString(); + m_xApiKey = m_settings->value("S3_X_API_KEY").toString(); - m_url = settings->value("S3_URL").toString(); + m_url = m_settings->value("S3_URL").toString(); m_url = m_url + ((m_url.length() > 0 && m_url[m_url.length() - 1] == '/') ? "" : "/"); - settings->endGroup(); + m_settings->endGroup(); +} + +QSettings* ImgS3Settings::settings() +{ + return m_settings; +} + +void ImgS3Settings::initSettings() +{ + // get s3 settings + QString configIniPath = QDir(QDir::currentPath()).filePath("config.ini"); + if (!(QFileInfo::exists(configIniPath) && + QFileInfo(configIniPath).isFile())) { +#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + configIniPath = "/etc/flameshot/config.ini"; +#elif defined(Q_OS_WIN) + // calculate workdir for flameshot on startup if is not set yet + QSettings bootUpSettings( + "HKEY_CURRENT_" + "USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", + QSettings::NativeFormat); + QFileInfo fi(bootUpSettings.value("Flameshot").toString()); + configIniPath = QDir(fi.absolutePath()).filePath("config.ini"); +#endif + } + m_settings = new QSettings(configIniPath, QSettings::IniFormat); } const QString& ImgS3Settings::credsUrl() diff --git a/src/tools/storage/s3/imgs3settings.h b/src/tools/storage/s3/imgs3settings.h index c4b8689b..3fce40e4 100644 --- a/src/tools/storage/s3/imgs3settings.h +++ b/src/tools/storage/s3/imgs3settings.h @@ -5,7 +5,7 @@ #include -class ConfigEnterprise; +class QSettings; class ImgS3Settings { @@ -15,9 +15,13 @@ public: const QString& credsUrl(); const QString& xApiKey(); const QString& url(); + QSettings* settings(); private: - ConfigEnterprise* m_configEnterprise; + void initSettings(); + + // class members + QSettings* m_settings; QString m_credsUrl; QString m_xApiKey; QString m_url; diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index 09b53795..fc57e850 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -1,4 +1,5 @@ // Copyright(c) 2017-2019 Alejandro Sirgo Rica & Contributors +// Copyright(c) 2017-2019 Alejandro Sirgo Rica & Contributors // // This file is part of Flameshot. // @@ -16,9 +17,8 @@ // along with Flameshot. If not, see . #include "imgs3uploader.h" -#include "src/utils/configenterprise.h" +#include "imgs3settings.h" #include "src/utils/confighandler.h" -#include "src/utils/filenamehandler.h" #include "src/utils/history.h" #include "src/utils/systemnotification.h" #include "src/widgets/imagelabel.h" @@ -27,11 +27,7 @@ #include #include #include -#include -#include #include -#include -#include #include #include #include @@ -82,11 +78,11 @@ QNetworkProxy* ImgS3Uploader::proxy() QNetworkProxy* ImgS3Uploader::initProxy() { - // get enterprise settings - ConfigEnterprise* configEnterprise = new ConfigEnterprise(); + // get s3 settings + ImgS3Settings imgS3Settings; // get proxy settings from "config.ini" file - QSettings* settings = configEnterprise->settings(); + QSettings* settings = imgS3Settings.settings(); QString httpProxyHost = settings->value("HTTP_PROXY_HOST").toString(); if (httpProxyHost.length() > 0) { diff --git a/src/tools/storage/s3/imgs3uploader.h b/src/tools/storage/s3/imgs3uploader.h index 3168bf29..a5938895 100644 --- a/src/tools/storage/s3/imgs3uploader.h +++ b/src/tools/storage/s3/imgs3uploader.h @@ -33,7 +33,6 @@ class QLabel; class QPushButton; class QUrl; class NotificationWidget; -class ConfigEnterprise; class ImageLabel; class ImgS3Uploader : public ImgUploader diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index fee459ec..80973565 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -22,6 +22,5 @@ target_sources( pathinfo.cpp colorutils.cpp history.cpp - configenterprise.cpp configshortcuts.cpp ) diff --git a/src/utils/configenterprise.cpp b/src/utils/configenterprise.cpp deleted file mode 100644 index 34bc2ee0..00000000 --- a/src/utils/configenterprise.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "configenterprise.h" -#include -#include -#include -#include - -ConfigEnterprise::ConfigEnterprise() -{ - // get enterprise settings - m_settings = nullptr; - QString configIniPath = QDir(QDir::currentPath()).filePath("config.ini"); - if (!(QFileInfo::exists(configIniPath) && - QFileInfo(configIniPath).isFile())) { -#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) - configIniPath = "/etc/flameshot/config.ini"; -#elif defined(Q_OS_WIN) - // calculate workdir for flameshot on startup if is not set yet - QSettings bootUpSettings( - "HKEY_CURRENT_" - "USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", - QSettings::NativeFormat); - QFileInfo fi(bootUpSettings.value("Flameshot").toString()); - configIniPath = QDir(fi.absolutePath()).filePath("config.ini"); -#endif - } - m_settings = new QSettings(configIniPath, QSettings::IniFormat); -} - -QSettings* ConfigEnterprise::settings() -{ - return m_settings; -} diff --git a/src/utils/configenterprise.h b/src/utils/configenterprise.h deleted file mode 100644 index c4afaf89..00000000 --- a/src/utils/configenterprise.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef CONFIGENTERPRISE_H -#define CONFIGENTERPRISE_H - -class QSettings; - -class ConfigEnterprise -{ -public: - ConfigEnterprise(); - - QSettings* settings(); - -private: - QSettings* m_settings; -}; - -#endif // CONFIGENTERPRISE_H