ksnip · DamirPorobic · Jan 8, 2022 · Jan 4, 2022 · Jan 8, 2022 · Jan 8, 2022
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/backend/config/Config.cpp b/src/backend/config/Config.cpp
diff --git a/src/backend/config/Config.h b/src/backend/config/Config.h
@@ -37,12 +37,12 @@
 
 class Config : public IConfig
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	explicit Config(const QSharedPointer<IDirectoryPathProvider> &directoryPathProvider);
 	~Config() override = default;
 
-    // Application
+	// Application
 
 	bool rememberPosition() const override;
 	void setRememberPosition(bool enabled) override;
@@ -65,6 +65,9 @@ class Config : public IConfig
 	int resizeToContentDelay() const override;
 	void setResizeToContentDelay(int ms) override;
 
+	bool overwriteFile() const override;
+	void setOverwriteFile(bool enabled) override;
+
 	bool useTabs() const override;
 	void setUseTabs(bool enabled) override;
 
@@ -166,9 +169,9 @@ class Config : public IConfig
 	bool isControlsWidgetVisible() const override;
 	void setIsControlsWidgetVisible(bool isVisible) override;
 
-    // Image Grabber
+	// Image Grabber
 
-    bool isFreezeImageWhileSnippingEnabledReadOnly() const override;
+	bool isFreezeImageWhileSnippingEnabledReadOnly() const override;
 	bool freezeImageWhileSnippingEnabled() const override;
 	void setFreezeImageWhileSnippingEnabled(bool enabled) override;
 
@@ -210,9 +213,9 @@ class Config : public IConfig
 	bool forceGenericWaylandEnabled() const override;
 	void setForceGenericWaylandEnabled(bool enabled) override;
 
-    bool isScaleGenericWaylandScreenshotEnabledReadOnly() const override;
-    bool scaleGenericWaylandScreenshotsEnabled() const override;
-    void setScaleGenericWaylandScreenshots(bool enabled) override;
+	bool isScaleGenericWaylandScreenshotEnabledReadOnly() const override;
+	bool scaleGenericWaylandScreenshotsEnabled() const override;
+	void setScaleGenericWaylandScreenshots(bool enabled) override;
 
 	bool hideMainWindowDuringScreenshot() const override;
 	void setHideMainWindowDuringScreenshot(bool enabled) override;
@@ -223,11 +226,11 @@ class Config : public IConfig
 	bool showSnippingAreaInfoText() const override;
 	void setShowSnippingAreaInfoText(bool enabled) override;
 
-    bool snippingAreaOffsetEnable() const override;
-    void setSnippingAreaOffsetEnable(bool enabled) override;
+	bool snippingAreaOffsetEnable() const override;
+	void setSnippingAreaOffsetEnable(bool enabled) override;
 
-    QPointF snippingAreaOffset() const override;
-    void setSnippingAreaOffset(const QPointF &offset) override;
+	QPointF snippingAreaOffset() const override;
+	void setSnippingAreaOffset(const QPointF &offset) override;
 
 	// Uploader
 
@@ -237,7 +240,7 @@ class Config : public IConfig
 	UploaderType uploaderType() const override;
 	void setUploaderType(UploaderType type) override;
 
-    // Imgur Uploader
+	// Imgur Uploader
 
 	QString imgurUsername() const override;
 	void setImgurUsername(const QString &username) override;
@@ -321,10 +324,10 @@ class Config : public IConfig
 	QKeySequence windowUnderCursorHotKey() const override;
 	void setWindowUnderCursorHotKey(const QKeySequence &keySequence) override;
 
-    QKeySequence portalHotKey() const override;
-    void setPortalHotKey(const QKeySequence &keySequence) override;
+	QKeySequence portalHotKey() const override;
+	void setPortalHotKey(const QKeySequence &keySequence) override;
 
-    // Actions
+	// Actions
 
 	QList<Action> actions() override;
 	void setActions(const QList<Action> &actions) override;
@@ -338,7 +341,7 @@ class Config : public IConfig
 	void setPluginInfos(const QList<PluginInfo> &pluginInfos) override;
 
 private:
-    QSettings mConfig;
+	QSettings mConfig;
 	const QSharedPointer<IDirectoryPathProvider> mDirectoryPathProvider;
 
 	void saveValue(const QString &key, const QVariant &value);

diff --git a/src/backend/config/ConfigOptions.cpp b/src/backend/config/ConfigOptions.cpp
@@ -89,6 +89,11 @@ QString ConfigOptions::resizeToContentDelayString()
 	return applicationSectionString() + QLatin1String("ResizeToContentDelay");
 }
 
+QString ConfigOptions::overwriteFileEnabledString()
+{
+	return applicationSectionString() + QLatin1String("OverwriteFileEnabled");
+}
+
 QString ConfigOptions::freezeImageWhileSnippingEnabledString()
 {
 	return imageGrabberSectionString() + QLatin1String("FreezeImageWhileSnippingEnabled");
@@ -211,7 +216,7 @@ QString ConfigOptions::snippingAreaOffsetEnableString()
 
 QString ConfigOptions::snippingAreaOffsetString()
 {
-    return snippingAreaSectionString() + QLatin1String("SnippingAreaOffset");
+	return snippingAreaSectionString() + QLatin1String("SnippingAreaOffset");
 }
 
 QString ConfigOptions::smoothPathEnabledString()
@@ -301,12 +306,12 @@ QString ConfigOptions::lastRectAreaString()
 
 QString ConfigOptions::forceGenericWaylandEnabledString()
 {
-    return imageGrabberSectionString() + QLatin1String("ForceGenericWaylandEnabled");
+	return imageGrabberSectionString() + QLatin1String("ForceGenericWaylandEnabled");
 }
 
 QString ConfigOptions::scaleWaylandScreenshotsEnabledString()
 {
-    return imageGrabberSectionString() + QLatin1String("ScaleGenericWaylandScreenshotsEnabledString");
+	return imageGrabberSectionString() + QLatin1String("ScaleGenericWaylandScreenshotsEnabledString");
 }
 
 QString ConfigOptions::imgurUsernameString()
@@ -541,7 +546,7 @@ QString ConfigOptions::windowUnderCursorHotKeyString()
 
 QString ConfigOptions::portalHotKeyString()
 {
-    return hotKeysSectionString() + QLatin1String("PortalHotKey");
+	return hotKeysSectionString() + QLatin1String("PortalHotKey");
 }
 
 QString ConfigOptions::applicationSectionString()
@@ -601,5 +606,5 @@ QString ConfigOptions::pluginsSectionString()
 
 QString ConfigOptions::snippingAreaSectionString()
 {
-    return QLatin1String("SnippingArea/");
+	return QLatin1String("SnippingArea/");
 }
diff --git a/src/backend/config/ConfigOptions.h b/src/backend/config/ConfigOptions.h
@@ -41,6 +41,7 @@ class ConfigOptions
 	static QString autoHideDocksString();
 	static QString autoResizeToContentString();
 	static QString resizeToContentDelayString();
+	static QString overwriteFileEnabledString();
 	static QString captureModeString();
 	static QString saveQualityModeString();
 	static QString saveQualityFactorString();

diff --git a/src/backend/config/IConfig.h b/src/backend/config/IConfig.h
@@ -60,6 +60,9 @@ class IConfig : public QObject
 	virtual int resizeToContentDelay() const = 0;
 	virtual void setResizeToContentDelay(int ms) = 0;
 
+	virtual bool overwriteFile() const = 0;
+	virtual void setOverwriteFile(bool enabled) = 0;
+
 	virtual bool useTabs() const = 0;
 	virtual void setUseTabs(bool enabled) = 0;
 
@@ -218,11 +221,11 @@ class IConfig : public QObject
 	virtual bool showSnippingAreaInfoText() const = 0;
 	virtual void setShowSnippingAreaInfoText(bool enabled) = 0;
 
-    virtual bool snippingAreaOffsetEnable() const = 0;
-    virtual void setSnippingAreaOffsetEnable(bool enabled) = 0;
+	virtual bool snippingAreaOffsetEnable() const = 0;
+	virtual void setSnippingAreaOffsetEnable(bool enabled) = 0;
 
-    virtual QPointF snippingAreaOffset() const = 0;
-    virtual void setSnippingAreaOffset(const QPointF &offset) = 0;
+	virtual QPointF snippingAreaOffset() const = 0;
+	virtual void setSnippingAreaOffset(const QPointF &offset) = 0;
 
 	// Uploader
 

diff --git a/src/backend/saver/NameProvider.cpp b/src/backend/saver/NameProvider.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "NameProvider.h"
+
+QString NameProvider::makeFilename(const QString& path, const QString& filename, const QString& format)
+{
+	return path + filename + format;
+}
diff --git a/src/backend/saver/NameProvider.h b/src/backend/saver/NameProvider.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KSNIP_NAMEPROVIDER_H
+#define KSNIP_NAMEPROVIDER_H
+
+#include <QString>
+#include <QFile>
+
+class NameProvider
+{
+public:
+	static QString makeFilename(const QString &path, const QString &filename, const QString &format = QString());
+};
+
+#endif //KSNIP_NAMEPROVIDER_H
diff --git a/src/backend/saver/SavePathProvider.cpp b/src/backend/saver/SavePathProvider.cpp
@@ -26,12 +26,16 @@ SavePathProvider::SavePathProvider(const QSharedPointer<IConfig> &config) :
 
 QString SavePathProvider::savePath() const
 {
-    return UniqueNameProvider::makeUniqueFilename(saveDirectory(), getFilename(), getFormat(mConfig->saveFormat()));
+	if (mConfig->overwriteFile()) {
+		return NameProvider::makeFilename(saveDirectory(), getFilename(), getFormat(mConfig->saveFormat()));
+	} else {
+		return UniqueNameProvider::makeUniqueFilename(saveDirectory(), getFilename(), getFormat(mConfig->saveFormat()));
+	}
 }
 
 QString SavePathProvider::savePathWithFormat(const QString &format) const
 {
-    return UniqueNameProvider::makeUniqueFilename(saveDirectory(), getFilename(), getFormat(format));
+	return UniqueNameProvider::makeUniqueFilename(saveDirectory(), getFilename(), getFormat(format));
 }
 
 QString SavePathProvider::getFilename() const
@@ -42,7 +46,7 @@ QString SavePathProvider::getFilename() const
 
 QString SavePathProvider::getFormat(const QString &format) const
 {
-    return format.startsWith(QLatin1Char('.')) ? format : QLatin1Char('.') + format;
+	return format.startsWith(QLatin1Char('.')) ? format : QLatin1Char('.') + format;
 }
 
 QString SavePathProvider::saveDirectory() const

diff --git a/src/backend/saver/SavePathProvider.h b/src/backend/saver/SavePathProvider.h
@@ -24,23 +24,24 @@
 
 #include "ISavePathProvider.h"
 #include "src/backend/saver/WildcardResolver.h"
+#include "src/backend/saver/NameProvider.h"
 #include "src/backend/saver/UniqueNameProvider.h"
 #include "src/backend/config/IConfig.h"
 
 class SavePathProvider : public ISavePathProvider
 {
 public:
-    explicit SavePathProvider(const QSharedPointer<IConfig> &config);
-    ~SavePathProvider() = default;
-    QString savePath() const override;
-    QString savePathWithFormat(const QString& format) const override;
-    QString saveDirectory() const override;
+	explicit SavePathProvider(const QSharedPointer<IConfig> &config);
+	~SavePathProvider() = default;
+	QString savePath() const override;
+	QString savePathWithFormat(const QString& format) const override;
+	QString saveDirectory() const override;
 
 private:
-    QSharedPointer<IConfig> mConfig;
+	QSharedPointer<IConfig> mConfig;
 
-    QString getFormat(const QString &format) const;
-    QString getFilename() const;
+	QString getFormat(const QString &format) const;
+	QString getFilename() const;
 };
 
 #endif //KSNIP_SAVEPATHPROVIDER_H