update config path

.gitattributes

-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain

.gitignore

@@ -4,8 +4,9 @@ coffeelint.json
 .vscode/
 
 password.json
-config.*.json
 
+/bak
+/config
 /ygopro
 /windbot
 /decks/

mycard.config.json

-{
-  "port": 7911,
-  "modules": {
-    "welcome": "MyCard YGOPro Server",
-    "update": "请更新游戏版本，可在社区(https://ygobbs.com)手动下载更新包",
-    "tips": {
-      "enabled": true,
-      "get": "http://mycard.moe/tips.json"
-    },
-    "dialogues": {
-      "enabled": true,
-      "get": "http://mercury233.me/ygosrv233/dialogues.json"
-    },
-    "mycard": {
-      "enabled": true,
-      "auth_base_url": "https://ygobbs.com",
-      "auth_database": "postgres://233@233.mycard.moe/233",
-      "auth_key": "233333"
-    },
-    "deck_log": {
-      "enabled": true,
-      "accesskey": "233",
-      "local": false,
-      "post": "https://api.mycard.moe/ygopro/analytics/deck/text",
-      "arena": "mycard"
-    },
-    "arena_mode": {
-      "enabled": true,
-      "mode": "entertain",
-      "comment": "mode: athletic / entertain",
-      "accesskey": "233",
-      "post_score": "https://mycard.moe/ygopro/api/score",
-      "get_score": "https://mycard.moe/ygopro/api/user?username="
-    },
-    "windbot": {
-      "enabled": true,
-      "botlist": "./windbot/bots.json",
-      "spawn": false,
-      "port": 2399
-    },
-    "http": {
-      "port": 7922,
-      "password": "123456",
-      "websocket_roomlist": true,
-      "ssl": {
-        "enabled": true,
-        "port": 7923,
-        "cert": "ssl/fullchain.pem",
-        "key": "ssl/privkey.pem"
-      }
-    }
-  }
-}

ygopro-deck-stats.js

@@ -8,7 +8,7 @@
 */
 var sqlite3 = require('sqlite3').verbose();
 var fs = require('fs');
-var config = require('./config.deckstats.json'); //{ "deckpath": "../decks", "dbfile": "cards.cdb" }
+var config = require('./config/deckstats.json'); //{ "deckpath": "../decks", "dbfile": "cards.cdb" }
 var constants = require('./data/constants.json');
 
 var ALL_MAIN_CARDS={};

ygopro-server.coffee

@@ -42,11 +42,13 @@ moment.locale('zh-cn', {
 #heapdump = require 'heapdump'
 
 # 配置
-# use nconf to save user config.user.json .
-# config.json shouldn't be changed
+# use nconf to save user config.json .
+# default_config.json shouldn't be changed
+if not fs.existsSync('./config')
+  fs.mkdirSync('./config')
 nconf = require 'nconf'
-nconf.file('./config.user.json')
-defaultconfig = require('./config.json')
+nconf.file('./config/config.json')
+defaultconfig = require('./data/default_config.json')
 nconf.defaults(defaultconfig)
 settings = global.settings = nconf.get()
 nconf.myset = (settings, path, val) ->

ygopro-server.js

@@ -56,11 +56,15 @@
     }
   });
 
+  if (!fs.existsSync('./config')) {
+    fs.mkdirSync('./config');
+  }
+
   nconf = require('nconf');
 
-  nconf.file('./config.user.json');
+  nconf.file('./config/config.json');
 
-  defaultconfig = require('./config.json');
+  defaultconfig = require('./data/default_config.json');
 
   nconf.defaults(defaultconfig);
 

ygopro-tournament.js

@@ -16,8 +16,8 @@ _.str = require('underscore.string');
 _.mixin(_.str.exports());
 
 var nconf = require('nconf');
-nconf.file('./config.user.json');
-var defaultconfig = require('./config.json');
+nconf.file('./config/config.json');
+var defaultconfig = require('./data/default_config.json');
 nconf.defaults(defaultconfig);
 var settings = nconf.get();
 config=settings.modules.tournament_mode;

ygopro-update.js

@@ -20,8 +20,8 @@ moment.locale('zh-cn');
 var constants = require('./data/constants.json');
 
 var nconf = require('nconf');
-nconf.file('./config.user.json');
-var defaultconfig = require('./config.json');
+nconf.file('./config/config.json');
+var defaultconfig = require('./data/default_config.json');
 nconf.defaults(defaultconfig);
 var settings = nconf.get();
 config=settings.modules.update_util;