Remember previous download location

The last downloaded file's location is remembered and the "Save File" dialog opens in the same directory.
kiwix · Jun 14, 2024 · 241f310 · 241f310
1 parent 35584a8
commit 241f310
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
@@ -227,21 +227,32 @@ QString gt(const QString &key) {
  return KiwixApp::instance()->getText(key);
 }
 
+QString KiwixApp::getZimImportDir() const
+{
+ QString importDir = mp_session->value("zim-import-dir").toString();
+ if (importDir.isEmpty()) {
+ importDir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+ if (importDir.isEmpty()) { importDir = QDir::currentPath(); }
+ }
+ return importDir;
+}
+
+void KiwixApp::setZimImportDir(QString importDir)
+{
+ mp_session->setValue("zim-import-dir", importDir);
+}
+
 void KiwixApp::openZimFile(const QString &zimfile)
 {
  QString _zimfile;
  if (zimfile.isEmpty()) {
- QString importDir = mp_session->value("zim-import-dir").toString();
- if (importDir.isEmpty()) { 
- importDir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
- if (importDir.isEmpty()) { importDir = QDir::currentPath(); }
- }
+ QString importDir = getZimImportDir();
  _zimfile = QFileDialog::getOpenFileName(getMainWindow(), gt("open-zim"), importDir, "ZIM Files (*.zim);;Split ZIM Files (*.zimaa)");
 
  if (_zimfile.isEmpty()) { return; }
  _zimfile = QDir::toNativeSeparators(_zimfile);
  QFileInfo fileInfo(_zimfile);
- mp_session->setValue("zim-import-dir", fileInfo.absolutePath());
+ setZimImportDir(fileInfo.absolutePath());
  }
  QString zimId;
  const auto &validZimFile = zimfile.isEmpty() ? _zimfile : zimfile;

diff --git a/src/kiwixapp.h b/src/kiwixapp.h
@@ -85,6 +85,8 @@ class KiwixApp : public QtSingleApplication
  kiwix::Server* getLocalServer() { return &m_server; }
  SettingsManager* getSettingsManager() { return &m_settingsManager; };
  QString getText(const QString &key) { return m_translation.getText(key); };
+ QString getZimImportDir() const;
+ void setZimImportDir(QString);
  void setMonitorDir(const QString &dir);
  bool isCurrentArticleBookmarked();
  QString parseStyleFromFile(QString filePath);

diff --git a/src/kprofile.cpp b/src/kprofile.cpp
@@ -57,7 +57,8 @@ void KProfile::openFile(WebEngineDownloadType* download)
 void KProfile::saveFile(WebEngineDownloadType* download)
 {
  QString defaultFileName = download->url().fileName();
- QString fileName = QFileDialog::getSaveFileName(KiwixApp::instance()->getMainWindow(), "Save File", defaultFileName);
+ QString fileName = QFileDialog::getSaveFileName(KiwixApp::instance()->getMainWindow(), "Save File",
+ QDir::cleanPath(KiwixApp::instance()->getZimImportDir() + QDir::separator() + defaultFileName));
  if (fileName.isEmpty()) {
  download->cancel();
  return;
@@ -67,6 +68,8 @@ void KProfile::saveFile(WebEngineDownloadType* download)
  fileName.append(extension);
  }
  setDownloadFilePath(download, fileName);
+ QFileInfo fileInfo(fileName);
+ KiwixApp::instance()->setZimImportDir(fileInfo.absolutePath());
  download->accept();
 }