From 092794de34e78fce2d89e0eb28c95fc65be3bda0 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 18:51:18 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Update:=20zh=5FCH,zh=5FTW=E3=81=AE=E3=81=A8?= =?UTF-8?q?=E3=81=8Dzh.plist=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=80?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/plistList.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/plistList.coffee b/src/core/plistList.coffee index 0350799..6afd2c2 100644 --- a/src/core/plistList.coffee +++ b/src/core/plistList.coffee @@ -56,7 +56,11 @@ parse = (plistObj) -> * @return {Object} plistのオブジェクト ### getUntilDone = (repo, lang, force = false) -> - return get(repo, lang, force).catch( -> + return get(repo, lang, force).catch(-> + if lang.includes("_") + return get(repo, lang.split("_")[0], force) + return Promise.reject() + ).catch( -> return get(repo, "en", force) ).catch( -> return get(repo, "ja", force) From 6886d022d4eee08871c841ff5d31d77536f543a4 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 19:37:56 +0900 Subject: [PATCH 2/8] =?UTF-8?q?Fix:=20cache=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=80=E3=81=8Cchromium=E9=83=A8=E5=88=86=E3=81=A8?= =?UTF-8?q?=E3=81=8B=E3=81=B6=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/cache.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/cache.coffee b/src/core/cache.coffee index 8f59ac3..d47452a 100644 --- a/src/core/cache.coffee +++ b/src/core/cache.coffee @@ -11,7 +11,7 @@ Promise = require "promise" * キャッシュをおくフォルダ * @const ### -CACHE_FOLDER_PATH = path.join(app.getPath("userData"), "cache") +CACHE_FOLDER_PATH = path.join(app.getPath("userData"), "plistCache") ensureFile = Promise.denodeify(fs.ensureFile) readJson = Promise.denodeify(fs.readJson) From b50ae6c7f355c7f5f7a19f3b1bfc7ed88926f1fd Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 20:25:34 +0900 Subject: [PATCH 3/8] =?UTF-8?q?Fix:=20ready-to-show=E3=81=8C=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E3=81=AB=E5=83=8D=E3=81=84=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/core.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/core.coffee b/src/core/core.coffee index 7ed9314..6614571 100644 --- a/src/core/core.coffee +++ b/src/core/core.coffee @@ -18,10 +18,11 @@ createWindow = -> height: 600, title: "BlitzModderPC", icon: path.join(app.getAppPath(), "gui/img/image.jpg"), - autoHideMenuBar: true + autoHideMenuBar: true, + show: false ) mainWindow.once("ready-to-show", -> - win.show() + mainWindow.show() return ) mainWindow.loadURL("file://#{app.getAppPath()}/gui/index.html") From 75fbb9ce8d7fcd8c76af21674968f6828afd103b Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 20:25:48 +0900 Subject: [PATCH 4/8] =?UTF-8?q?Fix:=20=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E5=89=8D?= =?UTF-8?q?=E3=81=AB=E7=B5=82=E4=BA=86=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8?= =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/core.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/core.coffee b/src/core/core.coffee index 6614571..0848b7a 100644 --- a/src/core/core.coffee +++ b/src/core/core.coffee @@ -49,8 +49,9 @@ app.on("ready", -> app.on("window-all-closed", -> # キャッシュ削除 - session.defaultSession.clearCache(->) - # アプリ終了 - app.quit() + session.defaultSession.clearCache( -> + # アプリ終了 + app.quit() + ) return ) From fd383bd429942f6605df1544150e3ee4362b1afc Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 20:28:52 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Fix:=20=E5=88=9D=E5=9B=9E=E8=B5=B7=E5=8B=95?= =?UTF-8?q?=E6=99=82=E3=81=AE=E8=A8=80=E8=AA=9E=E5=88=A4=E5=AE=9A=E3=81=AB?= =?UTF-8?q?=E3=83=AD=E3=82=B7=E3=82=A2=E8=AA=9E,=E4=B8=AD=E5=9B=BD?= =?UTF-8?q?=E8=AA=9E=E3=82=82=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/config.coffee | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/config.coffee b/src/core/config.coffee index 31c645d..3a2e4de 100644 --- a/src/core/config.coffee +++ b/src/core/config.coffee @@ -103,12 +103,14 @@ init = -> data = Object.assign(data, content) else machineLang = app.getLocale() - if machineLang is "ja" - data.lang = "ja" - else if machineLang.includes("en") - data.lang = "en" - else - data.lang = "en" + switch true + when machineLang is "ja" then data.lang = "ja" + when machineLang is "ru" then data.lang = "ru" + when machineLang is "zh-TW" then data.lang = "zh_TW" + when machineLang is "zh-CN" then data.lang = "zh_CN" + when machineLang.includes("en") then data.lang = "en" + when machineLang.includes("zh") then data.lang = "zh_CN" + else data.lang = "en" _update() ) From 6076186ddd630e4e24e24e795c53f889ac282924 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 20:56:01 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Ref:=20=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?= =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/core/applyMod.coffee | 26 +++------------------- src/core/lang.coffee | 1 - src/core/plistInfo.coffee | 42 ++++++++++++++-------------------- src/core/plistList.coffee | 47 +++++++++++++++------------------------ src/core/util.coffee | 1 - src/package.json | 1 - 7 files changed, 38 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index f3c4fdf..1df6e4a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "bootstrap": "^4.0.0-alpha.6", "fs-extra": "^2.1.2", "fstream": "^1.0.11", - "js-yaml": "^3.8.3", "jszip": "^3.1.3", "plist": "^2.0.1", "promise": "^7.1.1", diff --git a/src/core/applyMod.coffee b/src/core/applyMod.coffee index 7c95b43..6e70891 100644 --- a/src/core/applyMod.coffee +++ b/src/core/applyMod.coffee @@ -206,29 +206,9 @@ applyMod = (type, mod, callback) -> * @return {Promise} ### applyMods = (addMods, deleteMods, callback) -> - dLen = deleteMods.length - aLen = addMods.length - - deleteDeferArray = [] - for dmod in deleteMods - deleteDeferArray.push(applyMod("delete", dmod, callback)) - if dLen > 0 - if aLen > 0 - return Promise.all(deleteDeferArray).then( -> - addDeferArray = [] - for amod in addMods - addDeferArray.push(applyMod("add", amod, callback)) - return Promise.all(addDeferArray) - ) - else - return Promise.all(deleteDeferArray) - else if aLen > 0 - addDeferArray = [] - for amod in addMods - addDeferArray.push(applyMod("add", amod, callback)) - return Promise.all(addDeferArray) - else - return Promise.resolve() + return Promise.all(applyMod("delete", dmod, callback) for dmod in deleteMods).then( -> + return Promise.all(applyMod("add", amod, callback) for amod in addMods) + ) module.exports = applyMod: applyMod diff --git a/src/core/lang.coffee b/src/core/lang.coffee index ea01ec4..c3121cc 100644 --- a/src/core/lang.coffee +++ b/src/core/lang.coffee @@ -2,7 +2,6 @@ * @fileoverview 翻訳関連 ### {app} = require "electron" -yaml = require "js-yaml" config = require "./config" _langname = "" diff --git a/src/core/plistInfo.coffee b/src/core/plistInfo.coffee index 5aa393e..9856128 100644 --- a/src/core/plistInfo.coffee +++ b/src/core/plistInfo.coffee @@ -1,3 +1,6 @@ +###* + * @fileoverview info.plistの読み込み + ### fs = require "fs-extra" path = require "path" plist = require "plist" @@ -35,34 +38,23 @@ get = ({type: repoType, name: repoName}, force = false) -> if data[repoName]? and !force resolve(data[repoName]) return - cache.getStringFile(repoName, "info.plist", force).then( (content) -> - data[repoName] = plist.parse(content) - resolve(data[repoName]) - return - , (err) -> + isCatched = false + cache.getStringFile(repoName, "info.plist", force).catch( -> + isCatched = true if repoType is "remote" - request.getFromRemote(repoName, "info.plist").then( (content) -> - string = content.toString() - cache.setStringFile(repoName, "info.plist", string) - data[repoName] = plist.parse(string) - resolve(data[repoName]) - return - , (err) -> - reject(err) - return + return request.getFromRemote(repoName, "info.plist").then( (content) -> + return content.toString() ) else if repoType is "local" - readFile(path.join(repoName, "info.plist"), "utf8").then( (res) -> - cache.setStringFile(repoName, "info.plist", res) - data[repoName] = plist.parse(res) - resolve(data[repoName]) - return - , (err) -> - reject(err) - return - ) - else - reject() + return readFile(path.join(repoName, "info.plist"), "utf8") + return Promise.reject() + ).then( (res) -> + cache.setStringFile(repoName, "info.plist", res) if isCatched + data[repoName] = plist.parse(res) + resolve(data[repoName]) + return + ).catch( (err) -> + reject(err) return ) ) diff --git a/src/core/plistList.coffee b/src/core/plistList.coffee index 6afd2c2..c967b0c 100644 --- a/src/core/plistList.coffee +++ b/src/core/plistList.coffee @@ -1,3 +1,6 @@ +###* + * @fileoverview 言語.plistの読み込み + ### fs = require "fs-extra" path = require "path" plist = require "plist" @@ -81,37 +84,24 @@ get = ({type: repoType, name: repoName}, lang, force = false) -> if data[repoName]?[lang]? and !force resolve(data[repoName][lang]) return - cache.getStringFile(repoName, "plist/#{lang}.plist", force).then( (content) -> - data[repoName] = {} if !data[repoName]? - data[repoName][lang] = parse(plist.parse(content)) - resolve(data[repoName][lang]) - return - , (err) -> + isCatched = false + cache.getStringFile(repoName, "plist/#{lang}.plist", force).catch( -> + isCatched = true if repoType is "remote" - request.getFromRemote(repoName, "plist/#{lang}.plist").then( (content) -> - string = content.toString() - cache.setStringFile(repoName, "plist/#{lang}.plist", string) - data[repoName] = {} if !data[repoName]? - data[repoName][lang] = parse(plist.parse(string)) - resolve(data[repoName][lang]) - return - , (err) -> - reject(err) - return + return request.getFromRemote(repoName, "plist/#{lang}.plist").then( (content) -> + return content.toString() ) else if repoType is "local" - readFile(path.join(repoName, "plist/#{lang}.plist"), "utf8").then( (res) -> - cache.setStringFile(repoName, "plist/#{lang}.plist", res) - data[repoName] = {} if !data[repoName]? - data[repoName][lang] = parse(plist.parse(res)) - resolve(data[repoName][lang]) - return - , (err) -> - reject(err) - return - ) - else - reject() + return readFile(path.join(repoName, "plist/#{lang}.plist"), "utf8") + return Promise.reject() + ).then( (res) -> + cache.setStringFile(repoName, "plist/#{lang}.plist", res) if isCatched + data[repoName] = {} if !data[repoName]? + data[repoName][lang] = parse(plist.parse(res)) + resolve(data[repoName][lang]) + return + ).catch( (err) -> + reject(err) return ) ) @@ -160,4 +150,3 @@ module.exports = getUntilDone: getUntilDone get: get filter: filter - diff --git a/src/core/util.coffee b/src/core/util.coffee index 8bc202c..cb6f551 100644 --- a/src/core/util.coffee +++ b/src/core/util.coffee @@ -92,7 +92,6 @@ getVersion = (useCache = false) -> resolve(ver) return ).catch( (err) -> - console.log err reject(err) return ) diff --git a/src/package.json b/src/package.json index df3a844..25ca5a5 100644 --- a/src/package.json +++ b/src/package.json @@ -14,7 +14,6 @@ "bootstrap": "^4.0.0-alpha.6", "fs-extra": "^2.1.2", "fstream": "^1.0.11", - "js-yaml": "^3.8.3", "jszip": "^3.1.3", "plist": "^2.0.1", "promise": "^7.1.1", From aff47bb889b6be3ac19d0270cfc1bd1aba733e61 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 22:42:08 +0900 Subject: [PATCH 7/8] Ref: Promise->denodeify --- package.json | 2 +- src/core/applyMod.coffee | 4 ++-- src/core/cache.coffee | 8 ++++---- src/core/config.coffee | 6 +++--- src/core/plistInfo.coffee | 4 ++-- src/core/plistList.coffee | 4 ++-- src/core/request.coffee | 1 - src/core/util.coffee | 4 ++-- src/package.json | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 1df6e4a..d923f48 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,11 @@ "license": "MIT", "dependencies": { "bootstrap": "^4.0.0-alpha.6", + "denodeify": "^1.2.1", "fs-extra": "^2.1.2", "fstream": "^1.0.11", "jszip": "^3.1.3", "plist": "^2.0.1", - "promise": "^7.1.1", "readdirp": "^2.1.0", "request": "^2.81.0", "semver": "^5.3.0", diff --git a/src/core/applyMod.coffee b/src/core/applyMod.coffee index 6e70891..b497f5f 100644 --- a/src/core/applyMod.coffee +++ b/src/core/applyMod.coffee @@ -4,7 +4,7 @@ {app} = require "electron" path = require "path" -Promise = require "promise" +denodeify = require "denodeify" fs = require "fs-extra" fstream = require "fstream" jszip = require "jszip" @@ -14,7 +14,7 @@ unzip = require "unzipper" config = require "./config" util = require "./util" -readFile = Promise.denodeify(fs.readFile) +readFile = denodeify(fs.readFile) TEMP_FOLDER = path.join(app.getPath("temp"), "BlitzModderPC") diff --git a/src/core/cache.coffee b/src/core/cache.coffee index d47452a..682fc44 100644 --- a/src/core/cache.coffee +++ b/src/core/cache.coffee @@ -5,7 +5,7 @@ fs = require "fs-extra" path = require "path" {app} = require "electron" -Promise = require "promise" +denodeify = require "denodeify" ###* * キャッシュをおくフォルダ @@ -13,9 +13,9 @@ Promise = require "promise" ### CACHE_FOLDER_PATH = path.join(app.getPath("userData"), "plistCache") -ensureFile = Promise.denodeify(fs.ensureFile) -readJson = Promise.denodeify(fs.readJson) -remove = Promise.denodeify(fs.remove) +ensureFile = denodeify(fs.ensureFile) +readJson = denodeify(fs.readJson) +remove = denodeify(fs.remove) ### * キャッシュファイルと実際のファイルのテーブル diff --git a/src/core/config.coffee b/src/core/config.coffee index 3a2e4de..1118077 100644 --- a/src/core/config.coffee +++ b/src/core/config.coffee @@ -5,7 +5,7 @@ fs = require "fs-extra" path = require "path" {app} = require "electron" -Promise = require "promise" +denodeify = require "denodeify" util = require "./util" os = require "os" @@ -34,8 +34,8 @@ BLITZ_PATH = MACSTEAM: path.join(os.homedir(), "Library/Application Support/Steam/SteamApps/common/World of Tanks Blitz/World of Tanks Blitz.app/Contents/Resources/") MACSTORE: "/Applications/World of Tanks Blitz.app/Contents/Resources/" -ensureFile = Promise.denodeify(fs.ensureFile) -readJson = Promise.denodeify(fs.readJson) +ensureFile = denodeify(fs.ensureFile) +readJson = denodeify(fs.readJson) ### * 設定のデータ diff --git a/src/core/plistInfo.coffee b/src/core/plistInfo.coffee index 9856128..09188ff 100644 --- a/src/core/plistInfo.coffee +++ b/src/core/plistInfo.coffee @@ -4,14 +4,14 @@ fs = require "fs-extra" path = require "path" plist = require "plist" -Promise = require "promise" +denodeify = require "denodeify" semver = require "semver" request = require "./request" cache = require "./cache" config = require "./config" util = require "./util" -readFile = Promise.denodeify(fs.readFile) +readFile = denodeify(fs.readFile) ###* * データ diff --git a/src/core/plistList.coffee b/src/core/plistList.coffee index c967b0c..4d6e7e3 100644 --- a/src/core/plistList.coffee +++ b/src/core/plistList.coffee @@ -4,14 +4,14 @@ fs = require "fs-extra" path = require "path" plist = require "plist" -Promise = require "promise" +denodeify = require "denodeify" semver = require "semver" request = require "./request" cache = require "./cache" config = require "./config" util = require "./util" -readFile = Promise.denodeify(fs.readFile) +readFile = denodeify(fs.readFile) ###* * データ diff --git a/src/core/request.coffee b/src/core/request.coffee index 63b15f3..bf83205 100644 --- a/src/core/request.coffee +++ b/src/core/request.coffee @@ -5,7 +5,6 @@ request = require "request" path = require "path" fs = require "fs-extra" -Promise = require "promise" ###* * リモートからファイルを取得します diff --git a/src/core/util.coffee b/src/core/util.coffee index cb6f551..24cd5a1 100644 --- a/src/core/util.coffee +++ b/src/core/util.coffee @@ -3,10 +3,10 @@ fs = require "fs-extra" jszip = require "jszip" {shell} = require("electron") os = require "os" -Promise = require "promise" +denodeify = require "denodeify" config = require "./config" -readFile = Promise.denodeify(fs.readFile) +readFile = denodeify(fs.readFile) ###* * HTMLエスケープ diff --git a/src/package.json b/src/package.json index 25ca5a5..7920402 100644 --- a/src/package.json +++ b/src/package.json @@ -12,11 +12,11 @@ "license": "MIT", "dependencies": { "bootstrap": "^4.0.0-alpha.6", + "denodeify": "^1.2.1", "fs-extra": "^2.1.2", "fstream": "^1.0.11", "jszip": "^3.1.3", "plist": "^2.0.1", - "promise": "^7.1.1", "readdirp": "^2.1.0", "request": "^2.81.0", "semver": "^5.3.0", From 0ce4e68cde1a1a10ceaf3062f0d2f186a78f44a6 Mon Sep 17 00:00:00 2001 From: S Date: Sat, 20 May 2017 22:42:54 +0900 Subject: [PATCH 8/8] Release: 1.5.0 --- package.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d923f48..90ede9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "BlitzModder", - "version": "1.4.5", + "version": "1.5.0", "description": "Mod manager for World of Tanks Blitz(PC)", "main": "bin/core/core.js", "scripts": { diff --git a/src/package.json b/src/package.json index 7920402..8b5aaa5 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "BlitzModder", - "version": "1.4.5", + "version": "1.5.0", "description": "Mod manager for World of Tanks Blitz(PC)", "main": "core/core.js", "author": "S(FV293b)",