Generic implementation of OGR file DB connection

elpaso · elpaso · commit ce3d644e74ff · 2017-09-08T08:39:28.000+02:00
diff --git a/src/providers/ogr/qgsogrdbconnection.cpp b/src/providers/ogr/qgsogrdbconnection.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsgeopackageconnection.cpp  -  selector for geopackage
+    qgsogrdbconnection.cpp
                              -------------------
     begin                : August 2017
     copyright            : (C) 2017 by Alessandro Pasotti
@@ -18,72 +18,76 @@
 #include "qgis.h"
 #include "qgsdatasourceuri.h"
 #include "qgssettings.h"
-#include "qgsgeopackageconnection.h"
+#include "qgsogrdbconnection.h"
 #include "qgslogger.h"
 #include <QInputDialog>
 #include <QMessageBox>
 
-const QString QgsGeoPackageConnection::SETTINGS_PREFIX = QStringLiteral( "providers/geopackage" );
 
 
-QgsGeoPackageConnection::QgsGeoPackageConnection( const QString &connName )
+QgsOgrDbConnection::QgsOgrDbConnection( const QString &connName, const QString &settingsKey )
   : mConnName( connName )
 {
+  mSettingsKey = settingsKey ;
   QgsSettings settings;
-
-  QString key = QStringLiteral( "%1/%2/path" ).arg( connectionsPath( ), mConnName );
+  QString key = QStringLiteral( "%1/%2/path" ).arg( connectionsPath( settingsKey ), mConnName );
   mPath = settings.value( key ).toString();
 }
 
-QgsGeoPackageConnection::~QgsGeoPackageConnection()
+QgsOgrDbConnection::~QgsOgrDbConnection()
 {
 
 }
 
-QgsDataSourceUri QgsGeoPackageConnection::uri()
+QgsDataSourceUri QgsOgrDbConnection::uri()
 {
   QgsDataSourceUri uri;
   uri.setEncodedUri( mPath );
   return uri;
 }
 
-void QgsGeoPackageConnection::setPath( const QString &path )
+void QgsOgrDbConnection::setPath( const QString &path )
 {
   mPath = path;
 }
 
-void QgsGeoPackageConnection::save( )
+void QgsOgrDbConnection::save( )
 {
   QgsSettings settings;
-  settings.setValue( QStringLiteral( "%1/%2/path" ).arg( connectionsPath( ), mConnName ), mPath );
+  settings.setValue( QStringLiteral( "%1/%2/path" ).arg( connectionsPath( mSettingsKey ), mConnName ), mPath );
+}
+
+QString QgsOgrDbConnection::fullKey( const QString &settingsKey )
+{
+  return QStringLiteral( "providers/ogr/%1" ).arg( settingsKey );
 }
 
-QString QgsGeoPackageConnection::connectionsPath()
+QString QgsOgrDbConnection::connectionsPath( const QString &settingsKey )
 {
-  return QStringLiteral( "%1/connections" ).arg( SETTINGS_PREFIX );
+  return QStringLiteral( "%1/connections" ).arg( fullKey( settingsKey ) );
 }
 
-QStringList QgsGeoPackageConnection::connectionList()
+const QStringList QgsOgrDbConnection::connectionList( const QString &settingsKey )
 {
   QgsSettings settings;
-  settings.beginGroup( connectionsPath( ) );
+  settings.beginGroup( connectionsPath( settingsKey ) );
   return settings.childGroups();
 }
 
-QString QgsGeoPackageConnection::selectedConnection()
+QString QgsOgrDbConnection::selectedConnection( const QString &settingsKey )
 {
   QgsSettings settings;
-  return settings.value( QStringLiteral( "%1/selected" ).arg( SETTINGS_PREFIX ) ).toString();
+  return settings.value( QStringLiteral( "%1/selected" ).arg( connectionsPath( settingsKey ) ) ).toString();
 }
 
-void QgsGeoPackageConnection::setSelectedConnection( const QString &name )
+void QgsOgrDbConnection::setSelectedConnection( const QString &connName, const QString &settingsKey )
 {
   QgsSettings settings;
-  settings.setValue( QStringLiteral( "%1/selected" ).arg( SETTINGS_PREFIX ), name );
+  settings.setValue( QStringLiteral( "%1/selected" ).arg( connectionsPath( settingsKey ) ), connName );
 }
 
-void QgsGeoPackageConnection::deleteConnection( const QString &name )
+void QgsOgrDbConnection::deleteConnection( const QString &connName, const QString &settingsKey )
 {
   QgsSettings settings;
-  settings.remove( QStringLiteral( "%1/%2" ).arg( connectionsPath(), name ) );
+  settings.remove( QStringLiteral( "%1/%2" ).arg( connectionsPath( settingsKey ), connName ) );
 }
diff --git a/src/providers/ogr/qgsogrdbconnection.h b/src/providers/ogr/qgsogrdbconnection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsgeopackageconnection.h  -  GeoPackage connection
+    qgsogrdbconnection.h  -  QgsOgrDbConnection
                              -------------------
     begin                : August 2017
     copyright            : (C) 2017 by Alessandro Pasotti
@@ -15,30 +15,30 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSGEOPACKAGECONNECTION_H
-#define QGSGEOPACKAGECONNECTION_H
+#ifndef QGSGOGRDBSCONNECTION_H
+#define QGSGOGRDBSCONNECTION_H
 
 #include "qgsdatasourceuri.h"
 
 #include <QStringList>
 
 /*!
- * \brief   Connections management
+ * \brief  Generic OGR DB Connections management
  */
-class QgsGeoPackageConnection : public QObject
+class QgsOgrDbConnection : public QObject
 {
     Q_OBJECT
 
   public:
     //! Constructor
-    explicit QgsGeoPackageConnection( const QString &connName );
+    explicit QgsOgrDbConnection( const QString &connName, const QString &settingsKey );
 
-    ~QgsGeoPackageConnection();
+    ~QgsOgrDbConnection();
 
-    static QStringList connectionList();
-    static void deleteConnection( const QString &name );
-    static QString selectedConnection();
-    static void setSelectedConnection( const QString &name );
+    static const QStringList connectionList( const QString &settingsKey );
+    static void deleteConnection( const QString &connName, const QString &settingsKey );
+    static QString selectedConnection( const QString &settingsKey );
+    static void setSelectedConnection( const QString &connName, const QString &settingsKey );
 
   public:
     //! Return the uri
@@ -52,14 +52,14 @@ class QgsGeoPackageConnection : public QObject
     void setPath( const QString &path );
     //! Store the connection data in the settings
     void save();
-    const static QString SETTINGS_PREFIX;
 
   private:
-
-    static QString connectionsPath( );
+    static QString fullKey( const QString &settingsKey );
+    static QString connectionsPath( const QString &settingsKey );
     QString mConnName;
     QString mPath;
+    QString mSettingsKey;
 
 };
 
-#endif // QGSGEOPACKAGECONNECTION_H
+#endif // QGSGOGRDBSCONNECTION_H

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/***************************************************************************`
`2`		`- qgsgeopackageconnection.cpp - selector for geopackage`
	`2`	`+ qgsogrdbconnection.cpp`
`3`	`3`	`-------------------`
`4`	`4`	`begin : August 2017`
`5`	`5`	`copyright : (C) 2017 by Alessandro Pasotti`
`@@ -18,72 +18,76 @@`
`18`	`18`	`#include "qgis.h"`
`19`	`19`	`#include "qgsdatasourceuri.h"`
`20`	`20`	`#include "qgssettings.h"`
`21`		`-#include "qgsgeopackageconnection.h"`
	`21`	`+#include "qgsogrdbconnection.h"`
`22`	`22`	`#include "qgslogger.h"`
`23`	`23`	`#include <QInputDialog>`
`24`	`24`	`#include <QMessageBox>`
`25`	`25`
`26`		`-const QString QgsGeoPackageConnection::SETTINGS_PREFIX = QStringLiteral( "providers/geopackage" );`
`27`	`26`
`28`	`27`
`29`		`-QgsGeoPackageConnection::QgsGeoPackageConnection( const QString &connName )`
	`28`	`+QgsOgrDbConnection::QgsOgrDbConnection( const QString &connName, const QString &settingsKey )`
`30`	`29`	`: mConnName( connName )`
`31`	`30`	`{`
	`31`	`+ mSettingsKey = settingsKey ;`
`32`	`32`	`QgsSettings settings;`
`33`		`-`
`34`		`- QString key = QStringLiteral( "%1/%2/path" ).arg( connectionsPath( ), mConnName );`
	`33`	`+ QString key = QStringLiteral( "%1/%2/path" ).arg( connectionsPath( settingsKey ), mConnName );`
`35`	`34`	`mPath = settings.value( key ).toString();`
`36`	`35`	`}`
`37`	`36`
`38`		`-QgsGeoPackageConnection::~QgsGeoPackageConnection()`
	`37`	`+QgsOgrDbConnection::~QgsOgrDbConnection()`
`39`	`38`	`{`
`40`	`39`
`41`	`40`	`}`
`42`	`41`
`43`		`-QgsDataSourceUri QgsGeoPackageConnection::uri()`
	`42`	`+QgsDataSourceUri QgsOgrDbConnection::uri()`
`44`	`43`	`{`
`45`	`44`	`QgsDataSourceUri uri;`
`46`	`45`	`uri.setEncodedUri( mPath );`
`47`	`46`	`return uri;`
`48`	`47`	`}`
`49`	`48`
`50`		`-void QgsGeoPackageConnection::setPath( const QString &path )`
	`49`	`+void QgsOgrDbConnection::setPath( const QString &path )`
`51`	`50`	`{`
`52`	`51`	`mPath = path;`
`53`	`52`	`}`
`54`	`53`
`55`		`-void QgsGeoPackageConnection::save( )`
	`54`	`+void QgsOgrDbConnection::save( )`
`56`	`55`	`{`
`57`	`56`	`QgsSettings settings;`
`58`		`- settings.setValue( QStringLiteral( "%1/%2/path" ).arg( connectionsPath( ), mConnName ), mPath );`
	`57`	`+ settings.setValue( QStringLiteral( "%1/%2/path" ).arg( connectionsPath( mSettingsKey ), mConnName ), mPath );`
	`58`	`+}`
	`59`	`+`
	`60`	`+QString QgsOgrDbConnection::fullKey( const QString &settingsKey )`
	`61`	`+{`
	`62`	`+ return QStringLiteral( "providers/ogr/%1" ).arg( settingsKey );`
`59`	`63`	`}`
`60`	`64`
`61`		`-QString QgsGeoPackageConnection::connectionsPath()`
	`65`	`+QString QgsOgrDbConnection::connectionsPath( const QString &settingsKey )`
`62`	`66`	`{`
`63`		`- return QStringLiteral( "%1/connections" ).arg( SETTINGS_PREFIX );`
	`67`	`+ return QStringLiteral( "%1/connections" ).arg( fullKey( settingsKey ) );`
`64`	`68`	`}`
`65`	`69`
`66`		`-QStringList QgsGeoPackageConnection::connectionList()`
	`70`	`+const QStringList QgsOgrDbConnection::connectionList( const QString &settingsKey )`
`67`	`71`	`{`
`68`	`72`	`QgsSettings settings;`
`69`		`- settings.beginGroup( connectionsPath( ) );`
	`73`	`+ settings.beginGroup( connectionsPath( settingsKey ) );`
`70`	`74`	`return settings.childGroups();`
`71`	`75`	`}`
`72`	`76`
`73`		`-QString QgsGeoPackageConnection::selectedConnection()`
	`77`	`+QString QgsOgrDbConnection::selectedConnection( const QString &settingsKey )`
`74`	`78`	`{`
`75`	`79`	`QgsSettings settings;`
`76`		`- return settings.value( QStringLiteral( "%1/selected" ).arg( SETTINGS_PREFIX ) ).toString();`
	`80`	`+ return settings.value( QStringLiteral( "%1/selected" ).arg( connectionsPath( settingsKey ) ) ).toString();`
`77`	`81`	`}`
`78`	`82`
`79`		`-void QgsGeoPackageConnection::setSelectedConnection( const QString &name )`
	`83`	`+void QgsOgrDbConnection::setSelectedConnection( const QString &connName, const QString &settingsKey )`
`80`	`84`	`{`
`81`	`85`	`QgsSettings settings;`
`82`		`- settings.setValue( QStringLiteral( "%1/selected" ).arg( SETTINGS_PREFIX ), name );`
	`86`	`+ settings.setValue( QStringLiteral( "%1/selected" ).arg( connectionsPath( settingsKey ) ), connName );`
`83`	`87`	`}`
`84`	`88`
`85`		`-void QgsGeoPackageConnection::deleteConnection( const QString &name )`
	`89`	`+void QgsOgrDbConnection::deleteConnection( const QString &connName, const QString &settingsKey )`
`86`	`90`	`{`
`87`	`91`	`QgsSettings settings;`
`88`		`- settings.remove( QStringLiteral( "%1/%2" ).arg( connectionsPath(), name ) );`
	`92`	`+ settings.remove( QStringLiteral( "%1/%2" ).arg( connectionsPath( settingsKey ), connName ) );`
`89`	`93`	`}`