ee-core 1.2.9-bate.2 → 1.2.9

package/config/config.default.js

@@ -246,6 +246,13 @@ module.exports = appInfo => {
     enable: false
   }; 
 
+  /**
+   * TODO storage
+   */
+  config.storage = {
+    dir: path.join(appInfo.root, 'data'),
+  };
+
   /**
    * loading页（废弃）
    */

package/core/lib/loader/ee_loader.js

@@ -196,11 +196,7 @@ class EeLoader {
       home: this.getHomedir(),
 
       /**
-       * The directory whether is baseDir or HOME depend on env.
-       * it's good for test when you want to write some file to HOME,
-       * but don't want to write to the real directory,
-       * so use root to write file to baseDir instead of HOME when unittest.
-       * keep root directory in baseDir when local and unittest
+       * The directory whether is homeDir or appUserData depend on env.
        * @member {String} AppInfo#root
        */
       root: env === 'local' || env === 'unittest' ? this.getHomedir() : this.options.appUserData,

package/lib/application.js

@@ -57,6 +57,8 @@ class Appliaction extends EeApp {
     env.EE_SOCKET_PORT = null;
     env.EE_HTTP_PORT = null;
     env.HOT_RELOAD = hotReload;
+    env.EE_EXEC_DIR = options.execDir;
+    env.EE_DATABASE_DIR = null;
     debug('options:%j', options)
 
     super(options);

package/lib/baseApp.js

@@ -19,6 +19,9 @@ class BaseApp extends EeAppCore {
 
     this.loader.loadConfig();
     
+    // todo
+    //this.setDatabaseDir();
+
     // 缓存配置
     this.getCoreDB().setItem('config', this.config);
 
@@ -108,6 +111,18 @@ class BaseApp extends EeAppCore {
     return this[HTTPCLIENT];
   }
 
+  /**
+   * todo 设置db存储目录
+   */
+  setDatabaseDir (dirPath) {
+    if (dirPath) {
+      assert(typeof dirPath === 'string', ` ${dirPath} dirPath required, and must be a string`);
+      process.env.EE_DATABASE_DIR = dirPath;
+    } else {
+      process.env.EE_DATABASE_DIR = this.config.database.dir;
+    }
+  }
+
   /**
    * core app have been loaded
    */

package/lib/eeApp.js

@@ -100,11 +100,6 @@ class EeApp extends BaseApp {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
     let win = this.electron.mainWindow;
-    if (winOptions.show === false) {
-      win.once('ready-to-show', () => {
-        win.show();
-      })
-    }
 
     // 菜单显示/隐藏
     if (this.config.openAppMenu === 'dev-show'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.9-bate.2",
+  "version": "1.2.9",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/utils/index.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const fs = require('fs');
 const path = require('path');
 const constant = require('../lib/constant');
 const convert = require('koa-convert');
@@ -8,51 +7,21 @@ const is = require('is-type-of');
 const co = require('co');
 const utility = require('utility');
 const eis = require('electron-is');
+const utilsCommon = require('./common');
 
 /**
  * 创建文件夹
  */
-exports.mkdir = function(dirpath, dirname) {
-  // 判断是否是第一次调用
-  if (typeof dirname === 'undefined') {
-    if (fs.existsSync(dirpath)) {
-      return;
-    }
-    this.mkdir(dirpath, path.dirname(dirpath));
-  } else {
-    // 判断第二个参数是否正常，避免调用时传入错误参数
-    if (dirname !== path.dirname(dirpath)) {
-      this.mkdir(dirpath);
-      return;
-    }
-    if (fs.existsSync(dirname)) {
-      fs.mkdirSync(dirpath);
-    } else {
-      this.mkdir(dirname, path.dirname(dirname));
-      fs.mkdirSync(dirpath);
-    }
-  }
-};
+exports.mkdir = function (dirpath, dirname) {
+  return utilsCommon.mkdir(dirpath, dirname);
+}
 
 /**
  * 修改文件权限
  */
-exports.chmodPath = function(path, mode) {
-  let files = [];
-  if (fs.existsSync(path)) {
-    files = fs.readdirSync(path);
-    files.forEach((file, index) => {
-      const curPath = path + '/' + file;
-      if (fs.statSync(curPath).isDirectory()) {
-        this.chmodPath(curPath, mode); // 递归删除文件夹
-      } else {
-        fs.chmodSync(curPath, mode);
-      }
-    });
-    fs.chmodSync(path, mode);
-  }
-};
-
+exports.chmodPath = function (path, mode) {
+  return utilsCommon.chmodPath(path, mode);
+}
 
 /**
  * 获取项目根目录package.json
@@ -97,10 +66,7 @@ exports.getEggConfig = function() {
  * 获取 数据库存储路径
  */
 exports.getStorageDir = function() {
-  const cdb = this.getCoreDB();
-  const dirPath = cdb.getStorageDir();
-
-  return dirPath;
+  return utilsCommon.getStorageDir();
 }
 
 /**
@@ -118,7 +84,8 @@ exports.getAppUserDataDir = function() {
  * 获取 日志目录
  */
 exports.getLogDir = function() {
-  const logPath = path.join(this.getAppUserDataDir(), 'logs');
+  const cdb = this.getCoreDB();
+  const logPath = cdb.getItem('config').logger.dir;
   return logPath;
 }
 
@@ -180,28 +147,5 @@ exports.middleware = function (fn) {
  * 版本号比较
  */
 exports.compareVersion = function (v1, v2) {
-  v1 = v1.split('.')
-  v2 = v2.split('.')
-  const len = Math.max(v1.length, v2.length)
-
-  while (v1.length < len) {
-    v1.push('0')
-  }
-  while (v2.length < len) {
-    v2.push('0')
-  }
-  
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i])
-    const num2 = parseInt(v2[i])
-
-    if (num1 > num2) {
-      return 1
-    } else if (num1 < num2) {
-      return -1
-    }
-  }
-
-  return 0
-}
-
+  return utilsCommon.compareVersion(v1, v2);
+}