Skip to content

File-upload: smooth time remaining, bitrate and stabilize user information #30147

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

Merged
susnux merged 7 commits into from
Aug 16, 2023
Merged

File-upload: smooth time remaining, bitrate and stabilize user information #30147

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
188d414
Smooth time remaining, bitrate and stabilize user information
Phlogi Dec 7, 2021
59d54df
Update file-upload.js
Phlogi Dec 7, 2021
a9ad800
Update apps/files/js/file-upload.js
Phlogi Dec 8, 2021
b0a57cc
Update apps/files/js/file-upload.js
Phlogi Dec 8, 2021
a561a14
Update apps/files/js/file-upload.js
Phlogi Dec 8, 2021
615d1cb
Update apps/files/js/file-upload.js
Phlogi Dec 8, 2021
c70eeea
Update apps/files/js/file-upload.js
Phlogi Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update apps/files/js/file-upload.js 
Code Style

Co-authored-by: Carl Schwan <[email protected]>
  • Loading branch information
@Phlogi @CarlSchwan
Phlogi and CarlSchwan authored Dec 8, 2021
commit b0a57ccfb8bff2dc46d4d52ae3d0e772d0648284
2 changes: 1 addition & 1 deletion apps/files/js/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ OC.Uploader.prototype = _.extend({
smoothRemainingSeconds = smoothing * (bufferTotal / bufferSize) + ((1-smoothing) * smoothRemainingSeconds);
Copy link
Contributor

@artonge artonge Apr 12, 2022

Choose a reason for hiding this comment

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

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

Copy link
Contributor

@artonge artonge Apr 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe update the above condition to smoothRemainingSeconds === undefined

Copy link
Contributor Author

@Phlogi Phlogi Apr 18, 2022

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

@artonge artonge Apr 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Can you push the change?

}

if (bufferIndex % 4 == 0){
if (bufferIndex % 4 === 0) {
h = moment.duration(smoothRemainingSeconds, "seconds").humanize({m: 50, h: 50});
}

Expand Down