fixed filesize

fixed typo
jupyter · Apr 18, 2018 · 2ef8962 · 2ef8962
1 parent 42c3c02
commit 2ef8962
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/notebook/services/api/api.yaml b/notebook/services/api/api.yaml
@@ -817,7 +817,7 @@ definitions:
       size:
         type: integer
         description: "The size of the file or directory."
-        formate: bytes
+        format: bytes
       mimetype:
         type: string
         description: "The mimetype of a file.  If content is not null, and type is 'file', this will contain the mimetype of the file, otherwise this will be null."

diff --git a/notebook/services/contents/filemanager.py b/notebook/services/contents/filemanager.py
@@ -185,15 +185,12 @@ def is_hidden(self, path):
 
     def _get_file_size(self, path):
         try:
-            # size of file
             size = os.path.getsize(path)
         except (ValueError, OSError):
             self.log.warning('Unable to get size.')
             size = None
-
         return size
 
-
     def file_exists(self, path):
         """Returns True if the file exists, else returns False.
 
@@ -272,7 +269,6 @@ def _base_model(self, path):
             self.log.warning('Invalid ctime %s for %s', info.st_ctime, os_path)
             created = datetime(1970, 1, 1, 0, 0, tzinfo=tz.UTC)
 
-
         # Create the base model.
         model = {}
         model['name'] = path.rsplit('/', 1)[-1]
@@ -346,7 +342,6 @@ def _dir_model(self, path, content=True):
 
         return model
 
-
     def _file_model(self, path, content=True, format=None):
         """Build a model for a file
 
@@ -362,7 +357,6 @@ def _file_model(self, path, content=True, format=None):
 
         os_path = self._get_os_path(path)
         model['mimetype'] = mimetypes.guess_type(os_path)[0]
-
         model['size'] = self._get_file_size(os_path)
 
         if content:
@@ -389,18 +383,16 @@ def _notebook_model(self, path, content=True):
         """
         model = self._base_model(path)
         model['type'] = 'notebook'
-
+        os_path = self._get_os_path(path)
+        model['size'] = self._get_file_size(os_path)
 
         if content:
-            os_path = self._get_os_path(path)
             nb = self._read_notebook(os_path, as_version=4)
             self.mark_trusted_cells(nb, path)
             model['content'] = nb
             model['format'] = 'json'
-            model['size'] = self._get_file_size(os_path)
             self.validate_notebook_model(model)
 
-
         return model
 
     def get(self, path, content=True, type=None, format=None):

diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js
@@ -1041,26 +1041,20 @@ define([
 
     var format_filesize = function(filesize) {
       if (filesize) {
-        return (convertFileSize(filesize));
-      }
-    }
-
-    var convertFileSize = function(filesize){
-      var units = ['B', 'kB', 'MB', 'GB', 'TB'];
-      var base = 1000;
-      if (Math.abs(filesize) < base){
-        return filesize + " B";
+        var units = ['B', 'kB', 'MB', 'GB', 'TB'];
+        var base = 1000;
+        if (Math.abs(filesize) < base){
+          return filesize + " B";
+        }
+        var u = -1;
+        do {
+          filesize /= base;
+          u++;
+        } while(Math.abs(filesize) >= base && u < units.length - 1);
+        return filesize.toFixed(1) + " " + units[u];
       }
-      var u = -1;
-      do{
-        filesize /= base;
-        u++;
-      } while(Math.abs(filesize) >= base && u < units.length - 1);
-      return filesize.toFixed(1) + " " + units[u];
-
     }
 
-
     // javascript stores text as utf16 and string indices use "code units",
     // which stores high-codepoint characters as "surrogate pairs",
     // which occupy two indices in the javascript string.