Fix total upload size overwritten by next upload

[danxuliu]

This fixes a regression introduced in 7c4c5fe

The upload progress is based on the totalToUpload variable. However, as the variable is set when an upload is submitted, if another upload is submitted before the previous one finished the upload progress only took into account the size of the new upload (although the upload itself worked fine; the files of the new submitted upload are added to the active one). Now totalToUpload is either increased or set depending on whether an upload is active or not.

Note that although data.total holds the total size of the files being uploaded totalToUpload needs to be used in fileuploadprogressall instead; totalToUpload is calculated when the upload is submitted, but since 7c4c5fe the actual upload of the files, and thus updating the value of data.total, may be deferred until the parent folders were created.

How to test

• Open the Files app
• Open the network tab in the developer console of the browser and throttle the connection to 3G or something similar (so you have time to do the checks)
• Upload a 5 MiB file (you can generate it with dd if=/dev/urandom of=test-file-5mib bs=1K count=5K)
• Before the upload finishes, upload a 100 KiB file (you can generate it with dd if=/dev/urandom of=test-file-100kib bs=1K count=100)
• Hover on the upload progress

Result with this pull request

The upload progress is based on the size of both files

Result without this pull request

The upload progress is based only on the size of the last file

[danxuliu]

/backport to stable20

[danxuliu]

/backport to stable19

[danxuliu]

/backport to stable18

[faily-bot]

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 693: failure

acceptance-users

• tests/acceptance/features/users.feature:47

Show full log

  Scenario: users navigation without disabled users                                   # /drone/src/tests/acceptance/features/users.feature:47
    Given I act as Jane                                                               # ActorContext::iActAs()
    And I am logged in as the admin                                                   # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                                      # SettingsMenuContext::iOpenTheUserSettings()
    And I open the "Disabled users" section                                           # AppNavigationContext::iOpenTheSection()
    And I see that the list of users contains the user disabledUser                   # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I open the actions menu for the user disabledUser                             # UsersSettingsContext::iOpenTheActionsMenuOf()
      Row for user disabledUser in Users Settings could not be found
      Actions menu for user disabledUser in Users Settings could not be found (NoSuchElementException)
    And I see that the "Enable user" action in the disabledUser actions menu is shown # UsersSettingsContext::iSeeTheAction()
    When I click the "Enable user" action in the disabledUser actions menu            # UsersSettingsContext::iClickTheAction()
    Then I see that the section "Disabled users" is not shown                         # AppNavigationContext::iSeeThatTheSectionIsNotShown()
    When I open the User settings                                                     # SettingsMenuContext::iOpenTheUserSettings()
    Then I see that the section "Disabled users" is not shown                         # AppNavigationContext::iSeeThatTheSectionIsNotShown()

[backportbot-nextcloud]

The backport to stable18 failed. Please do this backport manually.