From a5243ff58c1453e956476bbb994f2bd021381477 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 3 Jul 2020 09:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81flac=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/defaultSetting.js              | 2 +-
 src/main/utils/flacMeta.js                | 1 -
 src/main/utils/mp3Meta.js                 | 6 +++---
 src/renderer/lang/en-us/view/setting.json | 2 +-
 src/renderer/lang/zh-cn/view/setting.json | 2 +-
 src/renderer/lang/zh-tw/view/setting.json | 2 +-
 src/renderer/store/modules/download.js    | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js
index 7cebd120..2203e8ba 100644
--- a/src/common/defaultSetting.js
+++ b/src/common/defaultSetting.js
@@ -41,7 +41,7 @@ const defaultSetting = {
     maxDownloadNum: 3,
     isDownloadLrc: false,
     isEmbedPic: true,
-    isEmbedLyric: true,
+    isEmbedLyric: false,
   },
   leaderboard: {
     source: 'kw',
diff --git a/src/main/utils/flacMeta.js b/src/main/utils/flacMeta.js
index c82e5360..ab9a18ba 100644
--- a/src/main/utils/flacMeta.js
+++ b/src/main/utils/flacMeta.js
@@ -10,7 +10,6 @@ const extReg = /^(\.(?:jpe?g|png)).*$/
 const vendor = 'reference libFLAC 1.2.1 20070917'
 
 const writeMeta = async(filePath, meta, picPath) => {
-  if (meta.lyric) delete meta.lyric
   const comments = Object.keys(meta).map(key => `${key.toUpperCase()}=${meta[key] || ''}`)
   const data = {
     vorbis: {
diff --git a/src/main/utils/mp3Meta.js b/src/main/utils/mp3Meta.js
index 20824110..71f98579 100644
--- a/src/main/utils/mp3Meta.js
+++ b/src/main/utils/mp3Meta.js
@@ -5,12 +5,12 @@ const request = require('request')
 const extReg = /^(\.(?:jpe?g|png)).*$/
 
 const handleWriteMeta = (meta, filePath) => {
-  if (meta.lyric) {
+  if (meta.lyrics) {
     meta.unsynchronisedLyrics = {
       language: 'zho',
-      text: meta.lyric,
+      text: meta.lyrics,
     }
-    delete meta.lyric
+    delete meta.lyrics
   }
   NodeID3.write(meta, filePath)
 }
diff --git a/src/renderer/lang/en-us/view/setting.json b/src/renderer/lang/en-us/view/setting.json
index b1472bd8..116b46c4 100644
--- a/src/renderer/lang/en-us/view/setting.json
+++ b/src/renderer/lang/en-us/view/setting.json
@@ -74,7 +74,7 @@
   "download_name": "Music file naming",
   "download_data_embed": "Whether to embed the following content in the audio file",
   "download_embed_pic": "Embedding cover",
-  "download_embed_lyric": "Embedding lyric (supports MP3 format only)",
+  "download_embed_lyric": "Embedding lyric",
   "download_lyric_title": "Select whether to download the lyrics file",
   "download_lyric": "Lyrics download",
   "download_name1": "Title - Artist",
diff --git a/src/renderer/lang/zh-cn/view/setting.json b/src/renderer/lang/zh-cn/view/setting.json
index a45cba65..3983fcb3 100644
--- a/src/renderer/lang/zh-cn/view/setting.json
+++ b/src/renderer/lang/zh-cn/view/setting.json
@@ -74,7 +74,7 @@
   "download_name": "文件命名方式",
   "download_data_embed": "是否将以下内容嵌入到音频文件中",
   "download_embed_pic": "封面嵌入",
-  "download_embed_lyric": "歌词嵌入（只支持 mp3 格式）",
+  "download_embed_lyric": "歌词嵌入",
   "download_lyric_title": "是否同时下载歌词文件",
   "download_lyric": "歌词下载",
   "download_name1": "歌名 - 歌手",
diff --git a/src/renderer/lang/zh-tw/view/setting.json b/src/renderer/lang/zh-tw/view/setting.json
index 79e3cb28..0f7ff439 100644
--- a/src/renderer/lang/zh-tw/view/setting.json
+++ b/src/renderer/lang/zh-tw/view/setting.json
@@ -69,7 +69,7 @@
   "download_name": "文件命名方式",
   "download_data_embed": "是否將以下內容嵌入到音頻文件中",
   "download_embed_pic": "封面嵌入",
-  "download_embed_lyric": "歌詞嵌入（只支持 mp3 格式）",
+  "download_embed_lyric": "歌詞嵌入",
   "download_lyric_title": "是否同時下載歌詞文件",
   "download_lyric": "歌詞下載",
   "download_name1": "歌名 - 歌手",
diff --git a/src/renderer/store/modules/download.js b/src/renderer/store/modules/download.js
index b555e65b..8166686d 100644
--- a/src/renderer/store/modules/download.js
+++ b/src/renderer/store/modules/download.js
@@ -184,13 +184,13 @@ const saveMeta = (downloadInfo, filePath, isEmbedPic, isEmbedLyric) => {
         })
       : Promise.resolve(),
   ]
-  Promise.all(tasks).then(([imgUrl, lyric]) => {
+  Promise.all(tasks).then(([imgUrl, lyrics]) => {
     setMeta(filePath, {
       title: downloadInfo.musicInfo.name,
       artist: downloadInfo.musicInfo.singer,
       album: downloadInfo.musicInfo.albumName,
       APIC: imgUrl,
-      lyric,
+      lyrics,
     })
   })
 }