Merge lp:~gcollura/u1db-qt/fix-1387294 into lp:u1db-qt

[Giulio Collura]

Make u1db-qt play nice with ~ as absolute directory.

Fix for bug #1387294. Make u1db-qt play nice with ~ as absolute directory.

[lp:~gcollura/u1db-qt/fix-1387294]

121. By Giulio Collura on 2014-10-29

improve codestyle

[Michał Karnicki (karni)]

Looks good to me. Can we please have someone from U1DB Qt devs review and advise on how we get this landed? Thanks.

[Cris Dywan (kalikiana)]

My immediate concern is that this isn't addressing the use case it was motivated by - if settings stored in U1Db should go to the config folder, ~ is the wrong approach.

review: Needs Information

[Giulio Collura (gcollura)]

What would you suggest instead? We would like to have the chance to use .config for all data app. We can add another property to Database that stores the destination folder, for example:
Database {
  path: 'hello.db'
  location: Database.ConfigLocation
}
I'm not sure about the naming convention, the default option would be Database.DataLocation.
These would be values of an enum exported to qml.
Let me know what you think about this solution.

Giulio

[Michał Karnicki (karni)]

I have mixed feelings. Let's not forget U1DB can also be used by desktop apps, which currently are not confined and apparmor restrictions do not apply.

[Michał Karnicki (karni)]

Hi Christian,

Have you made decision how you want to proceed with this bug? Soon this will affect Telegram, where (IIUC) there no longer is 'phablet' user in the new image.

review: Needs Information

Unmerged revisions

121. By Giulio Collura on 2014-10-29

improve codestyle

120. By Giulio Collura on 2014-10-29

Fix bug #1387294. Improve database path creation.

=== modified file 'src/database.cpp'
--- src/database.cpp	2014-07-09 22:39:59 +0000
+++ src/database.cpp	2014-10-29 19:48:43 +0000
@@ -140,16 +140,19 @@
     if (!m_db.isValid())
         return setError("QSqlDatabase error");
 
-    if (path != ":memory:" && QDir::isRelativePath(path)) {
+    QString absolutePath;
+    if (path != ":memory:" && QDir::isRelativePath(path) && !path.contains("~")) {
         QString dataPath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
-        QString absolutePath(QDir(dataPath).absoluteFilePath(path));
-        QString parent(QFileInfo(absolutePath).dir().path());
-        if (!QDir().mkpath(parent))
-            qWarning() << "Failed to make data folder" << parent;
-        m_db.setDatabaseName(absolutePath);
-    }
-    else
-    m_db.setDatabaseName(path);
+        absolutePath = QDir(dataPath).absoluteFilePath(path);
+    }
+    else {
+        absolutePath = path;
+        absolutePath.replace("~", QDir::homePath());
+    }
+    QString parent(QFileInfo(absolutePath).dir().path());
+    if (!QDir().mkpath(parent))
+        qWarning() << "Failed to make destination folder" << parent;
+    m_db.setDatabaseName(absolutePath);
 
     if (!m_db.open())
         return setError(QString("Failed to open %1: %2").arg(path).arg(m_db.lastError().text()));