qml: added getting custom datadir for display

Author: D33r-Gee

src/qml/models/options_model.cpp

@@ -130,10 +130,32 @@ QUrl OptionsQmlModel::getDefaultDataDirectory()
     return QUrl::fromLocalFile(path);
 }
 
-void OptionsQmlModel::setCustomDataDirArgs(QString path)
+QString OptionsQmlModel::setCustomDataDirArgs(QString path)
 {
     if (!path.isEmpty()) {
         // TODO: add actual custom data wiring
+        #ifdef __ANDROID__
+            QString uri = path;
+            QString originalPrefix = "content://com.android.externalstorage.documents/tree/primary%3A";
+            QString newPrefix = "/storage/self/primary/";
+            QString path = uri.replace(originalPrefix, newPrefix);
+        #else
+            path = QUrl(path).toLocalFile();
+        #endif // __ANDROID__
         qDebug() << "PlaceHolder: Created data directory: " << path;
+
+        Q_EMIT customDataDirStringChanged(path);
+        return path;
     }
+    return QString();
+}
+
+QString OptionsQmlModel::getCustomDataDirString()
+{
+    #ifdef __ANDROID__
+        m_custom_datadir_string = m_custom_datadir_string.replace("content://com.android.externalstorage.documents/tree/primary%3A", "/storage/self/primary/");
+    #else
+        m_custom_datadir_string = QUrl(m_custom_datadir_string).toLocalFile();
+    #endif // __ANDROID__
+    return m_custom_datadir_string;
 }

src/qml/models/options_model.h

@@ -62,7 +62,8 @@ class OptionsQmlModel : public QObject
     void setUpnp(bool new_upnp);
     QString getDefaultDataDirString();
     QUrl getDefaultDataDirectory();
-    Q_INVOKABLE void setCustomDataDirArgs(QString path);
+    Q_INVOKABLE QString setCustomDataDirArgs(QString path);
+    Q_INVOKABLE QString getCustomDataDirString();
 
 public Q_SLOTS:
     void setCustomDataDirString(const QString &new_custom_datadir_string) {