Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable20] Fix total upload size overwritten by next upload #24854

Merged
merged 1 commit into from
Dec 28, 2020
Merged

[stable20] Fix total upload size overwritten by next upload #24854

merged 1 commit into from
Dec 28, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #24833

@danxuliu @backportbot
Fix total upload size overwritten by next upload
d4b1ba7 
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.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 20.0.5 milestone Dec 28, 2020
@faily-bot
Copy link

faily-bot bot commented Dec 28, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 735: failure

mysql8.0-php7.2

Show full log 
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\SystemTag\SystemTagManagerTest::testGetAllTags with data set #1 (array(array('one', false, false), array('two', false, false)))
Failed asserting that false is true.

/drone/src/tests/lib/SystemTag/SystemTagManagerTest.php:122

db-codecov

Show full log 
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There were 4 failures:

1) Test\Preview\BitmapTest::testGetThumbnail with data set #0 (-19, -64)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

2) Test\Preview\BitmapTest::testGetThumbnail with data set #1 (86, 95)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

3) Test\Preview\BitmapTest::testGetThumbnail with data set #2 (-8, 42)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

4) Test\Preview\BitmapTest::testGetThumbnail with data set #3 (56, -26)
Failed asserting that null is not equal to false.

/drone/src/tests/lib/Preview/Provider.php:144
/drone/src/tests/lib/Preview/Provider.php:105

danxuliu
danxuliu approved these changes Dec 28, 2020
View reviewed changes
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

CI failures are unrelated.

@rullzer rullzer merged commit d96555c into stable20 Dec 28, 2020
@rullzer rullzer deleted the backport/24833/stable20 branch December 28, 2020 13:19
@rullzer rullzer mentioned this pull request Jan 5, 2021
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danxuliu danxuliu danxuliu approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@rullzer rullzer Awaiting requested review from rullzer

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
bug feature: files regression
Projects
None yet
Milestone
Nextcloud 20.0.5
Development

Successfully merging this pull request may close these issues.
3 participants
@juliusknorr @danxuliu @rullzer