From 41d3d0f5cd46119ae151e11f9749f234f3a2b119 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 20 Jun 2014 09:22:46 -0400 Subject: [PATCH] feature(size) dir -> size --- lib/server/flop.js | 6 ++--- lib/server/{dir.js => size.js} | 44 +++------------------------------- 2 files changed, 6 insertions(+), 44 deletions(-) rename lib/server/{dir.js => size.js} (69%) diff --git a/lib/server/flop.js b/lib/server/flop.js index ba13e4fc..bde76979 100644 --- a/lib/server/flop.js +++ b/lib/server/flop.js @@ -10,7 +10,7 @@ Util = require(DIR + '../util'), - dir = require(DIR + 'dir'), + size = require(DIR + 'size'), commander = require(DIR + 'commander'), time = require(DIR + 'time'), pipe = require(DIR + 'pipe'), @@ -33,11 +33,11 @@ switch (type) { case 'size': - dir.getSize(path, callback); + size.get(path, callback); break; case 'size raw': - dir.getSize(path, 'raw', callback); + size.get(path, 'raw', callback); break; case 'time': diff --git a/lib/server/dir.js b/lib/server/size.js similarity index 69% rename from lib/server/dir.js rename to lib/server/size.js index 48662faa..2052d4e0 100644 --- a/lib/server/dir.js +++ b/lib/server/size.js @@ -25,20 +25,7 @@ */ stat = fs.lstat; - exports.isDir = function(name, callback) { - name += ''; - - stat(name, function(error, stat) { - var isDir; - - if (!error) - isDir = stat.isDirectory(); - - Util.exec(callback, error, isDir); - }); - }; - - exports.getSize = function(dir, type, callback) { + exports.get = function(dir, type, callback) { var total = 0; Util.checkArgs(arguments, ['dir', 'callback']); @@ -114,31 +101,6 @@ } getDirInfo(dir); - } - - /** Функция получает короткие размеры - * конвертируя байт в килобайты, мегабойты, - * гигайбайты и терабайты - * @pSize - размер в байтах - */ - exports.getShortSize = function(size) { - var isNumber = Util.isNumber(size), - l1KB = 1024, - l1MB = l1KB * l1KB, - l1GB = l1MB * l1KB, - l1TB = l1GB * l1KB, - l1PB = l1TB * l1KB; - - if (isNumber) { - if (size < l1KB) size = size + 'b'; - else if (size < l1MB) size = (size/l1KB).toFixed(2) + 'kb'; - else if (size < l1GB) size = (size/l1MB).toFixed(2) + 'mb'; - else if (size < l1TB) size = (size/l1GB).toFixed(2) + 'gb'; - else if (size < l1PB) size = (size/l1TB).toFixed(2) + 'tb'; - else size = (size/l1PB).toFixed(2) + 'pb'; - } - - return size; - }; - + } + })();