From 81a28fe9724e92579e84748a25cf41667579f898 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 1 Apr 2025 08:11:57 +0200
Subject: [PATCH] bit of a refactorings

---
 resources/scripts/github-actions/build-linux-mac.sh    |  2 +-
 resources/scripts/github-actions/build-windows.ps1     |  2 +-
 src/librssguard/gui/dialogs/filedialog.cpp             | 10 +++++++---
 src/librssguard/gui/dialogs/filedialog.h               |  2 ++
 .../gui/dialogs/formrestoredatabasesettings.cpp        |  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh
index 131f3c5a8..a21856f5f 100755
--- a/resources/scripts/github-actions/build-linux-mac.sh
+++ b/resources/scripts/github-actions/build-linux-mac.sh
@@ -63,7 +63,7 @@ else
   QTBIN="$QTPATH/$QTVERSION/$QTOS/bin"
 
   # Install "aqtinstall" from its master branch to have latest code.
-  pip3 install -I aqtinstall
+  pip3 install -I git+https://github.com/miurahr/aqtinstall
 
   echo "Qt bin directory is: $QTBIN"
   echo "Qt will be installed to: $QTPATH"
diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1
index 2a10c6522..5714235cb 100755
--- a/resources/scripts/github-actions/build-windows.ps1
+++ b/resources/scripts/github-actions/build-windows.ps1
@@ -103,7 +103,7 @@ $qt_path = "$old_pwd\qt"
 
 # Install "aqtinstall" from its master branch to have latest code.
 pip3 install -U pip
-pip3 install -I aqtinstall
+pip3 install -I git+https://github.com/miurahr/aqtinstall
 
 if ($is_qt_6) {
   aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning
diff --git a/src/librssguard/gui/dialogs/filedialog.cpp b/src/librssguard/gui/dialogs/filedialog.cpp
index d1aabcbe7..9ecb0bde5 100644
--- a/src/librssguard/gui/dialogs/filedialog.cpp
+++ b/src/librssguard/gui/dialogs/filedialog.cpp
@@ -11,7 +11,7 @@ QString FileDialog::existingDirectory(QWidget* parent,
                                       const QString& dir,
                                       const QString& id,
                                       QFileDialog::Options options) {
-  QString initial_dir_file = id.isEmpty() ? dir : qApp->settings()->value(GROUP(FileDialogPaths), id, dir).toString();
+  QString initial_dir_file = id.isEmpty() ? dir : storedFolder(id, dir);
   QFileInfo initial_dir_file_info(initial_dir_file);
   QString fldr = QFileDialog::getExistingDirectory(parent,
                                                    caption.isEmpty() ? QObject::tr("Select existing folder") : caption,
@@ -25,6 +25,10 @@ QString FileDialog::existingDirectory(QWidget* parent,
   return fldr;
 }
 
+QString FileDialog::storedFolder(const QString& id, const QString& dir) {
+  return qApp->settings()->value(GROUP(FileDialogPaths), id, dir).toString();
+}
+
 QString FileDialog::saveFileName(QWidget* parent,
                                  const QString& caption,
                                  const QString& dir,
@@ -32,7 +36,7 @@ QString FileDialog::saveFileName(QWidget* parent,
                                  QString* selected_filter,
                                  const QString& id,
                                  QFileDialog::Options options) {
-  QString initial_dir_file = id.isEmpty() ? dir : qApp->settings()->value(GROUP(FileDialogPaths), id, dir).toString();
+  QString initial_dir_file = id.isEmpty() ? dir : storedFolder(id, dir);
   QString file = QFileDialog::getSaveFileName(parent,
                                               caption.isEmpty() ? QObject::tr("Save file") : caption,
                                               initial_dir_file,
@@ -54,7 +58,7 @@ QString FileDialog::openFileName(QWidget* parent,
                                  QString* selected_filter,
                                  const QString& id,
                                  QFileDialog::Options options) {
-  QString initial_dir_file = id.isEmpty() ? dir : qApp->settings()->value(GROUP(FileDialogPaths), id, dir).toString();
+  QString initial_dir_file = id.isEmpty() ? dir : storedFolder(id, dir);
   QString file = QFileDialog::getOpenFileName(parent,
                                               caption.isEmpty() ? QObject::tr("Select existing file") : caption,
                                               initial_dir_file,
diff --git a/src/librssguard/gui/dialogs/filedialog.h b/src/librssguard/gui/dialogs/filedialog.h
index 388c04c8d..6037d80e4 100644
--- a/src/librssguard/gui/dialogs/filedialog.h
+++ b/src/librssguard/gui/dialogs/filedialog.h
@@ -12,6 +12,8 @@ class QWidget;
 
 class RSSGUARD_DLLSPEC FileDialog {
   public:
+    static QString storedFolder(const QString& id, const QString& dir = QString());
+
     static QString saveFileName(QWidget* parent = nullptr,
                                 const QString& caption = QString(),
                                 const QString& dir = QString(),
diff --git a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp
index 5cefa2f39..9a2d28f2f 100644
--- a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp
+++ b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp
@@ -29,7 +29,7 @@ FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDia
           &QPushButton::clicked,
           this,
           &FormRestoreDatabaseSettings::performRestoration);
-  selectFolder(qApp->documentsFolder());
+  selectFolder(FileDialog::storedFolder(GENERAL_REMEMBERED_PATH, qApp->documentsFolder()));
 }
 
 FormRestoreDatabaseSettings::~FormRestoreDatabaseSettings() {