From 06c39ecd5deda99f8ffe25ab3d30cce17287e8c9 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:14:19 -0500 Subject: [PATCH 1/8] feature(ischanged) rm --- lib/server/ischanged.js | 99 ----------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 lib/server/ischanged.js diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js deleted file mode 100644 index 40c2cac5..00000000 --- a/lib/server/ischanged.js +++ /dev/null @@ -1,99 +0,0 @@ -(function() { - 'use strict'; - - var fs = require('fs'), - os = require('os'), - - Util = require('../util'), - time = require('./timem'), - - mkdir = fs.mkdir, - - WIN = process.platform === 'win32', - - Times = {}, - - TimesReaded, - - DIR = getDir() || __dirname + '/../../json/', - NAME_SHORT = DIR + 'changes', - NAME = NAME_SHORT + '.json'; - - function getTimes(callback) { - if (TimesReaded) - callback(Times); - else - makeDir(DIR, function(error) { - if (!error) - Util.exec.try(function() { - Times = require(NAME_SHORT); - }); - - TimesReaded = true; - - callback(Times); - }); - } - - function getDir() { - var dir, - sign = '-'; - - Util.exec.try(function() { - mkdir = require('mkdirp'); - sign = '/'; - }); - - if (os.tmpdir) { - dir = os.tmpdir(); - dir += '/ischanged'; - - if (!WIN) - dir += sign + process.getuid(); - - dir += '/'; - } - - return dir; - } - - function makeDir(dir, callback) { - var ANY_MASK = 0, - umask = process.umask(ANY_MASK); - - mkdir(dir, function(error) { - process.umask(umask); - - if (error && error.code === 'EEXIST') - callback(); - else - callback(error); - }); - } - - - module.exports = function(name, callback) { - Util.check(arguments, ['name', 'callback']); - - getTimes(function(times) { - var readTime = times[name]; - - time.get(name, 'raw', function(error, fileTime) { - var json, timeChanged; - - if (!error && readTime !== fileTime) { - timeChanged = true; - Times[name] = fileTime; - json = Util.json.stringify(Times); - - fs.writeFile(NAME, json, function(error) { - if (error) - Util.log(error); - }); - } - - callback(error, timeChanged); - }); - }); - }; -})(); From b9d1249ec81d5847b0a791c97525e944ee6661d7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:15:42 -0500 Subject: [PATCH 2/8] fix(edit) wrong file name on win --- lib/server/edit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/server/edit.js b/lib/server/edit.js index 75aceee9..261e0825 100644 --- a/lib/server/edit.js +++ b/lib/server/edit.js @@ -9,7 +9,8 @@ CloudFunc = require(DIR_LIB + 'cloudfunc'), patch = require(DIR_SERVER + 'patch'), files = require(DIR_SERVER + 'files'), - hash = require(DIR_SERVER + 'hash'); + hash = require(DIR_SERVER + 'hash'), + mellow = require(DIR_SERVER + 'mellow'); module.exports = function(sock) { Util.check(arguments, ['socket']); @@ -21,6 +22,8 @@ size: CloudFunc.MAX_FILE_SIZE }; + name = mellow.convertPath(name); + getHash(name, function(error, hash) { if (error) socket.emit('err', error); From 5f4b0d9e64389a4359d9d4e6604db106ee05a7f0 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:17:04 -0500 Subject: [PATCH 3/8] fix(edit) could not save when diff disabled in options --- lib/client/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/client/edit.js b/lib/client/edit.js index a2a00954..c624ea60 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -354,7 +354,7 @@ var CloudCmd, Util, DOM, CloudFunc, io, ace, DiffProto, diff_match_patch, Zip, M exec.if(!isDiff, function(patch) { var query = '', MAX_SIZE = CloudFunc.MAX_FILE_SIZE, - patchLength = patch.length, + patchLength = patch && patch.length || 0, length = Value.length, isLessMaxLength = length < MAX_SIZE, isLessLength = isLessMaxLength && patchLength < length, From 828311a18db61d906f94c176ef72b0d29505aafa Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:18:14 -0500 Subject: [PATCH 4/8] fix(storage) if to much data -> exeption --- lib/client/storage.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/client/storage.js b/lib/client/storage.js index b3ca9a17..f65f6e12 100644 --- a/lib/client/storage.js +++ b/lib/client/storage.js @@ -61,15 +61,17 @@ var Util, DOM; * записываем данные в него */ this.set = function(name, data, callback) { - var str, ret = Allowed && name; + var str, error; if (Util.type.object(data)) str = Util.json.stringify(data); if (Allowed && name) - localStorage.setItem(name, str || data); + error = Util.exec.try(function() { + localStorage.setItem(name, str || data); + }); - Util.exec(callback, null, ret); + Util.exec(callback, error); return this; }, From 0e2ed81a31246687aa7ff1c64232d5866b184050 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:18:54 -0500 Subject: [PATCH 5/8] feature(edit) socket err: log -> alert --- lib/client/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/client/edit.js b/lib/client/edit.js index c624ea60..053db25d 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -114,7 +114,7 @@ var CloudCmd, Util, DOM, CloudFunc, io, ace, DiffProto, diff_match_patch, Zip, M }); socket.on('err', function(error) { - Util.log(error); + Dialog.alert(error); }); } } From db5c4cef06967d7af45b926e1a2b74754966377d Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:30:06 -0500 Subject: [PATCH 6/8] fix(pipe) if error when write to file -> exeption --- lib/server/pipe.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/server/pipe.js b/lib/server/pipe.js index c5098574..3954c11b 100644 --- a/lib/server/pipe.js +++ b/lib/server/pipe.js @@ -31,8 +31,9 @@ Util.exec.if(!isFSWrite, function() { pipe(streams, options, callback); - }, function(callback) { - write.on('open', callback); + }, function(fn) { + write.on('open', fn) + .on('error', callback); }); } From f8dc9614c57f134f2a9e7b3cb7a04dce5895a6d1 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:34:02 -0500 Subject: [PATCH 7/8] feature(edit) when error: emmit error.message --- lib/server/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/server/edit.js b/lib/server/edit.js index 261e0825..7217cd04 100644 --- a/lib/server/edit.js +++ b/lib/server/edit.js @@ -32,7 +32,7 @@ var msg, baseName; if (error) { - socket.emit('err', error); + socket.emit('err', error.message); } else { baseName = path.basename(name), msg = CloudFunc.formatMsg('patch', baseName); From ecda4cd323893c264486969c5882afb51f1bfb85 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 21 Nov 2014 04:45:06 -0500 Subject: [PATCH 8/8] feature(package) v1.5.1 --- ChangeLog | 14 ++++++++++++++ HELP.md | 3 ++- README.md | 2 +- package.json | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c59b60d6..850ee643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2014.11.21, v1.5.1 + +fix: +- (pipe) if error when write to file -> exeption +- (storage) if to much data -> exeption +- (edit) could not save when diff disabled in options +- (edit) wrong file name on win + +feature: +- (edit) when error: emmit error.message +- (edit) socket err: log -> alert +- (ischanged) rm + + 2014.11.19, v1.5.0 fix: diff --git a/HELP.md b/HELP.md index 80825d64..f207d98d 100644 --- a/HELP.md +++ b/HELP.md @@ -1,4 +1,4 @@ -Cloud Commander v1.5.0 +Cloud Commander v1.5.1 =============== ###[Main][MainURL] [Blog][BlogURL] Live(![JitSu][JitSu_LIVE_IMG] [JitSu][JitSuURL], ![Heroku][Heroku_LIVE_IMG] [Heroku][HerokuURL]) [NPM_INFO_IMG]: https://nodei.co/npm/cloudcmd.png?downloads=true&&stars "npm install cloudcmd" @@ -388,6 +388,7 @@ Getting dev version of **Cloud Commander**: Version history --------------- +- *2014.11.21*, **[v1.5.1](//github.com/cloudcmd/archive/raw/master/cloudcmd-v1.5.1.zip)** - *2014.11.19*, **[v1.5.0](//github.com/cloudcmd/archive/raw/master/cloudcmd-v1.5.0.zip)** - *2014.11.05*, **[v1.4.1](//github.com/cloudcmd/archive/raw/master/cloudcmd-v1.4.1.zip)** - *2014.10.28*, **[v1.4.0](//github.com/cloudcmd/archive/raw/master/cloudcmd-v1.4.0.zip)** diff --git a/README.md b/README.md index 30936902..ec27bd10 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Cloud Commander v1.5.0 [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] +Cloud Commander v1.5.1 [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] =============== ###[Main][MainURL] [Blog][BlogURL] Live(![JitSu][JitSu_LIVE_IMG] [JitSu][JitSuURL], ![Heroku][Heroku_LIVE_IMG] [Heroku][HerokuURL]) [NPMIMGURL]: https://img.shields.io/npm/v/cloudcmd.svg?style=flat diff --git a/package.json b/package.json index 88d3e4e2..e50236e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cloudcmd", - "version": "1.5.0", + "version": "1.5.1", "author": "coderaiser (https://github.com/coderaiser)", "description": "Cloud Commander orthodox web file manager with console and editor", "homepage": "http://cloudcmd.io",