Merge pull request #5914 from opengisch/qtwebdav_port

Implement import of WebDAV folders

src/core/CMakeLists.txt

@@ -119,7 +119,8 @@ set(QFIELD_CORE_SRCS
     valuemapmodel.cpp
     valuemapmodelbase.cpp
     vertexmodel.cpp
-    viewstatus.cpp)
+    viewstatus.cpp
+    webdavconnection.cpp)
 
 set(QFIELD_CORE_HDRS
     platforms/platformutilities.h
@@ -244,6 +245,7 @@ set(QFIELD_CORE_HDRS
     valuemapmodelbase.h
     vertexmodel.h
     viewstatus.h
+    webdavconnection.h
     ${CMAKE_CURRENT_BINARY_DIR}/qfield.h)
 
 list(APPEND QFIELD_CORE_SRCS permissions.cpp)
@@ -288,6 +290,7 @@ endif()
 
 find_package(SQLite3 REQUIRED)
 find_package(ZXing REQUIRED)
+find_package(QtWebDAV REQUIRED)
 
 add_library(qfield_core STATIC ${QFIELD_CORE_SRCS} ${QFIELD_CORE_HDRS})
 
@@ -367,7 +370,8 @@ target_link_libraries(
          GDAL::GDAL
          SQLite::SQLite3
          Qca::qca
-         libzip::zip)
+         libzip::zip
+         QtWebDAV::QtWebDAV)
 
 if(WITH_BLUETOOTH)
   find_package(

src/core/focusstack.cpp

@@ -61,6 +61,7 @@ void FocusStack::setFocused( QObject *object )
 {
   mStackList.removeAll( object );
   mStackList.append( object );
+  QMetaObject::invokeMethod( object, "forceActiveFocus", Qt::DirectConnection );
 }
 
 void FocusStack::setUnfocused( QObject *object )

src/core/localfilesmodel.cpp

@@ -18,6 +18,7 @@
 #include "platformutilities.h"
 #include "qfieldcloudutils.h"
 #include "qgismobileapp.h"
+#include "webdavconnection.h"
 
 #include <QDir>
 #include <QFile>
@@ -59,6 +60,7 @@ QHash<int, QByteArray> LocalFilesModel::roleNames() const
   roles[ItemSizeRole] = "ItemSize";
   roles[ItemHasThumbnailRole] = "ItemHasThumbnail";
   roles[ItemIsFavoriteRole] = "ItemIsFavorite";
+  roles[ItemHasWebdavConfigurationRole] = "ItemHasWebdavConfiguration";
   return roles;
 }
 
@@ -177,14 +179,14 @@ bool LocalFilesModel::isDeletedAllowedInCurrentPath() const
 {
   const QString path = currentPath();
   const QString applicationDirectory = PlatformUtilities::instance()->applicationDirectory();
-  if ( !applicationDirectory.isEmpty() && path.startsWith( applicationDirectory + QDir::separator() ) )
+  if ( !applicationDirectory.isEmpty() && path.startsWith( applicationDirectory ) )
   {
     return true;
   }
   else
   {
     const QStringList additionalApplicationDirectories = PlatformUtilities::instance()->additionalApplicationDirectories();
-    if ( std::any_of( additionalApplicationDirectories.begin(), additionalApplicationDirectories.end(), [&path]( const QString &directory ) { return ( !directory.isEmpty() && path.startsWith( directory + QDir::separator() ) ); } ) )
+    if ( std::any_of( additionalApplicationDirectories.begin(), additionalApplicationDirectories.end(), [&path]( const QString &directory ) { return ( !directory.isEmpty() && path.startsWith( directory ) ); } ) )
     {
       return true;
     }
@@ -237,10 +239,17 @@ void LocalFilesModel::reloadModel()
     }
 
     const QStringList favorites = QSettings().value( QStringLiteral( "qfieldFavorites" ), QStringList() ).toStringList();
+    QList<Item> favoriteItems;
     for ( const QString &item : favorites )
     {
-      mItems << Item( ItemMetaType::Favorite, ItemType::SimpleFolder, getCurrentTitleFromPath( item ), QString(), item );
+      if ( QFileInfo::exists( item ) )
+      {
+        favoriteItems << Item( ItemMetaType::Favorite, ItemType::SimpleFolder, getCurrentTitleFromPath( item ), QString(), item );
+      }
     }
+
+    std::sort( favoriteItems.begin(), favoriteItems.end(), []( const Item &a, const Item &b ) { return a.title < b.title; } );
+    mItems.append( favoriteItems );
   }
   else
   {
@@ -332,6 +341,11 @@ QVariant LocalFilesModel::data( const QModelIndex &index, int role ) const
 
     case ItemIsFavoriteRole:
       return mFavorites.contains( mItems[index.row()].path );
+
+    case ItemHasWebdavConfigurationRole:
+    {
+      return WebdavConnection::hasWebdavConfiguration( mItems[index.row()].path );
+    }
   }
 
   return QVariant();

src/core/localfilesmodel.h

@@ -86,6 +86,7 @@ class LocalFilesModel : public QAbstractListModel
       ItemSizeRole,
       ItemHasThumbnailRole,
       ItemIsFavoriteRole,
+      ItemHasWebdavConfigurationRole,
     };
     Q_ENUM( Role )
 

src/core/platforms/platformutilities.cpp

@@ -37,6 +37,7 @@
 #include <QMargins>
 #include <QQuickWindow>
 #include <QStandardPaths>
+#include <QStorageInfo>
 #include <QTimer>
 #include <QUrl>
 #include <QtGui/qpa/qplatformwindow.h>
@@ -97,14 +98,18 @@ void PlatformUtilities::afterUpdate()
   const QStringList dirs = appDataDirs();
   for ( const QString &dir : dirs )
   {
-    QDir appDir( dir );
-    appDir.mkpath( QStringLiteral( "proj" ) );
-    appDir.mkpath( QStringLiteral( "auth" ) );
-    appDir.mkpath( QStringLiteral( "fonts" ) );
-    appDir.mkpath( QStringLiteral( "basemaps" ) );
-    appDir.mkpath( QStringLiteral( "logs" ) );
-    appDir.mkpath( QStringLiteral( "plugins" ) );
+    QDir appDataDir( dir );
+    appDataDir.mkpath( QStringLiteral( "proj" ) );
+    appDataDir.mkpath( QStringLiteral( "auth" ) );
+    appDataDir.mkpath( QStringLiteral( "fonts" ) );
+    appDataDir.mkpath( QStringLiteral( "basemaps" ) );
+    appDataDir.mkpath( QStringLiteral( "logs" ) );
+    appDataDir.mkpath( QStringLiteral( "plugins" ) );
   }
+
+  QDir applicationDir( applicationDirectory() );
+  applicationDir.mkpath( QStringLiteral( "Imported Projects" ) );
+  applicationDir.mkpath( QStringLiteral( "Imported Datasets" ) );
 }
 
 QString PlatformUtilities::systemSharedDataLocation() const
@@ -153,7 +158,7 @@ void PlatformUtilities::loadQgsProject() const
 
 QStringList PlatformUtilities::appDataDirs() const
 {
-  return QStringList() << QStandardPaths::standardLocations( QStandardPaths::DocumentsLocation ).first() + QStringLiteral( "/QField/" );
+  return QStringList() << QStandardPaths::standardLocations( QStandardPaths::DocumentsLocation ).first() + QStringLiteral( "/QField Documents/QField/" );
 }
 
 QStringList PlatformUtilities::availableGrids() const
@@ -208,7 +213,7 @@ bool PlatformUtilities::renameFile( const QString &oldFilePath, const QString &n
 
 QString PlatformUtilities::applicationDirectory() const
 {
-  return QStandardPaths::standardLocations( QStandardPaths::DocumentsLocation ).first() + QStringLiteral( "/QField/" );
+  return QStandardPaths::standardLocations( QStandardPaths::DocumentsLocation ).first() + QStringLiteral( "/QField Documents/" );
 }
 
 QStringList PlatformUtilities::additionalApplicationDirectories() const
@@ -218,7 +223,19 @@ QStringList PlatformUtilities::additionalApplicationDirectories() const
 
 QStringList PlatformUtilities::rootDirectories() const
 {
-  return QStringList() << QString();
+  QStringList rootDirectories;
+  rootDirectories << QDir::homePath();
+  for ( const QStorageInfo &volume : QStorageInfo::mountedVolumes() )
+  {
+    if ( volume.isReady() && !volume.isReadOnly() )
+    {
+      if ( volume.fileSystemType() != QLatin1String( "tmpfs" ) && !volume.rootPath().startsWith( QLatin1String( "/boot" ) ) )
+      {
+        rootDirectories << volume.rootPath();
+      }
+    }
+  }
+  return rootDirectories;
 }
 
 void PlatformUtilities::importProjectFolder() const

src/core/platforms/platformutilities.h

@@ -122,7 +122,7 @@ class QFIELD_CORE_EXPORT PlatformUtilities : public QObject
     /**
      * The main application directory within which projects and datasets can be imported.
      */
-    virtual QString applicationDirectory() const;
+    Q_INVOKABLE virtual QString applicationDirectory() const;
 
     /**
      * Secondary application directories which can be used by individual platforms.

src/core/qgismobileapp.cpp

@@ -130,6 +130,7 @@
 #include "urlutils.h"
 #include "valuemapmodel.h"
 #include "vertexmodel.h"
+#include "webdavconnection.h"
 
 #include <QDateTime>
 #include <QFileInfo>
@@ -511,6 +512,7 @@ void QgisMobileapp::initDeclarative( QQmlEngine *engine )
   qmlRegisterType<Positioning>( "org.qfield", 1, 0, "Positioning" );
   qmlRegisterType<PositioningInformationModel>( "org.qfield", 1, 0, "PositioningInformationModel" );
   qmlRegisterType<PositioningDeviceModel>( "org.qfield", 1, 0, "PositioningDeviceModel" );
+  qmlRegisterType<WebdavConnection>( "org.qfield", 1, 0, "WebdavConnection" );
   qmlRegisterType<AudioRecorder>( "org.qfield", 1, 0, "AudioRecorder" );
   qmlRegisterType<BarcodeDecoder>( "org.qfield", 1, 0, "BarcodeDecoder" );
   qmlRegisterType<CameraPermission>( "org.qfield", 1, 0, "QfCameraPermission" );

src/core/utils/fileutils.cpp

@@ -50,6 +50,12 @@ bool FileUtils::isImageMimeTypeSupported( const QString &mimeType )
   return QImageReader::supportedMimeTypes().contains( mimeType.toLatin1() );
 }
 
+QString FileUtils::absolutePath( const QString &filePath )
+{
+  QFileInfo fileInfo( filePath );
+  return fileInfo.absolutePath();
+}
+
 QString FileUtils::fileName( const QString &filePath )
 {
   QFileInfo fileInfo( filePath );

src/core/utils/fileutils.h

@@ -40,14 +40,16 @@ class QFIELD_CORE_EXPORT FileUtils : public QObject
     Q_INVOKABLE static QString mimeTypeName( const QString &filePath );
     //! Returns TRUE if the provided mimetype is a supported image
     Q_INVOKABLE static bool isImageMimeTypeSupported( const QString &mimeType );
-    //! Returns the filename of a filepath - if no file name exists it's empty
+    //! Returns the filename of a \a filePath - if no file name exists it's empty
     Q_INVOKABLE static QString fileName( const QString &filePath );
-    //! Returns true if the file exists (false if it's a directory)
+    //! Returns true if the \a filePath exists (false if it's a directory)
     Q_INVOKABLE static bool fileExists( const QString &filePath );
     //! Returns the suffix (extension)
     Q_INVOKABLE static QString fileSuffix( const QString &filePath );
     //! Returns a human-friendly size from bytes
     Q_INVOKABLE static QString representFileSize( qint64 bytes );
+    //! Returns the absolute path of tghe folder containing the \a filePath.
+    Q_INVOKABLE static QString absolutePath( const QString &filePath );
 
     /**
      * Insures that a given image's width and height are restricted to a maximum size.