Add DB_DIR placeholder for autoopen urls

nunobett · May 21, 2020 · d863496 · d863496
1 parent bcb64a2
commit d863496
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
@@ -903,6 +903,10 @@ QString Entry::resolvePlaceholderRecursive(const QString& placeholder, int maxDe
             return url();
         }
         return resolveMultiplePlaceholdersRecursive(url(), maxDepth - 1);
+    case PlaceholderType::DbDir: {
+        QFileInfo fileInfo(database()->filePath());
+        return fileInfo.absoluteDir().absolutePath();
+    }
     case PlaceholderType::UrlWithoutScheme:
     case PlaceholderType::UrlScheme:
     case PlaceholderType::UrlHost:
@@ -1237,7 +1241,8 @@ Entry::PlaceholderType Entry::placeholderType(const QString& placeholder) const
         {QStringLiteral("{DT_UTC_DAY}"), PlaceholderType::DateTimeUtcDay},
         {QStringLiteral("{DT_UTC_HOUR}"), PlaceholderType::DateTimeUtcHour},
         {QStringLiteral("{DT_UTC_MINUTE}"), PlaceholderType::DateTimeUtcMinute},
-        {QStringLiteral("{DT_UTC_SECOND}"), PlaceholderType::DateTimeUtcSecond}};
+        {QStringLiteral("{DT_UTC_SECOND}"), PlaceholderType::DateTimeUtcSecond},
+        {QStringLiteral("{DB_DIR}"), PlaceholderType::DbDir}};
 
     return placeholders.value(placeholder.toUpper(), PlaceholderType::Unknown);
 }

diff --git a/src/core/Entry.h b/src/core/Entry.h
@@ -205,7 +205,8 @@ class Entry : public QObject
         DateTimeUtcDay,
         DateTimeUtcHour,
         DateTimeUtcMinute,
-        DateTimeUtcSecond
+        DateTimeUtcSecond,
+        DbDir
     };
 
     /**

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -1973,15 +1973,16 @@ void DatabaseWidget::processAutoOpen()
         }
         QFileInfo filepath;
         QFileInfo keyfile;
+        QString databaseUrl = entry->resolveMultiplePlaceholders(entry->url());
 
-        if (entry->url().startsWith("file://")) {
-            QUrl url(entry->url());
+        if (databaseUrl.startsWith("file://")) {
+            QUrl url(databaseUrl);
             filepath.setFile(url.toLocalFile());
         } else {
-            filepath.setFile(entry->url());
+            filepath.setFile(databaseUrl);
             if (filepath.isRelative()) {
                 QFileInfo currentpath(m_db->filePath());
-                filepath.setFile(currentpath.absoluteDir(), entry->url());
+                filepath.setFile(currentpath.absoluteDir(), databaseUrl);
             }
         }