Skip to content

fix computerFileSize to parse correctly, prerapation to fix #25358 #27257

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
PVince81 merged 7 commits into from
Feb 27, 2017
Merged

fix computerFileSize to parse correctly, prerapation to fix #25358 #27257

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
087487a
fix computerFileSize to be mory picky
individual-it Feb 27, 2017
ea19cb7
more tests for computerFileSize
individual-it Feb 27, 2017
a94cded
codestyle fix
individual-it Feb 27, 2017
5b51cb0
fix double initialization
individual-it Feb 27, 2017
d6dd36b
pre-compile and store regexp in a hidden variable
individual-it Feb 27, 2017
a0a4997
test strings with whitespaces
individual-it Feb 27, 2017
2d402ff
trim string before parsing
individual-it Feb 27, 2017
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
codestyle fix
  • Loading branch information
@individual-it
individual-it authored Feb 27, 2017
commit a94cded2249f79f8654e95612564d4f33e56d5a7
9 changes: 5 additions & 4 deletions core/js/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,12 +1745,13 @@ OC.Util = {
*
*/
computerFileSize: function (string) {
if (typeof string != 'string') {
if (typeof string !== 'string') {
return null;
}

var s = string.toLowerCase();

var bytes = null;

var bytesArray = {
'b': 1,
'k': 1024,
Expand All @@ -1766,8 +1767,8 @@ OC.Util = {
};

var matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i);
Copy link
Contributor

@PVince81 PVince81 Feb 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I suggest to pre-compile the regexp and store it in a hidden variable this._computerFileSizeRegexp or so.
I'm not sure if modern Javascript engines recompile the Regexp every time or whether it already caches it somewhere.

To be safe, store it somewhere so if this function is called in a loop it will run a bit faster.

Copy link
Member Author

@individual-it individual-it Feb 27, 2017

Choose a reason for hiding this comment

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

changed it. please check it

if (matches != null) {
var bytes = parseFloat(s)
if (matches !== null) {
var bytes = parseFloat(s);
if (!isFinite(bytes)) {
return null;
}
Expand Down