Merge branch 'mc'

data/default_config.json

@@ -65,8 +65,12 @@
       "get_zh": false
     },
     "dialogues": {
+<<<<<<< HEAD
       "enabled": false,
       "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
+=======
+      "enabled": true,
+>>>>>>> mc
       "get": "http://mercury233.me/ygosrv233/dialogues.json"
     },
     "words": {

ygopro-server.coffee

@@ -248,10 +248,15 @@ concat_name = global.concat_name = (name, num) ->
 
 # 读取配置
 default_config = loadJSON('./data/default_config.json')
-try
-  config = loadJSON('./config/config.json')
-catch
+if fs.existsSync('./config/config.json')
+  try
+    config = loadJSON('./config/config.json')
+  catch e
+    console.error("Failed reading config: ", e.toString())
+    process.exit(1)
+else
   config = {}
+
 settings = global.settings = merge(default_config, config, { arrayMerge: (destination, source) -> source })
 
 auth = global.auth = require './ygopro-auth.js'

ygopro-server.js

@@ -301,9 +301,15 @@
   // 读取配置
   default_config = loadJSON('./data/default_config.json');
 
-  try {
-    config = loadJSON('./config/config.json');
-  } catch (error1) {
+  if (fs.existsSync('./config/config.json')) {
+    try {
+      config = loadJSON('./config/config.json');
+    } catch (error1) {
+      e = error1;
+      console.error("Failed reading config: ", e.toString());
+      process.exit(1);
+    }
+  } else {
     config = {};
   }
 
@@ -3541,6 +3547,7 @@
     });
   };
 
+<<<<<<< HEAD
   load_dialogues_custom = global.load_dialogues_custom = function(callback) {
     request({
       url: settings.modules.dialogues.get_custom,
@@ -3561,6 +3568,9 @@
   };
 
   if (settings.modules.dialogues.enabled && settings.modules.dialogues.get) {
+=======
+  if (settings.modules.dialogues.get) {
+>>>>>>> mc
     load_dialogues();
   }
 
@@ -4293,6 +4303,7 @@
     });
   };
 
+<<<<<<< HEAD
   load_tips_zh = global.load_tips_zh = function(callback) {
     request({
       url: settings.modules.tips.get_zh,
@@ -4313,6 +4324,9 @@
   };
 
   if (settings.modules.tips.enabled && settings.modules.tips.get) {
+=======
+  if (settings.modules.tips.get) {
+>>>>>>> mc
     load_tips();
   }