Refactor .lc folder.

* move everything to .lc
* use .json ext for all files

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

Diff for: lib/cache.js

@@ -18,7 +18,6 @@ cache.get = function(k) {
 };
 
 cache.set = function(k, v) {
-  h.mkdir(h.getCacheDir());
   var fullpath = h.getCacheFile(k);
   fs.writeFileSync(fullpath, JSON.stringify(v));
   return true;
@@ -33,10 +32,7 @@ cache.del = function(k) {
 };
 
 cache.list = function() {
-  var dir = h.getCacheDir();
-  if (!fs.existsSync(dir)) return [];
-
-  return fs.readdirSync(dir)
+  return fs.readdirSync(h.getCacheDir())
     .filter(function(filename) {
       return path.extname(filename) === '.json';
     })

Diff for: lib/cli.js

@@ -1,6 +1,7 @@
 var _ = require('underscore');
 
 var chalk = require('./chalk');
+var cache = require('./cache');
 var config = require('./config');
 var core = require('./core');
 var h = require('./helper');
@@ -57,6 +58,7 @@ var cli = {};
 
 cli.run = function() {
   config.init();
+  cache.init();
 
   initColor();
   initIcon();

Diff for: lib/commands/cache.js

@@ -38,10 +38,7 @@ cmd.handler = function(argv) {
     });
 
   if (argv.delete) {
-    caches.forEach(function(f) {
-      if (f.name === '.user') return;
-      cache.del(f.name);
-    });
+    caches.forEach(function(f) { cache.del(f.name); });
   } else {
     _.sortBy(caches, function(f) {
       var x = parseInt(f.name.split('.')[0], 10);

Diff for: lib/helper.js

@@ -50,7 +50,7 @@ var LANGS = [
 var h = {};
 
 h.KEYS = {
-  user:     '.user',
+  user:     '../user',
   problems: 'problems',
   problem:  function(p) { return p.id + '.' + p.slug + '.' + p.category; }
 };
@@ -175,12 +175,16 @@ h.getFileData = function(fullpath) {
   return fs.existsSync(fullpath) ? fs.readFileSync(fullpath).toString() : null;
 };
 
-h.getHomeDir = function() {
+h.getUserHomeDir = function() {
   return process.env.HOME || process.env.USERPROFILE;
 };
 
+h.getHomeDir = function() {
+  return path.join(this.getUserHomeDir(), '.lc');
+};
+
 h.getCacheDir = function() {
-  return path.join(this.getHomeDir(), '.lc');
+  return path.join(this.getHomeDir(), 'cache');
 };
 
 h.getCodeDir = function(dir) {
@@ -192,7 +196,7 @@ h.getCacheFile = function(k) {
 };
 
 h.getConfigFile = function() {
-  return path.join(this.getHomeDir(), '.lcconfig');
+  return path.join(this.getHomeDir(), 'config.json');
 };
 
 h.getPluginFile = function(name) {

Diff for: test/plugins/test_cache.js

@@ -29,11 +29,12 @@ describe('plugin:cache', function() {
     config.init();
     plugin.init();
 
-    h.getHomeDir = function() {
+    h.getCacheDir = function() {
       return HOME;
     };
-
     cache.__set__('h', h);
+    cache.init();
+
     session.__set__('cache', cache);
     plugin.__set__('cache', cache);
     plugin.__set__('session', session);
@@ -179,7 +180,7 @@ describe('plugin:cache', function() {
     it('should login ok', function(done) {
       config.autologin.enable = true;
       // before login
-      cache.del('.user');
+      cache.del(h.KEYS.user);
       assert.equal(session.getUser(), null);
       assert.equal(session.isLogin(), false);
 
@@ -200,7 +201,7 @@ describe('plugin:cache', function() {
 
     it('should login ok w/ auto login', function(done) {
       config.autologin.enable = false;
-      cache.del('.user');
+      cache.del(h.KEYS.user);
 
       NEXT.login = function(user, cb) {
         return cb(null, user);
@@ -228,7 +229,7 @@ describe('plugin:cache', function() {
 
     it('should logout ok', function(done) {
       // before logout
-      cache.set('.user', USER);
+      cache.set(h.KEYS.user, USER);
       assert.deepEqual(session.getUser(), USER);
       assert.equal(session.isLogin(), true);
 

Diff for: test/test_cache.js

@@ -18,6 +18,7 @@ describe('cache', function() {
       return cachedir;
     };
     cache.__set__('h', h);
+    cache.init();
   });
 
   it('should ok when not cached', function() {
@@ -48,13 +49,4 @@ describe('cache', function() {
     assert.equal(items[0].name, k);
     assert.equal(items[0].size, JSON.stringify(v).length);
   });
-
-  it('should list ok when cache dir not exist', function() {
-    h.getCacheDir = function() {
-      return '/not-exist-dir';
-    };
-
-    var items = cache.list();
-    assert.equal(items.length, 0);
-  });
 });

Diff for: test/test_helper.js

@@ -176,15 +176,16 @@ describe('helper', function() {
     it('should ok', function() {
       process.env.HOME = '/home/skygragon';
 
-      assert.equal(h.getHomeDir(), '/home/skygragon');
-      assert.equal(h.getCacheDir(), '/home/skygragon/.lc');
-      assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/xxx.json');
-      assert.equal(h.getConfigFile(), '/home/skygragon/.lcconfig');
-      assert.equal(h.getFilename('/home/skygragon/.lc/xxx.json'), 'xxx');
+      assert.equal(h.getUserHomeDir(), '/home/skygragon');
+      assert.equal(h.getHomeDir(), '/home/skygragon/.lc');
+      assert.equal(h.getCacheDir(), '/home/skygragon/.lc/cache');
+      assert.equal(h.getCacheFile('xxx'), '/home/skygragon/.lc/cache/xxx.json');
+      assert.equal(h.getConfigFile(), '/home/skygragon/.lc/config.json');
+      assert.equal(h.getFilename('/home/skygragon/.lc/cache/xxx.json'), 'xxx');
 
       process.env.HOME = '';
       process.env.USERPROFILE = 'C:\\Users\\skygragon';
-      assert.equal(h.getHomeDir(), 'C:\\Users\\skygragon');
+      assert.equal(h.getUserHomeDir(), 'C:\\Users\\skygragon');
     });
 
     it('should getCodeDir ok', function() {