File-upload: smooth time remaining, bitrate and stabilize user information by Phlogi · Pull Request #30147 · nextcloud/server

Phlogi · 2021-12-07T21:07:45Z

Improving the upload progress bar's "Time remaining".
Tested with a single large file and multiple smaller files.

Besides the existing moving average, a smoothing factor is introduced for the time remaining display as well as the bitrate.
Furthermore, half of the buffer needs to be filled before the first prediction is displayed to the user. This reduces volatile and jumping durations towards the user and improves usability.

Besides the existing moving average, a smoothing factor is introduced for the time remaining display as well as the bitrate. Furthermore, half of the buffer needs to be filled before the first prediction is displayed to the user. This reduces volatile and jumping durations towards the user and improves usability.

Signed-off-by: Cyrill H. <[email protected]>

CarlSchwan

Very cool feature, I left some code style but I didn't test it yet locally. I will give it a try tomorrow :)

apps/files/js/file-upload.js

Code Style Co-authored-by: Carl Schwan <[email protected]>

szaimen

I just tested this and somehow the speed does not seem to work correctly:

artonge

Also, canceling an upload seems to fail now

artonge · 2022-04-12T09:16:40Z

apps/files/js/file-upload.js

-					} else {
-						smoothRemainingSeconds = 1;
+					} else{
+						smoothRemainingSeconds = smoothing * (bufferTotal / bufferSize) + ((1-smoothing) * smoothRemainingSeconds);


smoothRemainingSeconds value depends on itself, this leads to NaN when I test it.

Maybe update the above condition to smoothRemainingSeconds === undefined

It should check for undefined.
if (smoothRemainingSeconds === undefined){

Same for the bitrate:

if (smoothBitrate === undefined){

I just tested this and the NaN problem is fixed.

Can you push the change?

Phlogi · 2022-04-18T19:41:39Z

Also, canceling an upload seems to fail now

I can reproduce this, however I don't think it's related to the change here. I see a 404 in the frontend:

Here is the message I see in the debug log on the server side:

{
  "reqId": "QCf3mPDlqWTxKByNmFtN",
  "level": 3,
  "time": "2022-04-18T19:24:22+00:00",
  "remoteAddr": "192.168.1.244",
  "user": "webadmin",
  "app": "core",
  "method": "PUT",
  "url": "/remote.php/dav/uploads/webadmin/web-file-upload-5368d4c4d0bf8c192c21c77fb3e39e95-1650309856915/0",
  "message": "unable to rename, source directory is not writable : uploads/web-file-upload-5368d4c4d0bf8c192c21c77fb3e39e95-1650309856915",
  "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:99.0) Gecko/20100101 Firefox/99.0",
  "version": "22.2.3.0"
}
{
  "reqId": "QCf3mPDlqWTxKByNmFtN",
  "level": 3,
  "time": "2022-04-18T19:24:22+00:00",
  "remoteAddr": "192.168.1.244",
  "user": "webadmin",
  "app": "webdav",
  "method": "PUT",
  "url": "/remote.php/dav/uploads/webadmin/web-file-upload-5368d4c4d0bf8c192c21c77fb3e39e95-1650309856915/0",
  "message": "renaming part file to final file failed $renameOkay: false, $fileExists: false)",
  "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:99.0) Gecko/20100101 Firefox/99.0",
  "version": "22.2.3.0"
}
{
  "reqId": "QCf3mPDlqWTxKByNmFtN",
  "level": 4,
  "time": "2022-04-18T19:24:22+00:00",
  "remoteAddr": "192.168.1.244",
  "user": "webadmin",
  "app": "webdav",
  "method": "PUT",
  "url": "/remote.php/dav/uploads/webadmin/web-file-upload-5368d4c4d0bf8c192c21c77fb3e39e95-1650309856915/0",
  "message": "Could not rename part file to final file",
  "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:99.0) Gecko/20100101 Firefox/99.0",
  "version": "22.2.3.0",
  "exception": {
    "Exception": "Sabre\\DAV\\Exception",
    "Message": "Could not rename part file to final file",
    "Code": 0,
    "Trace": [
      {
        "file": "/var/www/nextcloud/apps/dav/lib/Connector/Sabre/Directory.php",
        "line": 155,
        "function": "put",
        "class": "OCA\\DAV\\Connector\\Sabre\\File",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/apps/dav/lib/Upload/UploadFolder.php",
        "line": 45,
        "function": "createFile",
        "class": "OCA\\DAV\\Connector\\Sabre\\Directory",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 1098,
        "function": "createFile",
        "class": "OCA\\DAV\\Upload\\UploadFolder",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/dav/lib/DAV/CorePlugin.php",
        "line": 504,
        "function": "createFile",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/event/lib/WildcardEmitterTrait.php",
        "line": 89,
        "function": "httpPut",
        "class": "Sabre\\DAV\\CorePlugin",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 472,
        "function": "emit",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 253,
        "function": "invokeMethod",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 321,
        "function": "start",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/apps/dav/lib/Server.php",
        "line": 333,
        "function": "exec",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/apps/dav/appinfo/v2/remote.php",
        "line": 35,
        "function": "exec",
        "class": "OCA\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/remote.php",
        "line": 166,
        "args": [
          "/var/www/nextcloud/apps/dav/appinfo/v2/remote.php"
        ],
        "function": "require_once"
      }
    ],
    "File": "/var/www/nextcloud/apps/dav/lib/Connector/Sabre/File.php",
    "Line": 295,
    "CustomMessage": "--"
  }
}

szaimen · 2022-04-19T09:47:46Z

Also, canceling an upload seems to fail now

@artonge this is unrelated, afaik.
I think it is failing in master and stable24 too...

welcome · 2023-08-16T13:03:04Z

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

szaimen · 2023-08-16T13:07:59Z

Interesting approach to merge it into a different branch in our org :)

susnux · 2023-08-16T13:09:34Z

The bots do not work on foreign repositories, so I decided to merge this into an internal branch and resubmit the PR.

BTW: thank you @Phlogi, nice work :)

Phlogi added 2 commits December 7, 2021 22:05

Update file-upload.js

59d54df

Signed-off-by: Cyrill H. <[email protected]>

Phlogi changed the title ~~Smooth time remaining, bitrate and stabilize user information~~ File-upload: smooth time remaining, bitrate and stabilize user information Dec 7, 2021

szaimen added this to the Nextcloud 24 milestone Dec 8, 2021

szaimen added 3. to review Waiting for reviews enhancement labels Dec 8, 2021

CarlSchwan reviewed Dec 8, 2021

View reviewed changes

Phlogi and others added 5 commits December 8, 2021 18:57

Update apps/files/js/file-upload.js

a9ad800

Code Style Co-authored-by: Carl Schwan <[email protected]>

Update apps/files/js/file-upload.js

b0a57cc

Code Style Co-authored-by: Carl Schwan <[email protected]>

Update apps/files/js/file-upload.js

a561a14

Code Style Co-authored-by: Carl Schwan <[email protected]>

Update apps/files/js/file-upload.js

615d1cb

Code Style Co-authored-by: Carl Schwan <[email protected]>

Update apps/files/js/file-upload.js

c70eeea

Code Style Co-authored-by: Carl Schwan <[email protected]>

skjnldsv mentioned this pull request Mar 24, 2022

24.0.0 beta 1 #31693

Merged

blizzz mentioned this pull request Mar 31, 2022

24.0.0 beta 2 #31769

Merged

blizzz mentioned this pull request Apr 7, 2022

24.0.0 beta 3 #31871

Merged

szaimen requested review from a team, skjnldsv, szaimen and vanpertsch and removed request for a team April 7, 2022 15:04

szaimen requested changes Apr 12, 2022

View reviewed changes

artonge requested changes Apr 12, 2022

View reviewed changes

skjnldsv modified the milestones: Nextcloud 24, Nextcloud 25 Apr 12, 2022

skjnldsv removed their request for review April 26, 2022 10:36

This was referenced Aug 12, 2022

25.0.0 beta 1 #33505

Merged

25.0.0 beta 2 #33592

Merged

blizzz mentioned this pull request Aug 24, 2022

25.0.0 beta 3 #33674

Merged

This was referenced Aug 30, 2022

25.0.0 beta 4 #33762

Merged

25.0.0 beta 5 #33913

Merged

blizzz mentioned this pull request Sep 9, 2022

25.0.0 beta 6 #34002

Merged

skjnldsv mentioned this pull request Sep 15, 2022

25.0.0 beta 7 #34095

Merged

This was referenced Sep 20, 2022

25.0.0 beta 8 #34164

Closed

25.0.0 RC 1 #34185

Merged

blizzz modified the milestones: Nextcloud 25, Nextcloud 26 Sep 22, 2022

blizzz mentioned this pull request Feb 1, 2023

26.0.0 beta 2 #36484

Merged

skjnldsv mentioned this pull request Feb 23, 2023

26.0.0 beta 5 #36834

Merged

blizzz mentioned this pull request Mar 7, 2023

26.0.0 RC2 #37078

Merged

blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023

This was referenced May 3, 2023

27.0.0 beta 1 #38038

Merged

27.0.0 beta 2 #38137

Closed

27.0.0 beta 2 #38139

Merged

skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 10, 2023

skjnldsv removed this from the Nextcloud 27 milestone May 10, 2023

skjnldsv marked this pull request as draft May 10, 2023 09:52

susnux changed the base branch from master to fix/improved-upload-view August 16, 2023 13:01

susnux marked this pull request as ready for review August 16, 2023 13:02

susnux merged commit 91c873b into nextcloud:fix/improved-upload-view Aug 16, 2023

susnux mentioned this pull request Aug 16, 2023

Improve upload progress visualization #39912

Merged

4 tasks

Uh oh!

Conversation

Phlogi commented Dec 7, 2021

Uh oh!

CarlSchwan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

szaimen left a comment

Choose a reason for hiding this comment

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

artonge Apr 12, 2022

Choose a reason for hiding this comment

Uh oh!

artonge Apr 12, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Phlogi Apr 18, 2022

Choose a reason for hiding this comment

Uh oh!

artonge Apr 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Phlogi commented Apr 18, 2022

Uh oh!

szaimen commented Apr 19, 2022

Uh oh!

welcome bot commented Aug 16, 2023

Uh oh!

szaimen commented Aug 16, 2023

Uh oh!

susnux commented Aug 16, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

artonge Apr 12, 2022 •

edited

Loading

artonge Apr 19, 2022 •

edited

Loading