From b8a1176c265266299ec8a286ad5d2bfe4b743329 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 26 Aug 2014 10:41:49 -0400 Subject: [PATCH] feature(cloudcmd) rm appCache --- HELP.md | 1 - cloudcmd.js | 27 ------- html/config.html | 1 - html/fs/index.html | 2 +- json/config.json | 1 - lib/server.js | 21 +----- lib/server/appcache.js | 159 ----------------------------------------- 7 files changed, 2 insertions(+), 210 deletions(-) delete mode 100644 lib/server/appcache.js diff --git a/HELP.md b/HELP.md index 405fa719..7d73f296 100644 --- a/HELP.md +++ b/HELP.md @@ -216,7 +216,6 @@ All main configuration could be done via `json/config.json`. "auth" : false, /* enable http authentication */ "username" : "root", /* username for authentication */ "password" : "toor", /* password hash in sha-1 for authentication*/ - "appCache" : false, /* cache files for offline use */ "analytics" : true, /* google analytics support */ "diff" : true, /* when save - send patch, not whole file */ "zip" : true, /* zip text before send / unzip before save */ diff --git a/cloudcmd.js b/cloudcmd.js index 7331b18f..69617060 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -15,7 +15,6 @@ mellow = require(DIR_SERVER + 'mellow'), ponse = require(DIR_SERVER + 'ponse'), files = require(DIR_SERVER + 'files'), - AppCache = require(DIR_SERVER + 'appcache'), update = require(DIR_SERVER + 'update'), minify = require(DIR_SERVER + 'minify'), @@ -76,14 +75,6 @@ data = options.data, panel = options.panel; - if (!Config.appCache) - data = Util.rmStr(data, [ - /* min */ - ' manifest=/cloudcmd.appcache', - /* normal */ - ' manifest="/cloudcmd.appcache"' - ]); - if (!Config.showKeysPanel) { keysPanel = '
    • -
    • diff --git a/html/fs/index.html b/html/fs/index.html index e9393bed..08b7fc62 100644 --- a/html/fs/index.html +++ b/html/fs/index.html @@ -1,5 +1,5 @@ - + diff --git a/json/config.json b/json/config.json index 58c3fdf2..5b91f209 100644 --- a/json/config.json +++ b/json/config.json @@ -2,7 +2,6 @@ "auth": false, "username": "root", "password": "435b41068e8665513a20070c033b08b9c66e4332", - "appСache": false, "analytics": true, "diff": true, "zip" : true, diff --git a/lib/server.js b/lib/server.js index f9793639..93d2085e 100644 --- a/lib/server.js +++ b/lib/server.js @@ -26,12 +26,9 @@ CloudFunc = require(DIR_LIB + 'cloudfunc'), minify = require(DIR_SERVER + 'minify'), - AppCache = require(DIR_SERVER + 'appcache'), Socket = require(DIR_SERVER + 'socket'), Console = require(DIR_SERVER + 'console'), - Terminal = !WIN ? require(DIR_SERVER + 'terminal') : { - init: function() {} - }, + Terminal = !WIN ? require(DIR_SERVER + 'terminal') : function() {}, join = require(DIR_SERVER + 'join'), ponse = require(DIR_SERVER + 'ponse'), express = require(DIR_SERVER + 'express'), @@ -40,16 +37,6 @@ Rest, Route; - /* базовая инициализация */ - function init(appCacheCallback) { - var config = main.config; - - /* создаём файл app cache */ - if (config.appcache && AppCache && config.server) - Util.exec(appCacheCallback); - } - - /** * start server function * @@ -67,8 +54,6 @@ Rest = options.rest; Route = options.route; - init(options.appcache); - port = process.env.PORT || /* c9 */ process.env.app_port || /* nodester */ process.env.VCAP_APP_PORT || /* cloudfoundry */ @@ -220,10 +205,6 @@ name = path.join(dir, name); - /* watching is file changed */ - if (config.appcache) - AppCache.watch(name); - ponse.sendFile({ name : name, cache : config.cache, diff --git a/lib/server/appcache.js b/lib/server/appcache.js deleted file mode 100644 index a6e82532..00000000 --- a/lib/server/appcache.js +++ /dev/null @@ -1,159 +0,0 @@ -(function() { - 'use strict'; - - if (!global.cloudcmd) - return console.log( - '# appcache.js' + '\n' + - '# -----------' + '\n' + - '# Module is part of Cloud Commander,' + '\n' + - '# used for work with Aplication Cache.' + '\n' + - '# If you wont to see at work set appcache: true' + '\n' + - '# in config.json and start cloudcmd.js' + '\n' + - '# http://cloudcmd.io' + '\n'); - - var main = global.cloudcmd.main, - - DIR = '../', - WIN = process.platform === 'win32', - - fs = require('fs'), - Util = require(DIR + 'util'), - - /* varible contain all watched file names - * {name: true} - */ - FileNames = {}, - NamesList_s = '', - FallBack_s = '', - - /* function thet use for crossplatform - * access to fs.watch or fs.watchFile function - */ - fs_watch = null, - on_fs_watch = null, - firstFileRead_b = true, - Manifest = ''; - - setWatachFunctions(); - - /* function add file or files to manifest - * Examples: - * exports.addFiles('jquery.js'), - * exports.addFiles(['jquery.js', 'client.js']); - * exports.addFiles([{'http://cdn.jquery/jq.js':'jquery.js'}, 'client.js']); - */ - exports.addFiles = function(pFileNames) { - var i, n, lName, lCurrentName, - watch = exports.watch; - - /* if a couple files */ - if (Util.isArray(pFileNames)) { - n = pFileNames.length; - - for (i = 0; i < n; i++) { - /* if fallback setted up */ - lCurrentName = pFileNames[i]; - - if (Util.isObject(lCurrentName)) - for (lName in lCurrentName) { - FallBack_s += lName + ' ' + lCurrentName[lName] + '\n'; - watch(lCurrentName[lName]); - } - else - watch(pFileNames[i]); - } - } else - watch(pFileNames); - - }; - - - exports.createManifest = function(){ - var lAllNames = main.require('node_modules/minify/hashes'); - - if (lAllNames) - for (var lName in lAllNames){ - if (lName.indexOf('min') > 0) - lName = 'node_modules/minify/min/' + lName; - exports.watch(lName); - } - processManifest(); - }; - - exports.watch = function(pFileName) { - if (!FileNames[pFileName] && - pFileName !== './cloudcmd.appcache') { - - Util.log(pFileName + ' is watched'); - - /* adding try...catch - * if watched files would be more then system limit - */ - var lWatch_f = function() { - Util.exec.try(function() { - fs_watch(pFileName, on_fs_watch(pFileName)); - }); - }; - - /* if file.exists function exist and - * file actually exists - */ - if (fs.exists) - fs.exists(pFileName, lWatch_f); - else - lWatch_f(); - - NamesList_s += pFileName + '\n'; - FileNames[pFileName] = true; - } else if (firstFileRead_b) { - processManifest(); - firstFileRead_b = false; - } - }; - - function setWatachFunctions() { - if (WIN) { - /* good on windows */ - fs_watch = fs.watch; - on_fs_watch = onWatch; - } - else { - /* good on linux */ - fs_watch = fs.watchFile; - on_fs_watch = onWatchFile; - } - - } - - function onWatch () { - return function(pEvent, pFileName) { - Util.log(pEvent); - Util.log('file ' + pFileName + ' is changed'); - processManifest(); - }; - } - - function onWatchFile(pFileName) { - return function(pCurr, pPrev) { - if (pCurr.mtime !== pPrev.mtime) { - Util.log('file ' + pFileName + ' is changed'); - processManifest(); - } - }; - } - - function processManifest() { - Manifest = 'CACHE MANIFEST\n' + - '#' + Date() + '\n' + - 'CACHE:\n' + - NamesList_s + - 'NETWORK:\n' + - '*\n' + - 'FALLBACK:\n' + - FallBack_s; - - fs.writeFile('cloudcmd.appcache', Manifest, function() { - Util.log('cloudcmd.appcache refreshed'); - }); - } -})();