From a006695f142bc3a01964f6beb0ebe4f2adb96c46 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 29 Dec 2017 14:30:28 +0800
Subject: [PATCH] feat(config): set config default value on render index

---
 config/env/torrents.js                        |  2 +-
 .../controllers/core.server.controller.js     | 22 ++++++++++++-------
 .../admin/announce-edit.client.controller.js  |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 29450bf9..a261ebc6 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -16,7 +16,7 @@ module.exports = {
      */
     app: {
       name: 'CHD.im',
-      domain: 'http://chd:3000',
+      domain: 'http://chd.im:3000',
       showDemoWarningPopup: true,
       cronTimeZone: 'Asia/Shanghai',
       showDebugLog: true
diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index 3380fb68..13cda8bd 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -13,12 +13,13 @@ exports.renderIndex = function (req, res) {
     req.user.addSignedIp(ip);
   }
 
-  setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  var cfg = setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  cfg = getSafeMeanTorrentConfig(cfg);
 
   res.render('modules/core/server/views/index', {
     user: JSON.stringify(safeUserObject),
     sharedConfig: JSON.stringify(config.shared),
-    meanTorrentConfig: JSON.stringify(getSafeMeanTorrentConfig(config.meanTorrentConfig))
+    meanTorrentConfig: JSON.stringify(cfg)
   });
 };
 
@@ -28,12 +29,13 @@ exports.renderIndex = function (req, res) {
 exports.renderServerError = function (req, res) {
   var safeUserObject = req.user || null;
 
-  setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  var cfg = setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  cfg = getSafeMeanTorrentConfig(cfg);
 
   res.status(500).render('modules/core/server/views/500', {
     user: JSON.stringify(safeUserObject),
     sharedConfig: JSON.stringify(config.shared),
-    meanTorrentConfig: JSON.stringify(getSafeMeanTorrentConfig(config.meanTorrentConfig)),
+    meanTorrentConfig: JSON.stringify(cfg),
     error: 'Oops! Something went wrong...'
   });
 };
@@ -45,14 +47,15 @@ exports.renderServerError = function (req, res) {
 exports.renderNotFound = function (req, res) {
   var safeUserObject = req.user || null;
 
-  setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  var cfg = setMeanTorrentConfigDefaultValue(req, res, config.meanTorrentConfig);
+  cfg = getSafeMeanTorrentConfig(cfg);
 
   res.status(404).format({
     'text/html': function () {
       res.render('modules/core/server/views/404', {
         user: JSON.stringify(safeUserObject),
         sharedConfig: JSON.stringify(config.shared),
-        meanTorrentConfig: JSON.stringify(getSafeMeanTorrentConfig(config.meanTorrentConfig)),
+        meanTorrentConfig: JSON.stringify(cfg),
         url: req.originalUrl
       });
     },
@@ -109,7 +112,10 @@ function setMeanTorrentConfigDefaultValue(req, res, cfg) {
   var baseUrl = req.app.get('domain') || httpTransport + req.headers.host;
 
   cfg.app.domain = baseUrl;
-  if (!cfg.announce.url.startsWith('http')) {
-    cfg.announce.url = baseUrl + cfg.announce.url;
+  if (!cfg.announce.abs) {
+    cfg.announce.abs = cfg.announce.url;
   }
+  cfg.announce.url = baseUrl + cfg.announce.abs;
+
+  return cfg;
 }
diff --git a/modules/torrents/client/controllers/admin/announce-edit.client.controller.js b/modules/torrents/client/controllers/admin/announce-edit.client.controller.js
index 691059bd..f606eeff 100644
--- a/modules/torrents/client/controllers/admin/announce-edit.client.controller.js
+++ b/modules/torrents/client/controllers/admin/announce-edit.client.controller.js
@@ -57,7 +57,7 @@
       vm.tFile = undefined;
 
       var contentDisposition = res.headers('Content-Disposition');
-      var fileName = decodeURI(contentDisposition.substr(contentDisposition.indexOf('filename=') + 9));
+      var fileName = decodeURI(contentDisposition.substr(contentDisposition.indexOf('filename*=UTF-8\'\'') + 17));
       FileSaver.saveAs(res.data, fileName);
     }