[refactor] extract into file utils

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/cache.js

@@ -2,41 +2,41 @@
 var fs = require('fs');
 var path = require('path');
 
-var h = require('./helper');
+var file = require('./file');
 
 const cache = {};
 
 cache.init = function() {
-  h.mkdir(h.getCacheDir());
+  file.mkdir(file.cacheDir());
 };
 
 cache.get = function(k) {
-  const fullpath = h.getCacheFile(k);
+  const fullpath = file.cacheFile(k);
   if (!fs.existsSync(fullpath)) return null;
 
   return JSON.parse(fs.readFileSync(fullpath));
 };
 
 cache.set = function(k, v) {
-  const fullpath = h.getCacheFile(k);
+  const fullpath = file.cacheFile(k);
   fs.writeFileSync(fullpath, JSON.stringify(v));
   return true;
 };
 
 cache.del = function(k) {
-  const fullpath = h.getCacheFile(k);
+  const fullpath = file.cacheFile(k);
   if (!fs.existsSync(fullpath)) return false;
 
   fs.unlinkSync(fullpath);
   return true;
 };
 
 cache.list = function() {
-  return fs.readdirSync(h.getCacheDir())
+  return file.list(file.cacheDir())
     .filter(x => path.extname(x) === '.json')
     .map(function(filename) {
       const k = path.basename(filename, '.json');
-      const stat = fs.statSync(h.getCacheFile(k));
+      const stat = fs.statSync(file.cacheFile(k));
       return {
         name:  k,
         size:  stat.size,

lib/chalk.js

@@ -3,6 +3,8 @@ var _ = require('underscore');
 var style = require('ansi-styles');
 var supportsColor = require('supports-color');
 
+var file = require('./file');
+
 const chalk = {
   enabled: supportsColor.stdout,
   use256:  supportsColor.stdout && supportsColor.stdout.has256,
@@ -54,8 +56,7 @@ chalk.wrap = function(pre, post) {
 const bgName = x => 'bg' + x[0].toUpperCase() + x.substr(1);
 
 chalk.init = function() {
-  const h = require('./helper');
-  for (let f of h.getCodeDirData('colors')) {
+  for (let f of file.listCodeDir('colors')) {
     const theme = {};
     const data = _.extendOwn({}, DEFAULT, f.data);
     for (let x of _.pairs(data)) {

lib/cli.js

@@ -5,6 +5,7 @@ var chalk = require('./chalk');
 var cache = require('./cache');
 var config = require('./config');
 var h = require('./helper');
+var file = require('./file');
 var icon = require('./icon');
 var log = require('./log');
 var Plugin = require('./plugin');
@@ -53,7 +54,7 @@ function initLogLevel() {
 }
 
 function initDir() {
-  h.mkdir(h.getHomeDir())
+  file.mkdir(file.homeDir())
 }
 
 function initPlugins(cb) {

lib/commands/config.js

@@ -2,7 +2,7 @@
 var _ = require('underscore');
 var nconf = require('nconf');
 
-var h = require('../helper');
+var file = require('../file');
 var chalk = require('../chalk');
 var config = require('../config');
 var log = require('../log');
@@ -55,12 +55,12 @@ function loadConfig(showall) {
 }
 
 function saveConfig() {
-  require('fs').writeFileSync(h.getConfigFile(), prettyConfig(loadConfig(false)));
+  require('fs').writeFileSync(file.configFile(), prettyConfig(loadConfig(false)));
 }
 
 cmd.handler = function(argv) {
   session.argv = argv;
-  nconf.file('local', h.getConfigFile());
+  nconf.file('local', file.configFile());
 
   // show all
   if (argv.key.length === 0)

lib/commands/show.js

@@ -6,6 +6,7 @@ var _ = require('underscore');
 var childProcess = require('child_process');
 
 var h = require('../helper');
+var file = require('../file');
 var chalk = require('../chalk');
 var icon = require('../icon');
 var log = require('../log');
@@ -123,7 +124,7 @@ function showProblem(problem, argv) {
   let filename;
   if (argv.gen) {
     filename = genFileName(problem, argv);
-    h.mkdir(argv.outdir);
+    file.mkdir(argv.outdir);
     fs.writeFileSync(filename, code);
 
     if (argv.editor !== undefined) {

lib/commands/submission.js

@@ -4,6 +4,7 @@ var fs = require('fs');
 var sprintf = require('sprintf-js').sprintf;
 
 var h = require('../helper');
+var file = require('../file');
 var chalk = require('../chalk');
 var log = require('../log');
 var Queue = require('../queue');
@@ -99,7 +100,7 @@ function exportSubmission(problem, argv, cb) {
         submission.ac ? 'ac' : 'notac',
         h.langToExt(submission.lang));
 
-    h.mkdir(argv.outdir);
+    file.mkdir(argv.outdir);
     // skip the existing cached submissions
     if (fs.existsSync(f))
       return cb(null, chalk.underline(f));

lib/commands/submit.js

@@ -3,6 +3,7 @@ var fs = require('fs');
 var util = require('util');
 
 var h = require('../helper');
+var file = require('../file');
 var chalk = require('../chalk');
 var log = require('../log');
 var core = require('../core');
@@ -48,7 +49,7 @@ cmd.handler = function(argv) {
 
   // use the 1st section in filename as keyword
   // e.g. two-sum.cpp, or two-sum.78502271.ac.cpp
-  const keyword = h.getFilename(argv.filename).split('.')[0];
+  const keyword = file.name(argv.filename).split('.')[0];
 
   core.getProblem(keyword, function(e, problem) {
     if (e) return log.fail(e);

lib/commands/test.js

@@ -3,6 +3,7 @@ var fs = require('fs');
 var _ = require('underscore');
 
 var h = require('../helper');
+var file = require('../file');
 var chalk = require('../chalk');
 var log = require('../log');
 var core = require('../core');
@@ -58,7 +59,7 @@ function runTest(argv) {
 
   // use the 1st section in filename as keyword
   // e.g. two-sum.cpp, or two-sum.78502271.ac.cpp
-  const keyword = h.getFilename(argv.filename).split('.')[0];
+  const keyword = file.name(argv.filename).split('.')[0];
 
   core.getProblem(keyword, function(e, problem) {
     if (e) return log.fail(e);

lib/commands/version.js

@@ -1,6 +1,7 @@
 'use strict';
 var _ = require('underscore');
 
+var file = require('../file');
 var chalk = require('../chalk');
 var icon = require('../icon');
 var log = require('../log');
@@ -50,15 +51,14 @@ cmd.handler = function(argv) {
   ].join('\n');
   log.info(logo);
 
-  const h = require('../helper');
   const os = require('os');
   const config = require('../config');
 
   log.info('\n[Environment]');
   printLine('Node', process.version);
   printLine('OS', os.platform() + ' ' + os.release());
-  printLine('Cache', h.getCacheDir());
-  printLine('Config', h.getConfigFile());
+  printLine('Cache', file.cacheDir());
+  printLine('Config', file.configFile());
 
   log.info('\n[Configuration]');
   _.each(config.getAll(true), function(v, k) {

lib/config.js

@@ -2,7 +2,7 @@
 var _ = require('underscore');
 var nconf = require('nconf');
 
-var h = require('./helper');
+var file = require('./file');
 
 const DEFAULT_CONFIG = {
   // usually you don't wanna change those
@@ -71,7 +71,7 @@ const DEFAULT_CONFIG = {
 function Config() {}
 
 Config.prototype.init = function() {
-  nconf.file('local', h.getConfigFile())
+  nconf.file('local', file.configFile())
     .add('global', {type: 'literal', store: DEFAULT_CONFIG})
     .defaults({});