Merge pull request #6629 from opengisch/QF-6711_Whenever-a-HTTP-416-is-received

Author: nirvn

src/core/qfieldcloud/qfieldcloudproject.cpp

@@ -1233,6 +1233,29 @@ void QFieldCloudProject::downloadFileConnections( const QString &fileKey )
 
     if ( rawReply->error() != QNetworkReply::NoError )
     {
+      const int httpStatus = rawReply->attribute( QNetworkRequest::HttpStatusCodeAttribute ).toInt();
+      if ( httpStatus == 416 && mDownloadFileTransfers[fileKey].retryCount < 3 )
+      {
+        mDownloadFileTransfers[fileKey].resumableDownload = false;
+        mDownloadFileTransfers[fileKey].retryCount++;
+
+        NetworkReply *newReply = downloadFile(
+          mDownloadFileTransfers[fileKey].projectId,
+          mDownloadFileTransfers[fileKey].fileName,
+          true,
+          true );
+
+        if ( newReply )
+        {
+          mDownloadFileTransfers[fileKey].networkReply = newReply;
+          newReply->setParent( reply );
+          downloadFileConnections( fileKey );
+        }
+
+        reply->abort();
+        return;
+      }
+
       hasError = true;
       errorMessageDetail = QFieldCloudConnection::errorString( rawReply );
       errorMessage = tr( "Network error. Failed to download file `%1`." ).arg( fileKey );
@@ -1377,7 +1400,7 @@ NetworkReply *QFieldCloudProject::downloadFile( const QString &projectId, const
   if ( partialFile.exists() )
   {
     qint64 partialSize = partialFile.size();
-    if ( partialSize < QFIELDCLOUD_MINIMUM_RANGE_HEADER_LENGTH || partialSize > fileTransfer.bytesTotal || ( partialSize == fileTransfer.bytesTotal ) && fileTransfer.etag != FileUtils::fileEtag( fileTransfer.partialFilePath ) )
+    if ( !fileTransfer.resumableDownload || partialSize < QFIELDCLOUD_MINIMUM_RANGE_HEADER_LENGTH || partialSize > fileTransfer.bytesTotal || ( partialSize == fileTransfer.bytesTotal ) && fileTransfer.etag != FileUtils::fileEtag( fileTransfer.partialFilePath ) )
     {
       // Invalid or dirty file; delete and re-download
       partialFile.remove();

src/core/qfieldcloud/qfieldcloudproject.h

@@ -454,6 +454,8 @@ class QFieldCloudProject : public QObject
         QNetworkReply::NetworkError error = QNetworkReply::NoError;
         int redirectsCount = 0;
         QUrl lastRedirectUrl;
+        bool resumableDownload = true;
+        int retryCount = 0;
     };
 
     //! Tracks the job status (status, error etc) for a particular project. For now 1 project can have only 1 job of a type.

src/qml/QFieldCloudScreen.qml

@@ -764,37 +764,27 @@ Page {
               ColumnLayout {
                 Layout.topMargin: 20
                 Layout.bottomMargin: 20
-                Layout.preferredWidth: projectDetailsCodeContainer.desiredWidth
+                Layout.preferredWidth: projectDetailsCode.desiredWidth
                 Layout.alignment: Qt.AlignHCenter
                 spacing: 5
 
-                Rectangle {
-                  id: projectDetailsCodeContainer
-
-                  property int desiredWidth: Math.min(mainWindow.width - 40, 250)
+                Image {
+                  id: projectDetailsCode
                   Layout.preferredWidth: desiredWidth
                   Layout.preferredHeight: desiredWidth
+                  fillMode: Image.PreserveAspectFit
 
-                  color: "transparent"
-                  radius: 4
-                  border.width: 1
-                  border.color: Theme.mainTextColor
-
-                  Image {
-                    anchors.fill: parent
-                    fillMode: Image.PreserveAspectFit
-
-                    sourceSize.width: projectDetailsCodeContainer.desiredWidth * Screen.devicePixelRatio
-                    sourceSize.height: projectDetailsCodeContainer.desiredWidth * Screen.devicePixelRatio
-                    source: projectDetails.cloudProject != undefined ? "image://barcode/?text=" + encodeURIComponent(UrlUtils.createActionUrl("qfield", "cloud", {
-                          "project": projectDetails.cloudProject.id
-                        })) + "&color=%2380cc28" : ""
-                  }
+                  sourceSize.width: desiredWidth * Screen.devicePixelRatio
+                  sourceSize.height: desiredWidth * Screen.devicePixelRatio
+                  source: projectDetails.cloudProject != undefined ? "image://barcode/?text=" + encodeURIComponent(UrlUtils.createActionUrl("qfield", "cloud", {
+                        "project": projectDetails.cloudProject.id
+                      })) + "&color=%2380cc28" : ""
+                  property int desiredWidth: Math.min(mainWindow.width - 40, 250)
                 }
 
                 Text {
                   id: projectDetailsCodeLabel
-                  Layout.preferredWidth: projectDetailsCodeContainer.desiredWidth - 20
+                  Layout.preferredWidth: projectDetailsCode.desiredWidth - 20
                   font: Theme.tinyFont
                   color: Theme.secondaryTextColor
                   wrapMode: Text.WordWrap
@@ -810,6 +800,7 @@ Page {
         QfButton {
           id: downloadProjectBtn
           Layout.fillWidth: true
+          progressValue: projectDetails.cloudProject ? projectDetails.cloudProject.downloadProgress : 0
           text: {
             if (projectDetails.cloudProject != undefined && projectDetails.cloudProject.status === QFieldCloudProject.ProjectStatus.Downloading) {
               if (projectDetails.cloudProject.packagingStatus === QFieldCloudProject.PackagingBusyStatus) {

src/qml/imports/Theme/QfButton.qml

@@ -13,6 +13,7 @@ Button {
   property alias radius: backgroundRectangle.radius
   property alias borderColor: backgroundRectangle.border.color
   property bool dropdown: false
+  property real progressValue: 0.0
 
   signal dropdownClicked
 
@@ -35,6 +36,7 @@ Button {
     radius: 12
     border.width: 1
     border.color: !parent.enabled ? Theme.controlBackgroundDisabledColor : button.bgcolor != "#00000000" ? button.bgcolor : button.color
+    clip: true
 
     Ripple {
       clip: true
@@ -45,6 +47,35 @@ Button {
       active: button.down
       color: Theme.darkTheme ? "#22000000" : button.bgcolor == "#ffffff" || button.bgcolor == "#00000000" ? "#10000000" : "#22ffffff"
     }
+
+    Loader {
+      active: progressValue != 0.0 && progressValue != 1.0
+      sourceComponent: progressComponent
+    }
+
+    Component {
+      id: progressComponent
+      Rectangle {
+        width: backgroundRectangle.width * progressValue
+        height: backgroundRectangle.height
+        radius: backgroundRectangle.radius
+        color: Theme.mainColor
+        clip: true
+
+        Rectangle {
+          width: Math.min(10, parent.width / 2)
+          height: parent.height
+          anchors.right: parent.right
+          color: parent.color
+        }
+
+        Behavior on width  {
+          NumberAnimation {
+            duration: 200
+          }
+        }
+      }
+    }
   }
 
   contentItem: IconLabel {