Bump Version and Update Deps

Merge pull request #113 from KyleBing/master
调整暗黑模式样式，新增全局统一样式 by @KyleBing
2020-11-26 17:28:14 +08:00 · 2020-11-26 16:56:44 +08:00 · 2020-11-25 14:47:23 +08:00 · 2020-11-25 14:38:29 +08:00 · 2020-11-25 13:50:38 +08:00 · 2020-11-24 22:28:56 +08:00
21 changed files with 2318 additions and 1177 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -7,8 +7,10 @@ assignees: ''

 ---

- [ ] 我确认已经搜索过Issue不存并确认相同的Issue
- [ ] 我认为这是程序导致的问题（如不确认，请先通过Telegram或者Email进行咨询）
+- 请按照此模板填写，否则可能立即被关闭
+- [x] 我确认已经搜索过Issue不存并确认相同的Issue
+- [x] 我认为这是程序导致的问题（如不确认，请先通过Telegram或者Email进行咨询）
+

 **Bug描述**

@@ -19,13 +21,18 @@ assignees: ''
 描述复现方法，必要时请提供样本文件

 **程序截图或者Console报错信息**
+
 如果可以请提供二者之一

+
 **环境信息:**

 - 操作系统和浏览器：
 - 程序版本：
 - 获取音乐文件所使用的客户端及其版本信息：

+
 **附加信息**
+
 其他能够帮助确认问题的信息
+
--- a/.github/ISSUE_TEMPLATE/new-feature.md
+++ b/.github/ISSUE_TEMPLATE/new-feature.md
@@ -7,13 +7,20 @@ assignees: ''

 ---

+- 请按照此模板填写，否则可能立即被关闭
+
 **背景和说明**
+
 简要说明产生此想法的背景和此想法的具体内容

+
 **实现途径**

 - 如果没有设计方案，请简要描述实现思路
 - 如果你没有任何的实现思路，请通过Telegram进行讨论

+
 **附加信息**
+
 更多你想要表达的内容
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,67 @@
+name: Build
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+  pull_request:
+    branches: [ master ]
+    types: [ opened, synchronize, reopened ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build: [ legacy, modern ]
+        include:
+          - build: legacy
+            BUILD_ARGS:
+          - build: modern
+            BUILD_ARGS: "-- --modern"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
+
+      - name: Build
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build ${{ matrix.BUILD_ARGS }}
+          tar -czvf dist.tar.gz -C ./dist .
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unlock-music-${{ matrix.build }}.tar.gz
+          path: ./dist.tar.gz
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,104 +3,119 @@ name: Release and GitHub Pages
 on:
  push:
    tags:
-    - "v*"
+      - "v*"

 jobs:
  build:
-
-    runs-on: ubuntu-18.04
-
+    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2

-    - name: Use Node.js 12.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x

-    - name: Install Dependencies
-      run: |
-        npm ci
-        npm run fix-compatibility
-    - name: Build Legacy
-      run: |
-        npm run build
-        tar -czf legacy.tar.gz -C ./dist .
-        zip -rJ9 legacy.zip ./dist
-    - name: Build Modern
-      run: |
-        npm run build -- --modern
-        tar -czf modern.tar.gz -C ./dist .
-        zip -rJ9 modern.zip ./dist
-    - run: sha256sum *.tar.gz *.zip > sha256sum.txt
+      - name: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-

-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./dist
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility

-    - name: Get current time
-      id: date
-      run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
+      - name: Build Legacy
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build
+          tar -czf legacy.tar.gz -C ./dist .
+          zip -rJ9 legacy.zip ./dist

-    - name: Create a Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: "Build ${{ steps.date.outputs.date }}"
-        draft: true
+      - name: Build Modern
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build -- --modern
+          tar -czf modern.tar.gz -C ./dist .
+          zip -rJ9 modern.zip ./dist

-    - name: Upload Release Assets - legacy.tar.gz
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./legacy.tar.gz
-        asset_name: legacy.tar.gz
-        asset_content_type: application/gzip
+      - name: Checksum
+        run: sha256sum *.tar.gz *.zip > sha256sum.txt

-    - name: Upload Release Assets - legacy.zip
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./legacy.zip
-        asset_name: legacy.zip
-        asset_content_type: application/zip
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist

-    - name: Upload Release Assets - modern.tar.gz
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - name: Get current time
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
+
+      - name: Create a Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./modern.tar.gz
-        asset_name: modern.tar.gz
-        asset_content_type: application/gzip
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: "Build ${{ steps.date.outputs.date }}"
+          draft: true

-    - name: Upload Release Assets - modern.zip
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - name: Upload Release Assets - legacy.tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./modern.zip
-        asset_name: modern.zip
-        asset_content_type: application/zip
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./legacy.tar.gz
+          asset_name: legacy.tar.gz
+          asset_content_type: application/gzip

-    - name: Upload Release Assets - sha256sum.txt
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - name: Upload Release Assets - legacy.zip
+        uses: actions/upload-release-asset@v1.0.2
+        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./sha256sum.txt
-        asset_name: sha256sum.txt
-        asset_content_type: text/plain
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./legacy.zip
+          asset_name: legacy.zip
+          asset_content_type: application/zip
+
+      - name: Upload Release Assets - modern.tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./modern.tar.gz
+          asset_name: modern.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload Release Assets - modern.zip
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./modern.zip
+          asset_name: modern.zip
+          asset_content_type: application/zip
+
+      - name: Upload Release Assets - sha256sum.txt
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./sha256sum.txt
+          asset_name: sha256sum.txt
+          asset_content_type: text/plain

--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 - Unlock Music的CLI版本正在开发中。
 - 我们新建了Telegram群组，欢迎加入！[https://t.me/unlock_music_chat](https://t.me/unlock_music_chat)
 - [其他测试版工具](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7)
-    
+- [相关的其他项目](https://github.com/ix64/unlock-music/wiki/%E5%92%8CUnlockMusic%E7%9B%B8%E5%85%B3%E7%9A%84%E9%A1%B9%E7%9B%AE)    
 - ![Release and GitHub Pages](https://github.com/ix64/unlock-music/workflows/Release%20and%20GitHub%20Pages/badge.svg)

 # 特性
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "unlock-music",
-  "version": "1.6.3",
-  "updateInfo": ".ncm和.kgm解锁的一些优化",
+  "version": "1.7.1",
+  "updateInfo": "适配深色模式；修复.ncm解锁的一些问题",
  "license": "MIT",
  "description": "Unlock encrypted music file in browser.",
  "repository": {
@@ -15,22 +15,24 @@
    "fix-compatibility": "node ./src/fix-compatibility.js"
  },
  "dependencies": {
-    "base64-js": "^1.3.1",
+    "base64-js": "^1.5.1",
    "browser-id3-writer": "^4.4.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.8.0",
    "crypto-js": "^4.0.0",
-    "element-ui": "^2.13.0",
+    "element-ui": "^2.14.1",
    "iconv-lite": "^0.5.1",
    "jimp": "^0.14.0",
    "metaflac-js": "^1.0.5",
-    "music-metadata-browser": "^2.1.2",
+    "music-metadata-browser": "^2.1.6",
+    "node-sass": "^4.14.1",
    "register-service-worker": "^1.7.1",
+    "sass-loader": "^10.0.2",
    "vue": "^2.6.12"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.4",
-    "@vue/cli-plugin-pwa": "^4.5.4",
-    "@vue/cli-service": "^4.5.4",
+    "@vue/cli-plugin-babel": "^4.5.9",
+    "@vue/cli-plugin-pwa": "^4.5.9",
+    "@vue/cli-service": "^4.5.9",
    "babel-plugin-component": "^1.1.1",
    "vue-cli-plugin-element": "^1.0.1",
    "vue-template-compiler": "^2.6.12",
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,7 @@
    <meta content="音乐,解锁,ncm,qmc,mgg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
    <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
    <!--@formatter:off-->
-    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #3498db;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}#loader-mask{position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,0.88)}</style>
+    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #1db1ff;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}#loader-mask{text-align:center;position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,.88)}@media (prefers-color-scheme:dark){#loader-mask{color:#fff;background-color:rgba(0,0,0,.85)}#loader-mask a{color:#ddd}#loader-mask a:hover{color:#1db1ff}}#loader-source{font-size:1.5rem}#loader-tips-timeout{font-size:1.2rem}</style>
    <!--@formatter:on-->
 </head>
 <body>
@@ -29,12 +29,12 @@
    <h3 id="loader-source"> 请勿直接运行源代码！ </h3>
    <div hidden id="loader-tips-outdated">
        <h2>您可能在使用不受支持的<span style="color:#f00;">过时</span>浏览器，这可能导致此应用无法正常工作。</h2>
-        <h3>如果您使用双核浏览器，您可以尝试切换<span style="color:#f00;">“极速模式”</span>解决此问题。</h3>
+        <h3>如果您使用双核浏览器，您可以尝试切换到 <span style="color:#f00;">“极速模式”</span> 解决此问题。</h3>
        <h3>或者，您可以尝试更换下方的几个浏览器之一。</h3>
    </div>
    <h3 hidden id="loader-tips-timeout">
        音乐解锁采用了一些新特性！建议使用
-        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Microsoft Edge Chromium</a>
+        <a href="https://www.microsoft.com/zh-cn/edge" target="_blank">Microsoft Edge Chromium</a>
        <a href="https://www.google.cn/chrome/" target="_blank">Google Chrome</a>
        <a href="https://www.firefox.com.cn/" target="_blank">Mozilla Firefox</a>
        | <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
@@ -69,4 +69,4 @@
    })();
 </script>
 </body>
-</html>
+</html>
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,8 +5,8 @@
            <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>

            <div id="app-control">
-                <el-row style="padding-bottom: 1em; font-size: 14px">
-                    歌曲命名格式：
+                <el-row class="mb-3">
+                    <span>歌曲命名格式：</span>
                    <el-radio label="1" name="format" v-model="download_format">歌手-歌曲名</el-radio>
                    <el-radio label="2" name="format" v-model="download_format">歌曲名</el-radio>
                    <el-radio label="3" name="format" v-model="download_format">歌曲名-歌手</el-radio>
@@ -16,18 +16,16 @@
                    <el-button @click="handleDownloadAll" icon="el-icon-download" plain>下载全部</el-button>
                    <el-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">清除全部</el-button>

-
                    <el-tooltip class="item" effect="dark" placement="top-start">
                        <div slot="content">
                            当您使用此工具进行大量文件解锁的时候，建议开启此选项。<br/>
                            开启后，解锁结果将不会存留于浏览器中，防止内存不足。
                        </div>
-                        <el-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
+                        <el-checkbox border class="ml-2" v-model="instant_download">立即保存</el-checkbox>
                    </el-tooltip>
-
-
                </el-row>
            </div>
+
            <audio :autoplay="playing_auto" :src="playing_url" controls/>

            <x-preview :download_format="download_format" :table-data="tableData"
@@ -100,7 +98,7 @@
                } catch (e) {
                }
                if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
-                    (!!updateInfo.Found && document.location.protocol !== "https:"))) {
+                    (!!updateInfo.Found && window.location.protocol !== "https:"))) {
                  this.$notify.warning({
                    title: '发现更新',
                    message: '发现新版本 v' + updateInfo.Version +
@@ -178,35 +176,9 @@
                }, 300);
            }
        },
-
    }
-
 </script>

-<style>
-    #app {
-        font-family: "Helvetica Neue", Helvetica, "PingFang SC",
-        "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        text-align: center;
-        color: #2c3e50;
-        padding-top: 30px;
-    }
-
-    #app-footer a {
-        padding-left: 0.2em;
-        padding-right: 0.2em;
-    }
-
-    #app-footer {
-        text-align: center;
-        font-size: small;
-    }
-
-    #app-control {
-        padding-top: 1em;
-        padding-bottom: 1em;
-    }
-
+<style lang="scss">
+   @import "scss/unlock-music";
 </style>
--- a/src/component/preview.vue
+++ b/src/component/preview.vue
@@ -12,7 +12,7 @@
        </el-table-column>
        <el-table-column label="歌曲">
            <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.title }}</span>
+                <span>{{ scope.row.title }}</span>
            </template>
        </el-table-column>
        <el-table-column label="歌手">
--- a/src/component/upload.vue
+++ b/src/component/upload.vue
@@ -47,12 +47,12 @@
                this.idle_workers.push(0);
                // delay to optimize for first loading
                setTimeout(() => {
-                    for (let i = 1; i < this.thread_num; i++) {
-                        // noinspection JSValidateTypes,JSUnresolvedVariable
-                        this.workers.push(worker().CommonDecrypt);
-                        this.idle_workers.push(i);
-                    }
-                }, 1000);
+                  for (let i = 1; i < this.thread_num; i++) {
+                    // noinspection JSValidateTypes,JSUnresolvedVariable
+                    this.workers.push(worker().CommonDecrypt);
+                    this.idle_workers.push(i);
+                  }
+                }, 5000);
            } else {
                const dec = require('../decrypt/common');
                this.workers.push(dec.CommonDecrypt);
--- a/src/decrypt/common.js
+++ b/src/decrypt/common.js
@@ -41,6 +41,11 @@ export async function CommonDecrypt(file) {
        case "bkcflac"://Moo Music Flac
        case "mflac"://QQ Music Desktop Flac
        case "mgg": //QQ Music Desktop Ogg
+        case "666c6163"://QQ Music Weiyun Flac
+        case "6d7033"://QQ Music Weiyun Mp3
+        case "6f6767"://QQ Music Weiyun Ogg
+        case "6d3461"://QQ Music Weiyun M4a
+        case "776176"://QQ Music Weiyun Wav
            rt_data = await QmcDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
        case "tm2":// QQ Music IOS M4a
--- a/src/decrypt/kgm.js
+++ b/src/decrypt/kgm.js
@@ -12,11 +12,14 @@ const VprMaskDiff = [0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
    0x00]

 export async function Decrypt(file, raw_filename, raw_ext) {
-    if (document.location.protocol === "file:") {
-        return {
-            status: false,
-            message: "请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+    try {
+        if (window.location.protocol === "file:") {
+            return {
+                status: false,
+                message: "请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+            }
        }
+    } catch {
    }
    const oriData = new Uint8Array(await GetArrayBuffer(file));
    if (raw_ext === "vpr") {
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -3,6 +3,7 @@ const MetaFlac = require('metaflac-js');
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
 const MagicHeader = [0x43, 0x54, 0x45, 0x4E, 0x46, 0x44, 0x41, 0x4D];
+const musicMetadata = require("music-metadata-browser");
 import jimp from 'jimp';

 import {
@@ -50,16 +51,23 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        imageInfo.buffer = await img.getBufferAsync("image/jpeg")
    }
    console.log(imageInfo)
+    const mime = AudioMimeType[musicMeta.format]
    try {
+        let musicBlob = new Blob([audioData], {type: mime});
+        const originalMeta = await musicMetadata.parseBlob(musicBlob);
+        console.log(originalMeta)
+        let shouldWrite = !originalMeta.common.album && !originalMeta.common.artists && !originalMeta.common.title
        if (musicMeta.format === "mp3") {
            audioData = await WriteMp3Meta(
-                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic, shouldWrite ? null : originalMeta)
        } else if (musicMeta.format === "flac") {
            const writer = new MetaFlac(Buffer.from(audioData))
-            if (writer.getTag("TITLE") === "") writer.setTag("TITLE=" + info.title)
-            if (writer.getTag("ALBUM") === "") writer.setTag("ALBUM=" + musicMeta.album)
-            writer.removeTag("ARTIST")
-            artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+            if (shouldWrite) {
+                writer.setTag("TITLE=" + info.title)
+                writer.setTag("ALBUM=" + musicMeta.album)
+                writer.removeTag("ARTIST")
+                artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+            }
            writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
            audioData = writer.save()
        }
@@ -67,8 +75,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        console.warn("Error while appending cover image to file " + e)
    }

-    const mime = AudioMimeType[musicMeta.format];
-    const musicData = new Blob([audioData], {type: mime});
+    const musicData = new Blob([audioData], {type: mime})

    return {
        status: true,
@@ -79,7 +86,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        picture: imageInfo.url,
        file: URL.createObjectURL(musicData),
        mime: mime
-    };
+    }
 }


--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -29,7 +29,12 @@ const HandlerMap = {
    "qmcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
    "bkcmp3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
    "bkcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
-    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false}
+    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "666c6163": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
+    "6d7033": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "6f6767": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
+    "6d3461": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "776176": {handler: QmcMaskGetDefault, ext: "wav", detect: false}
 };

 export async function Decrypt(file, raw_filename, raw_ext) {
--- a/src/decrypt/util.js
+++ b/src/decrypt/util.js
@@ -1,4 +1,5 @@
 const ID3Writer = require("browser-id3-writer");
+const musicMetadata = require("music-metadata-browser");
 export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43];
 export const MP3_HEADER = [0x49, 0x44, 0x33];
 export const OGG_HEADER = [0x4F, 0x67, 0x67, 0x53];
@@ -92,11 +93,25 @@ export async function GetWebImage(pic_url) {
    return {"buffer": null, "src": pic_url, "url": "", "type": ""}
 }

-export function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
+export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover", originalMeta = null) {
    const writer = new ID3Writer(audioData);
-    writer.setFrame("TPE1", artistList)
-        .setFrame("TIT2", title)
-        .setFrame("TALB", album);
+    if (originalMeta !== null) {
+        artistList = originalMeta.common.artists || artistList
+        title = originalMeta.common.title || title
+        album = originalMeta.common.album || album
+        const frames = originalMeta.native['ID3v2.4'] || originalMeta.native['ID3v2.3'] || originalMeta.native['ID3v2.2'] || []
+        frames.forEach(frame => {
+            if (frame.id !== 'TPE1' && frame.id !== 'TIT2' && frame.id !== 'TALB') {
+                try {
+                    writer.setFrame(frame.id, frame.value)
+                } catch (e) {
+                }
+            }
+        })
+    }
+    writer.setFrame('TPE1', artistList)
+        .setFrame('TIT2', title)
+        .setFrame('TALB', album);
    if (pictureData !== null) {
        writer.setFrame('APIC', {
            type: 3,
--- a/src/scss/_dark-mode.scss
+++ b/src/scss/_dark-mode.scss
@@ -0,0 +1,166 @@
+/*
+ * name:    样式 - 夜间模式
+ * author:  @KyleBing
+ * date:    2020-11-24
+ */
+
+@media (prefers-color-scheme: dark) {
+  #app{
+    color: $dark-text-info;
+  }
+  body{
+    background-color: $dark-bg;
+  }
+
+  // FORM
+  .el-radio{
+    &__label{
+      color: $dark-text-main;
+    }
+    &__input{
+      color: $dark-text-info;
+      .el-radio__inner{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+      }
+    }
+
+    &.is-checked{
+      .el-radio__inner{
+        background-color: $blue;
+      }
+      .el-radio__label{
+        font-weight: bold;
+      }
+    }
+  }
+
+  .el-checkbox.is-bordered{
+    border-color: $dark-border;
+    .el-checkbox__inner{
+      background-color: $dark-btn-bg;
+      border-color: $dark-border;
+    }
+    &:hover{
+      border-color: $dark-border-highlight;
+      .el-checkbox__inner{
+        background-color: $dark-btn-bg-highlight;
+        border-color: $dark-border-highlight;
+      }
+      .el-checkbox__label{
+        color: $dark-text-info;
+      }
+    }
+    &.is-checked{
+      background-color: $blue;
+      .el-checkbox__inner{
+        border-color: $dark-btn-bg-highlight;
+      }
+      .el-checkbox__label{
+        color: white;
+        font-weight: bold;
+      }
+    }
+  }
+
+
+
+  // BUTTON
+  .el-button{
+    background-color: $dark-btn-bg;
+    border-color: $dark-border;
+    color: $dark-text-main;
+
+    &:active{
+      transform: translateY(2px);
+    }
+
+    &--default{
+      &.is-plain {
+        background-color: $dark-btn-bg;
+        &:hover {
+          background-color: $blue;
+          border-color: $blue;
+          color: white;
+        }
+      }
+    }
+    &--danger{
+      &.is-plain{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+        &:hover{
+          background-color: $red;
+          border-color: $red;
+        }
+      }
+    }
+  }
+
+  // 文件拖放区
+  .el-upload__tip{
+    color: $dark-text-info;
+  }
+  .el-upload-dragger{
+    background-color: $dark-uploader-bg;
+    border-color: $dark-border;
+    .el-upload__text{
+      color: $dark-text-info;
+    }
+    &:hover{
+      background: $dark-uploader-bg-highlight;
+      border-color: $dark-border-highlight;
+    }
+  }
+
+  //TABLE
+  .el-table{
+    background-color: $dark-bg-td;
+    &:before{ // 去除表格末尾的横线
+      content: none;
+    }
+    &__header{
+      th{
+        border-bottom-color: $dark-border !important;
+      }
+    }
+    th{
+      background-color: $dark-bg-th;
+      color: $dark-text-info;
+    }
+    td{
+      border-bottom-color: $dark-border !important;
+    }
+    tr{
+      background-color: $dark-bg-td;
+      color: $dark-text-main;
+      &:hover{
+        td{
+          background-color: $dark-bg-th !important;
+        }
+      }
+    }
+  }
+
+
+  // LINKS
+  a{
+    text-decoration: none;
+    color: darken($dark-color-link, 15%);
+    &:hover{
+      color: $dark-color-link;
+    }
+  }
+
+  // ALERT
+  .el-notification{
+    background-color: $dark-btn-bg-highlight;
+    border-color: $dark-border;
+    &__title{
+      color: white;
+    }
+    &__content{
+      color: $dark-text-info;
+    }
+  }
+}
--- a/src/scss/_gaps.scss
+++ b/src/scss/_gaps.scss
@@ -0,0 +1,18 @@
+/*
+ * 间隔工具集
+ */
+
+$gap: 5px;
+@for $item from 1 through 7 {
+  .mt-#{$item} { margin-top     : $gap * $item !important;}
+  .mb-#{$item} { margin-bottom  : $gap * $item !important;}
+  .ml-#{$item} { margin-left    : $gap * $item !important;}
+  .mr-#{$item} { margin-right   : $gap * $item !important;}
+   .m-#{$item} { margin         : $gap * $item !important;}
+
+  .pt-#{$item} { padding-top    : $gap * $item !important;}
+  .pb-#{$item} { padding-bottom : $gap * $item !important;}
+  .pl-#{$item} { padding-left   : $gap * $item !important;}
+  .pr-#{$item} { padding-right  : $gap * $item !important;}
+   .p-#{$item} { padding        : $gap * $item !important;}
+}
--- a/src/scss/_normal.scss
+++ b/src/scss/_normal.scss
@@ -0,0 +1,38 @@
+body{
+  font-family: $font-family;
+  font-size: $fz-main;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+#app {
+  text-align: center;
+  color: $text-main;
+  padding-top: 30px;
+}
+
+#app-footer a {
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+#app-footer {
+  text-align: center;
+  font-size: small;
+}
+
+#app-control {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+audio{
+  margin-bottom: 15px; // 播放控件与表格间隔
+}
+
+a{
+  color: darken($color-link, 15%);
+  &:hover{
+    color: $color-link;
+  }
+}
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -0,0 +1,28 @@
+// COLORS
+$blue      : #409EFF;
+$red       : #F56C6C;
+$green     : #85ce61;
+
+// TEXT
+$text-main : #2C3E50;
+$color-link: $blue;
+
+$fz-main: 14px;
+
+$font-family: "Helvetica Neue", Helvetica, "PingFang SC",
+"Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+
+
+// DARK MODE
+$dark-border                : lighten(black, 25%);
+$dark-border-highlight      : lighten(black, 55%);
+$dark-bg                    : lighten(black, 10%);
+$dark-text-main             : lighten(black, 90%);
+$dark-text-info             : lighten(black, 60%);
+$dark-uploader-bg           : lighten(black, 13%);
+$dark-uploader-bg-highlight : lighten(black, 18%);
+$dark-btn-bg                : lighten(black, 20%);
+$dark-btn-bg-highlight      : lighten(black, 30%);
+$dark-bg-th                 : lighten(black, 18%);
+$dark-bg-td                 : lighten(black, 13%);
+$dark-color-link            : $green;
--- a/src/scss/unlock-music.scss
+++ b/src/scss/unlock-music.scss
@@ -0,0 +1,5 @@
+@import "variables";
+@import "gaps";
+
+@import "normal";
+@import "dark-mode"; // dark-mode 放在 normal 后面，以获得更高优先级
Author	SHA1	Message	Date
MengYX	8e135f7004	Bump Version and Update Deps	2020-11-26 17:28:14 +08:00
MengYX	0fb30ddc17	Merge pull request #113 from KyleBing/master 调整暗黑模式样式，新增全局统一样式 by @KyleBing	2020-11-26 16:56:44 +08:00
KyleBing	e9a25f3140	^ package-lock.json	2020-11-25 14:47:23 +08:00
KyleBing	5e2f3d36c2	暗黑模式颜色调整，载入页颜色适配黑色	2020-11-25 14:38:29 +08:00
KyleBing	a040c88a07	use scss source file, remove pre-compiled css file.	2020-11-25 13:50:38 +08:00
KyleBing	b370f4ceb6	调整暗黑模式样式，新增全局统一样式	2020-11-24 22:28:56 +08:00
MengYX	bf0df4e68d	Merge pull request #112 from flosacca/master Fix #100 by @flosacca	2020-11-23 21:34:58 +08:00
flosacca	f24ea6a07b	Fix #100	2020-11-21 07:03:57 +08:00
MengYX	c11f3fd130	Update README	2020-11-07 22:46:27 +08:00
MengYX	2ffcbf79b5	Bump Version	2020-11-07 01:22:45 +08:00
MengYX	6a2b98798b	Fix #103 #100 duplicated metadata	2020-11-07 01:12:04 +08:00
MengYX	60e2039e56	Update CI	2020-11-06 22:40:23 +08:00
MengYX	fbdad625c5	Update Deps	2020-11-06 22:40:13 +08:00
MengYX	10814ea109	Merge pull request #106 from lc6464/master 适配浏览器深色模式	2020-11-01 11:40:21 +08:00
NULL-LC	52657046d6	适配浏览器深色模式	2020-10-31 19:25:14 +08:00
MengYX	175112180d	Merge pull request #101 from renbaoshuo/patch-1 更新 Edge 浏览器下载链接	2020-10-30 10:48:45 +08:00
Baoshuo Ren	7b26630428	更新 Edge 浏览器下载链接	2020-10-18 19:02:40 +08:00
MengYX	55b2f17ed7	Bump Version	2020-09-23 16:51:17 +08:00
MengYX	be09790810	Merge pull request #97 from qq1010903229/patch-1 Merge pull request #97 增加对QQ音乐微云网盘格式的支持	2020-09-23 16:45:54 +08:00
MengYX	df2d409351	Fix Kgm Decrypt Bug	2020-09-23 14:15:47 +08:00
MengYX	a558dac34b	Update Deps	2020-09-23 12:55:14 +08:00
MengYX	44642b1c39	Fix kgm bug	2020-09-23 12:54:54 +08:00
qq1010903229	6e66d2da4f	Update qmc.js	2020-09-19 12:03:02 +08:00
qq1010903229	e1cf15cf8c	Update common.js	2020-09-19 12:00:58 +08:00
MengYX	1d415cae52	Add Comment for Issue Template	2020-09-04 19:12:58 +08:00