Bump Version

Change: [CI] Action Name
Fix: [CI] Build Docker Image
2021-02-08 19:28:40 +08:00 · 2021-02-08 19:14:26 +08:00 · 2021-02-08 19:14:12 +08:00 · 2021-02-08 17:09:26 +08:00 · 2021-02-08 16:23:24 +08:00 · 2021-02-08 16:08:06 +08:00
35 changed files with 5122 additions and 2481 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,65 +0,0 @@
---
-kind: pipeline
-type: docker
-name: default
-
-clone:
-  depth: 1
-
-steps:
-  - name: installDependencies
-    image: node:lts
-    commands:
-      - npm ci --registry=https://registry.npm.taobao.org
-
-  - name: build
-    image: node:lts
-    commands:
-      - npm run fix-compatibility
-      - npm run build
-      - tar -czf legacy.tar.gz -C ./dist .
-      - npm run build -- --modern
-      - tar -czf modern.tar.gz -C ./dist .
-
-
-  - name: release
-    image: plugins/gitea-release
-    settings:
-      base_url: https://git.ixarea.com
-      files:
-        - modern.tar.gz
-        - legacy.tar.gz
-      api_key:
-        from_secret: gitea_token
-      checksum:
-        - sha256
-    when:
-      event: [tag]
-
-  - name: deploy
-    image: plugins/s3
-    settings:
-      bucket: unlock-music
-      access_key:
-        from_secret: aws_access_key_id
-      secret_key:
-        from_secret: aws_secret_access_key
-      source: dist/**/*
-      strip_prefix: dist/
-      target: /public
-      path_style: true
-      endpoint: https://fs.sz2.ixarea.com
-
-
-  - name: upload
-    image: plugins/s3
-    settings:
-      bucket: unlock-music
-      access_key:
-        from_secret: aws_access_key_id
-      secret_key:
-        from_secret: aws_secret_access_key
-      source: ./*.tar.gz
-      target: /build/${DRONE_BUILD_NUMBER}
-      path_style: true
-      endpoint: https://fs.sz2.ixarea.com
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,39 @@
+---
+name: Bug报告
+about: 报告Bug以帮助改进程序
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+* 请按照此模板填写，否则可能立即被关闭
+
+- [x] 我确认已经搜索过Issue不存并确认相同的Issue
+- [x] 我有证据表明这是程序导致的问题（如不确认，可以在[Discussions](https://github.com/ix64/unlock-music/discussions)内提出）
+
+
+**Bug描述**
+
+简要地复述你遇到的Bug
+
+**复现方法**
+
+描述复现方法，必要时请提供样本文件
+
+**程序截图或者Console报错信息**
+
+如果可以请提供二者之一
+
+
+**环境信息:**
+
+ - 操作系统和浏览器：
+ - 程序版本：
+ - 获取音乐文件所使用的客户端及其版本信息：
+
+
+**附加信息**
+
+其他能够帮助确认问题的信息
+
--- a/.github/ISSUE_TEMPLATE/new-feature.md
+++ b/.github/ISSUE_TEMPLATE/new-feature.md
@@ -0,0 +1,26 @@
+---
+name: 新功能
+about: 对于程序新的想法或建议
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+- 请按照此模板填写，否则可能立即被关闭
+
+**背景和说明**
+
+简要说明产生此想法的背景和此想法的具体内容
+
+
+**实现途径**
+
+- 如果没有设计方案，请简要描述实现思路
+- 如果你没有任何的实现思路，请通过[Discussions](https://github.com/ix64/unlock-music/discussions)或者Telegram进行讨论
+
+
+**附加信息**
+
+更多你想要表达的内容
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,74 @@
+name: Test Build
+on:
+  push:
+    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_EXTENSION: true
+          - build: modern
+            BUILD_ARGS: "-- --modern"
+            BUILD_EXTENSION: false
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+
+      - 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: Build Extension
+        if: ${{ matrix.BUILD_EXTENSION }}
+        run: |
+          npm run make-extension
+          cd dist
+          zip -rJ9 ../extension.zip *
+          cd ..
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unlock-music-${{ matrix.build }}.tar.gz
+          path: ./dist.tar.gz
+
+      - name: Publish artifact - Extension
+        if: ${{ matrix.BUILD_EXTENSION }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: extension.zip
+          path: ./extension.zip
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -0,0 +1,65 @@
+name: Post Release
+on:
+  release:
+    types: [ published ]
+jobs:
+  release-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup vars
+        id: vars
+        env:
+          RELEASE_REF: ${{ github.ref }}
+        run: echo "::set-output name=tag::${RELEASE_REF#refs/tags/}"
+
+      - name: Download release content
+        run: |
+          echo "https://github.com/${{ github.repository }}/releases/download/${{ steps.vars.outputs.tag }}/modern.tar.gz"
+          wget -O modern.tar.gz "https://github.com/${{ github.repository }}/releases/download/${{ steps.vars.outputs.tag }}/modern.tar.gz"
+          mkdir ./dist
+          tar zxf modern.tar.gz -C ./dist
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build docker and push (on modern)
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/386
+          push: true
+          tags: |
+            ix64/unlock-music:latest
+            ix64/unlock-music:${{ steps.vars.outputs.tag }}
+
+  gh-pages:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup vars
+        id: vars
+        env:
+          RELEASE_REF: ${{ github.ref }}
+        run: echo "::set-output name=tag::${RELEASE_REF#refs/tags/}"
+
+      - name: Download release content
+        run: |
+          echo "https://github.com/${{ github.repository }}/releases/download/${{ steps.vars.outputs.tag }}/modern.tar.gz"
+          wget -O modern.tar.gz "https://github.com/${{ github.repository }}/releases/download/${{ steps.vars.outputs.tag }}/modern.tar.gz"
+          mkdir ./dist
+          tar zxf modern.tar.gz -C ./dist
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist
+
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -0,0 +1,128 @@
+name: Build Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
+
+      - name: Build Legacy
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build
+          tar -czf legacy.tar.gz -C ./dist .
+          cd dist
+          zip -rJ9 ../legacy.zip *
+          cd ..
+
+      - name: Build Extension (on legacy)
+        env:
+          GZIP: "--best"
+        run: |
+          npm run make-extension
+          cd dist
+          zip -rJ9 ../extension.zip *
+          cd ..
+
+      - name: Build Modern
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build -- --modern
+          tar -czf modern.tar.gz -C ./dist .
+          cd dist
+          zip -rJ9 ../modern.zip *
+          cd ..
+
+      - name: Checksum
+        run: sha256sum *.tar.gz *.zip > sha256sum.txt
+
+      - 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:
+          tag_name: ${{ github.ref }}
+          release_name: "Build ${{ steps.date.outputs.date }}"
+          draft: true
+
+      - name: Upload Release Assets - legacy.tar.gz
+        uses: actions/upload-release-asset@v1
+        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: Upload Release Assets - legacy.zip
+        uses: actions/upload-release-asset@v1
+        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: Upload Release Assets - modern.tar.gz
+        uses: actions/upload-release-asset@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
+
+      - name: Upload Release Assets - modern.zip
+        uses: actions/upload-release-asset@v1
+        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 - extension.zip
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./extension.zip
+          asset_name: extension.zip
+          asset_content_type: application/zip
+
+      - name: Upload Release Assets - sha256sum.txt
+        uses: actions/upload-release-asset@v1
+        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/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,102 +0,0 @@
-name: Release and GitHub Pages
-
-on:
-  push:
-    tags:
-    - "v*"
-
-jobs:
-  build:
-
-    runs-on: ubuntu-18.04
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Use Node.js 12.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.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 -J9 legacy.zip ./dist
-    - name: Build Modern
-      run: |
-        npm run build -- --modern
-        tar -czf modern.tar.gz -C ./dist .
-        zip -J9 modern.zip ./dist
-    - run: sha256sum *.tar.gz *.zip > sha256sum.txt
-
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./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 $(date %Y/%m/%d)"
-        draft: true
-
-    - 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: 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: 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/10
+++ b/10
@@ -0,0 +1,10 @@
+FROM --platform=$TARGETPLATFORM nginx:stable-alpine
+
+LABEL org.opencontainers.image.title="Unlock Music"
+LABEL org.opencontainers.image.description="Unlock encrypted music file in browser"
+LABEL org.opencontainers.image.authors="MengYX"
+LABEL org.opencontainers.image.source="https://github.com/ix64/unlock-music"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL maintainer="MengYX"
+
+COPY ./dist /usr/share/nginx/html
--- a/README.md
+++ b/README.md
@@ -1,44 +1,55 @@
 # Unlock Music 音乐解锁
- Unlock encrypted music file in browser. 
- 在浏览器中解锁加密的音乐文件。
- unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务；Unlock Music的CLI版本正在开发中。
- [其他测试版工具](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)
-    
-[![Build Status](https://ci.ixarea.com/api/badges/ix64/unlock-music/status.svg)](https://ci.ixarea.com/ix64/unlock-music)

-# 特性
-## 支持的格式
+- 在浏览器中解锁加密的音乐文件。 Unlock encrypted music file in the browser.
+- unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
+- Unlock Music的CLI版本正在开发中。
+- 我们新建了Telegram群组，欢迎加入！[https://t.me/unlock_music_chat](https://t.me/unlock_music_chat)
+- [CLI版本 Alpha](https://github.com/unlock-music/cli) 大批量转换建议使用CLI版本
+- [相关的其他项目](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)
+
+## 特性
+
+### 支持的格式
+
 - [x] QQ音乐 (.qmc0/.qmc2/.qmc3/.qmcflac/.qmcogg/[.tkm](https://github.com/ix64/unlock-music/issues/9))
+  - [x] 写入封面图片
 - [x] Moo音乐格式 ([.bkcmp3/.bkcflac](https://github.com/ix64/unlock-music/issues/11))
 - [x] QQ音乐Tm格式 (.tm0/.tm2/.tm3/.tm6)
 - [x] QQ音乐新格式 (实验性支持)
-    - [x] .mflac 
-    - [x] [.mgg](https://github.com/ix64/unlock-music/issues/3)
+  - [x] .mflac
+  - [x] [.mgg](https://github.com/ix64/unlock-music/issues/3)
 - [x] 网易云音乐格式 (.ncm)
-    - [x] 补全ncm的ID3信息
+  - [x] 补全ncm的ID3/FlacMeta信息
 - [x] 虾米音乐格式 (.xm) (测试阶段)
 - [x] 酷我音乐格式 (.kwm) (测试阶段)
- [x] 酷狗音乐格式 (.kgm) ([CLI版本](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#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
+- [x] 酷狗音乐格式 (
+  .kgm) ([CLI版本](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#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
+
+### 其他特性

-## 其他特性
 - [x] 在浏览器中解锁
 - [x] 拖放文件
 - [x] 在线播放
 - [x] 批量解锁
 - [x] 渐进式Web应用
- [x] 多线程 
+- [x] 多线程

+## 使用方法
+
+### 使用已构建版本

-# 使用方法
-## 使用已构建版本
 - 从[GitHub Release](https://github.com/ix64/unlock-music/releases/latest)下载已构建的版本
+  - 本地使用请下载`legacy版本`（`modern版本`只能通过**http/https协议**访问）
 - 解压缩后即可部署或本地使用（**请勿直接运行源代码**）

-## 自行构建
- 环境要求 
-    - nodejs
-    - npm
+### 自行构建
+
+- 环境要求
+  - nodejs
+  - npm
+
 1. 获取项目源代码后执行 `npm install` 安装相关依赖
 2. 执行 `npm run build` 即可进行构建，构建输出为 dist 目录
- `npm run serve` 可用于开发
+  - `npm run serve` 可用于开发
+3. 如需构建浏览器扩展，build完成后还需要执行`npm run make-extension`
--- a/extension-manifest.json
+++ b/extension-manifest.json
@@ -0,0 +1,16 @@
+{
+  "manifest_version": 2,
+  "name": "音乐解锁",
+  "short_name": "音乐解锁",
+  "icons": {
+    "128": "./img/icons/msapplication-icon-144x144.png"
+  },
+  "description": "在任何设备上解锁已购的加密音乐！",
+  "offline_enabled": true,
+  "options_page": "./index.html",
+  "homepage_url": "https://github.com/ix64/unlock-music",
+  "browser_action": {
+    "default_popup": "./popup.html"
+  },
+  "content_security_policy": "script-src 'self' https://stats.ixarea.com; object-src 'self'"
+}
--- a/make-extension.js
+++ b/make-extension.js
@@ -0,0 +1,20 @@
+const fs = require('fs')
+const path = require('path')
+const src = "./src/extension/"
+const dst = "./dist"
+fs.readdirSync(src).forEach(file => {
+    let srcPath = path.join(src, file)
+    let dstPath = path.join(dst, file)
+    fs.copyFileSync(srcPath, dstPath)
+    console.log(`Copy: ${srcPath} => ${dstPath}`)
+})
+
+const manifestRaw = fs.readFileSync("./extension-manifest.json", "utf-8")
+const manifest = JSON.parse(manifestRaw)
+
+const pkgRaw = fs.readFileSync("./package.json", "utf-8")
+const pkg = JSON.parse(pkgRaw)
+
+manifest["version"] = pkg["version"]
+fs.writeFileSync("./dist/manifest.json", JSON.stringify(manifest), "utf-8")
+console.log("Write: manifest.json")
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "unlock-music",
-  "version": "1.6.0",
-  "updateInfo": "增加对flac文件的meta写入；支持QQ音乐封面写入（实验性）",
+  "version": "1.8.1",
+  "updateInfo": "添加构建为Docker镜像",
  "license": "MIT",
  "description": "Unlock encrypted music file in browser.",
  "repository": {
@@ -12,27 +12,31 @@
  "scripts": {
    "serve": "vue-cli-service serve",
    "build": "vue-cli-service build",
-    "fix-compatibility": "node ./src/fix-compatibility.js"
+    "fix-compatibility": "node ./src/fix-compatibility.js",
+    "make-extension": "node ./make-extension.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.3",
    "crypto-js": "^4.0.0",
-    "element-ui": "^2.13.0",
-    "iconv-lite": "^0.5.1",
+    "element-ui": "^2.15.0",
+    "iconv-lite": "^0.6.2",
+    "jimp": "^0.16.1",
    "metaflac-js": "^1.0.5",
-    "music-metadata-browser": "^2.0.5",
-    "register-service-worker": "^1.7.1",
-    "vue": "^2.6.11"
+    "music-metadata-browser": "^2.2.4",
+    "register-service-worker": "^1.7.2",
+    "vue": "^2.6.12"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.4.6",
-    "@vue/cli-plugin-pwa": "^4.4.6",
-    "@vue/cli-service": "^4.4.6",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-pwa": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
    "babel-plugin-component": "^1.1.1",
    "vue-cli-plugin-element": "^1.0.1",
-    "vue-template-compiler": "^2.6.11",
-    "workerize-loader": "^1.3.0"
+    "vue-template-compiler": "^2.6.12",
+    "workerize-loader": "^1.3.0",
+    "sass-loader": "^10.1.1",
+    "node-sass": "^5.0.0"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -5,15 +5,12 @@
    <meta content="webkit" name="renderer">
    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <!--@formatter:off-->
-    <script>var _paq=window._paq||[];_paq.push(["setRequestMethod","POST"],["trackPageView"],["enableLinkTracking"],["setSiteId","2"],["setTrackerUrl","https://stats.ixarea.com/ixarea-stats/report"]);</script>
-    <!--@formatter:on-->
-    <script async src="https://stats.ixarea.com/ixarea-stats.js"></script>
-    <title>音乐解锁 - By IXarea</title>
+    <title>音乐解锁</title>
    <meta content="音乐,解锁,ncm,qmc,mgg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
    <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
+    <script src="./ixarea-stats.js"></script>
    <!--@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>
@@ -27,46 +24,20 @@
             style="border:0"/>
    </noscript>
    <h3 id="loader-source"> 请勿直接运行源代码！ </h3>
-    <div hidden id="loader-tips-outdated">
+    <div id="loader-tips-outdated" hidden>
        <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">
+    <h3 id="loader-tips-timeout" hidden>
        音乐解锁采用了一些新特性！建议使用
-        <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>
    </h3>
 </div>
 <div id="app"></div>
-<script>
-    (function () {
-        setTimeout(function () {
-            var ele = document.getElementById("loader-tips-timeout");
-            if (ele != null) {
-                ele.hidden = false;
-            }
-        }, 2000);
-
-        var ua = navigator && navigator.userAgent;
-        var detected = (function () {
-            var m;
-            if (!ua) return true;
-            if (/MSIE |Trident\//.exec(ua)) return true; // no IE
-            m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
-            if (m && Number(m[1]) < 17) return true;
-            m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
-            if (m && Number(m[1]) < 58) return true;
-            m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
-            return m && Number(m[1]) < 45;
-        })();
-        if (detected) {
-            document.getElementById('loader-tips-outdated').hidden = false;
-            document.getElementById("loader-tips-timeout").hidden = false;
-        }
-    })();
-</script>
+<script src="./loader.js"></script>
 </body>
 </html>
--- a/public/ixarea-stats.js
+++ b/public/ixarea-stats.js
@@ -0,0 +1,10 @@
+var _paq = window._paq || [];
+_paq.push(["setRequestMethod", "POST"], ["trackPageView"], ["enableLinkTracking"],
+    ["setSiteId", "2"], ["setTrackerUrl", "https://stats.ixarea.com/ixarea-stats/report"]);
+
+var tag = document.createElement('script');
+tag.type = 'text/javascript';
+tag.async = true;
+tag.src = 'https://stats.ixarea.com/ixarea-stats.js';
+var s = document.getElementsByTagName('script')[0];
+s.parentNode.insertBefore(tag, s);
--- a/public/loader.js
+++ b/public/loader.js
@@ -0,0 +1,25 @@
+(function () {
+    setTimeout(function () {
+        var ele = document.getElementById("loader-tips-timeout");
+        if (ele != null) {
+            ele.hidden = false;
+        }
+    }, 2000);
+
+    var ua = navigator && navigator.userAgent;
+    var detected = (function () {
+        var m;
+        if (!ua) return true;
+        if (/MSIE |Trident\//.exec(ua)) return true; // no IE
+        m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
+        if (m && Number(m[1]) < 17) return true;
+        m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
+        if (m && Number(m[1]) < 58) return true;
+        m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
+        return m && Number(m[1]) < 45;
+    })();
+    if (detected) {
+        document.getElementById('loader-tips-outdated').hidden = false;
+        document.getElementById("loader-tips-timeout").hidden = false;
+    }
+})();
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,21 +0,0 @@
-{
-  "name": "音乐解锁 - By IXarea",
-  "short_name": "音乐解锁",
-  "description": "在任何设备上解锁已购的加密音乐！支持QQ音乐与网易云音乐！",
-  "icons": [
-    {
-      "src": "./img/icons/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "./img/icons/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
-  "start_url": "./index.html",
-  "display": "standalone",
-  "background_color": "#000000",
-  "theme_color": "#4DBA87"
-}
--- 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"
@@ -101,15 +99,15 @@
                }
                if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
                    (!!updateInfo.Found && window.location.protocol !== "https:"))) {
-                    this.$notify.warning({
-                        title: '发现更新',
-                        message: '发现新版本 v' + updateInfo.Version +
-                            '<br/>更新详情：' + updateInfo.Detail +
-                            '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
-                        dangerouslyUseHTMLString: true,
-                        duration: 15000,
-                        position: 'top-left'
-                    });
+                  this.$notify.warning({
+                    title: '发现更新',
+                    message: '发现新版本 v' + updateInfo.Version +
+                        '<br/>更新详情：' + updateInfo.Detail +
+                        '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
+                    dangerouslyUseHTMLString: true,
+                    duration: 15000,
+                    position: 'top-left'
+                  });
                } else {
                    this.$notify.info({
                        title: '离线使用',
@@ -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
@@ -58,6 +63,6 @@ export async function CommonDecrypt(file) {

    if (!rt_data.rawExt) rt_data.rawExt = raw_ext;
    if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename;
-
+    console.log(rt_data);
    return rt_data;
 }
--- a/src/decrypt/kgm.js
+++ b/src/decrypt/kgm.js
@@ -10,9 +10,17 @@ const KgmHeader = [
 const VprMaskDiff = [0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
    0x2F, 0x80, 0xF3, 0x2D, 0xB8, 0xB6, 0xE3, 0x11,
    0x00]
-const PreDefinedKey = "MoOtOiTvINGwd2E6n0E1i7L5t2IoOoNk"

 export async function Decrypt(file, raw_filename, raw_ext) {
+    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") {
        if (!IsBytesEqual(VprHeader, oriData.slice(0, 0x10)))
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -3,6 +3,9 @@ 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 {
    AudioMimeType,
    DetectAudioExt,
@@ -35,29 +38,46 @@ export async function Decrypt(file, raw_filename, raw_ext) {

    const artists = [];
    if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0]));
-    const info = GetFileInfo(artists.join(" & "), musicMeta.musicName, raw_filename);
+    const info = GetFileInfo(artists.join("; "), musicMeta.musicName, raw_filename);
    if (artists.length === 0) artists.push(info.artist);

    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
+    console.log(musicMeta)

    const imageInfo = await GetWebImage(musicMeta.albumPic);
-    if (musicMeta.format === "mp3") {
-        audioData = await WriteMp3Meta(
-            audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
-    } else if (musicMeta.format === "flac") {
-        const writer = new MetaFlac(Buffer.from(audioData))
-        writer.setTag("TITLE=" + info.title);
-        writer.setTag("ALBUM=" + musicMeta.album);
-        artists.forEach(artist => writer.setTag("ARTIST=" + artist));
-        writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
-        audioData = writer.save()
+    while (!!imageInfo.buffer && imageInfo.buffer.byteLength >= 16 * 1024 * 1024) {
+        let img = await jimp.read(imageInfo.buffer)
+        await img.resize(Math.round(img.getHeight() / 2), jimp.AUTO)
+        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, shouldWrite ? null : originalMeta)
+        } else if (musicMeta.format === "flac") {
+            const writer = new MetaFlac(Buffer.from(audioData))
+            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()
+        }
+    } catch (e) {
+        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})

-    let x = {
+    return {
        status: true,
        title: info.title,
        artist: info.artist,
@@ -66,9 +86,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        picture: imageInfo.url,
        file: URL.createObjectURL(musicData),
        mime: mime
-    };
-    console.log(x)
-    return x;
+    }
 }


@@ -153,7 +171,9 @@ function getMetaData(dataView, fileBuffer, offset) {
    if (plainText.slice(0, labelIndex) === "dj") {
        result = result.mainMusic;
    }
-    if (!!result.albumPic) result.albumPic = result.albumPic.replace("http://", "https://");
+    if (!!result.albumPic && result.albumPic !== "")
+        result.albumPic = result.albumPic.replace("http://", "https://") + "?param=500y500";
+
    return {data: result, offset: offset};
 }

--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -5,7 +5,8 @@ import {
    GetFileInfo,
    GetMetaCoverURL,
    GetWebImage,
-    IXAREA_API_ENDPOINT
+    IXAREA_API_ENDPOINT,
+    WriteMp3Meta
 } from "./util";
 import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";
 import {fromByteArray as Base64Encode, toByteArray as Base64Decode} from 'base64-js'
@@ -29,7 +30,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) {
@@ -60,6 +66,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    const musicMeta = await musicMetadata.parseBlob(musicBlob);
    for (let metaIdx in musicMeta.native) {
        if (musicMeta.native[metaIdx].some(item => item.id === "TCON" && item.value === "(12)")) {
+            console.warn("The metadata is using gbk encoding")
            musicMeta.common.artist = decode(musicMeta.common.artist, "gbk");
            musicMeta.common.title = decode(musicMeta.common.title, "gbk");
            musicMeta.common.album = decode(musicMeta.common.album, "gbk");
@@ -77,21 +84,22 @@ export async function Decrypt(file, raw_filename, raw_ext) {
            const imageInfo = await GetWebImage(imgUrl);
            if (imageInfo.url !== "") {
                imgUrl = imageInfo.url
-                if (ext === "mp3") {
-                    let writer = new ID3Writer(musicDecoded)
-                    writer.setFrame('APIC', {
-                        type: 3,
-                        data: imageInfo.buffer,
-                        description: "Cover",
-                    })
-                    writer.addTag();
-                    musicDecoded = writer.arrayBuffer
-                    musicBlob = new Blob([musicDecoded], {type: mime});
-                } else if (ext === 'flac') {
-                    const writer = new MetaFlac(Buffer.from(musicDecoded))
-                    writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
-                    musicDecoded = writer.save()
-                    musicBlob = new Blob([musicDecoded], {type: mime});
+                try {
+                    if (ext === "mp3") {
+                        musicDecoded = await WriteMp3Meta(musicDecoded,
+                            info.artist.split(" _ "), info.title, "",
+                            imageInfo.buffer, "Cover", musicMeta)
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    } else if (ext === 'flac') {
+                        const writer = new MetaFlac(Buffer.from(musicDecoded))
+                        writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
+                        musicDecoded = writer.save()
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    } else {
+                        console.info("writing metadata for " + ext + " is not being supported for now")
+                    }
+                } catch (e) {
+                    console.warn("Error while appending cover image to file " + e)
                }
            }
        }
--- 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];
@@ -85,18 +86,32 @@ export async function GetWebImage(pic_url) {
            let buf = await resp.arrayBuffer();
            let objBlob = new Blob([buf], {type: mime});
            let objUrl = URL.createObjectURL(objBlob);
-            return {"buffer": buf, "url": objUrl, "type": mime};
+            return {"buffer": buf, "src": pic_url, "url": objUrl, "type": mime};
        }
    } catch (e) {
    }
-    return {"buffer": null, "url": "", "type": ""}
+    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,
@@ -108,20 +123,3 @@ export function WriteMp3Meta(audioData, artistList, title, album, pictureData =
    return writer.arrayBuffer;
 }

-export function RequestJsonp(url, callback_name = "callback") {
-    return new Promise((resolve, reject) => {
-        let node;
-        window[callback_name] = function (data) {
-            delete window[callback_name];
-            if (node.parentNode) node.parentNode.removeChild(node);
-            resolve(data)
-        };
-        node = document.createElement('script');
-        node.type = "text/javascript";
-        node.src = url;
-        node.addEventListener('error', msg => {
-            reject(msg);
-        });
-        document.head.appendChild(node);
-    });
-}
--- a/src/decrypt/xm.js
+++ b/src/decrypt/xm.js
@@ -1,4 +1,4 @@
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
+import {AudioMimeType, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";

 import {Decrypt as RawDecrypt} from "./raw";

@@ -29,25 +29,26 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    }

    let key = oriData[0xf]
-    let dataOffset = oriData[0xc] | oriData[0xd] << 8
+    let dataOffset = oriData[0xc] | oriData[0xd] << 8 | oriData[0xe] << 16
    let audioData = oriData.slice(0x10);
    let lenAudioData = audioData.length;
    for (let cur = dataOffset; cur < lenAudioData; ++cur)
        audioData[cur] = (audioData[cur] - key) ^ 0xff;

-    const ext = DetectAudioExt(audioData, "mp3");
+    const ext = FileTypeMap[typeText];
    const mime = AudioMimeType[ext];
    let musicBlob = new Blob([audioData], {type: mime});

    const musicMeta = await musicMetadata.parseBlob(musicBlob);
    if (ext === "wav") {
        //todo:未知的编码方式
+        console.log(musicMeta.common)
        musicMeta.common.album = "";
        musicMeta.common.artist = "";
        musicMeta.common.title = "";
    }
-
-    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, "_");
+    let _sep = raw_filename.indexOf("_") === -1 ? "-" : "_"
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, _sep);

    const imgUrl = GetMetaCoverURL(musicMeta);

--- a/src/extension/popup.html
+++ b/src/extension/popup.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+<script src="./popup.js"></script>
+<a href="./index.html" target="_blank">
+    <button>立即使用</button>
+</a>
+</body>
+</html>
+
--- a/src/extension/popup.js
+++ b/src/extension/popup.js
@@ -0,0 +1,5 @@
+const bs = chrome || browser
+bs.tabs.create({
+    url: bs.runtime.getURL('./index.html')
+}, tab => console.log(tab))
+
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -2,7 +2,8 @@

 import {register} from 'register-service-worker'

-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production' && window.location.protocol === "https:") {
+
    register(`${process.env.BASE_URL}service-worker.js`, {
        ready() {
            console.log('App is being served from cache by a service worker.')
--- 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 后面，以获得更高优先级
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,36 @@ module.exports = {
    publicPath: '',
    productionSourceMap: false,
    pwa: {
+        manifestPath: "web-manifest.json",
+        name: "音乐解锁",
+        themeColor: "#4DBA87",
+        msTileColor: "#000000",
+        manifestOptions: {
+            start_url: "./index.html",
+            description: "在任何设备上解锁已购的加密音乐！",
+            icons: [
+                {
+                    'src': './img/icons/android-chrome-192x192.png',
+                    'sizes': '192x192',
+                    'type': 'image/png'
+                },
+                {
+                    'src': './img/icons/android-chrome-512x512.png',
+                    'sizes': '512x512',
+                    'type': 'image/png'
+                }
+            ]
+        },
+        appleMobileWebAppCapable: 'yes',
+        iconPaths: {
+            faviconSVG: './img/icons/safari-pinned-tab.svg',
+            favicon32: './img/icons/favicon-32x32.png',
+            favicon16: './img/icons/favicon-16x16.png',
+            appleTouchIcon: './img/icons/apple-touch-icon-152x152.png',
+            maskIcon: './img/icons/safari-pinned-tab.svg',
+            msTileImage: './img/icons/msapplication-icon-144x144.png'
+        },
+        workboxPluginMode: "GenerateSW",
        workboxOptions: {
            skipWaiting: true
        }
Author	SHA1	Message	Date
MengYX	7716c356ed	Bump Version	2021-02-08 19:28:40 +08:00
MengYX	701f750476	Change: [CI] Action Name	2021-02-08 19:14:26 +08:00
MengYX	d73493a624	Fix: [CI] Build Docker Image	2021-02-08 19:14:12 +08:00
MengYX	85fdbff00d	Fix: [CI] Build Docker Image	2021-02-08 17:09:26 +08:00
MengYX	3a5afeb8a6	Fix: [CI] Build Docker Image	2021-02-08 16:23:24 +08:00
MengYX	8dc1a66d69	Update: [CI] Build Docker Image	2021-02-08 16:08:06 +08:00
MengYX	7733fa6ad1	Add: Dockerfile	2021-02-08 14:11:46 +08:00
MengYX	6a2dd672f3	Update: [CI] Remove Cache (because using `npm ci`)	2021-02-08 14:01:41 +08:00
MengYX	ca82842b04	Update: [Docs] README	2021-02-08 12:11:45 +08:00
MengYX	137df9c4c2	Misc: Bump Version	2021-02-08 05:31:16 +08:00
MengYX	b17bb37c38	Fix: [Extension] Use extension API make sure page open successfully	2021-02-08 04:50:00 +08:00
MengYX	9607580e8b	Update: Deps	2021-02-08 04:26:56 +08:00
MengYX	5956412d7e	Fix: [CI] Generated zip structure	2021-02-08 04:24:55 +08:00
MengYX	22312959f3	Merge branch 'feature/extension'	2021-02-08 04:14:02 +08:00
MengYX	549983a928	Adapt: [Extension] for Firefox	2021-02-08 03:35:26 +08:00
MengYX	ce2642ad1f	Fix: [Extension] Remove inline script (for extension's Content Security Policy reason) Fix: [Extension] Disable Service Worker	2021-02-08 03:05:49 +08:00
MengYX	c6ea98333e	Update CI: Add Extension Build	2021-02-08 01:47:31 +08:00
MengYX	042b1ca0dd	Add Feature: Browser Extension	2021-02-08 01:28:30 +08:00
MengYX	e089fe1268	Change: Web Manifest	2021-02-08 00:26:40 +08:00
MengYX	67966d4b54	Update README.md	2021-01-10 16:38:03 +08:00
MengYX	ca462f94fa	Remove Drone CI	2020-12-23 15:35:46 +08:00
MengYX	297c7c9252	Remove "By IXarea"	2020-12-23 15:34:37 +08:00
MengYX	8acc1ade81	Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/highlight.js-10.4.1' into master	2020-12-19 21:17:27 +08:00
MengYX	e543024641	Bump Version and Update Deps	2020-12-19 21:16:53 +08:00
MengYX	cf48554424	Merge pull request #117 from ix64/fix-qmc-meta Fix incorrect id3 info for .qmc decryption	2020-12-17 08:36:10 +08:00
MengYX	2e0cd04255	Update new-feature.md	2020-12-10 19:01:54 +08:00
MengYX	adbcdfd083	Update bug-report.md	2020-12-10 19:00:50 +08:00
MengYX	e1505148c8	Add tips for qmc not writing cover	2020-12-06 02:32:57 +08:00
MengYX	b65e47514f	Update CI	2020-12-06 02:22:43 +08:00
MengYX	31215772e3	Try to fix .qmc ID3 Info	2020-12-06 02:16:45 +08:00
dependabot[bot]	070c642dbf	Bump highlight.js from 10.4.0 to 10.4.1 Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.4.0 to 10.4.1. - [Release notes](https://github.com/highlightjs/highlight.js/releases) - [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md) - [Commits](https://github.com/highlightjs/highlight.js/compare/10.4.0...10.4.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-04 18:43:39 +00:00
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
MengYX	66e2b96bad	Bump Version	2020-09-02 00:04:26 +08:00
MengYX	79c0c85ab3	Merge remote-tracking branch into master	2020-09-01 23:31:43 +08:00
MengYX	ad47a713ad	Add Tips for .kgm while using "file:" protocol	2020-09-01 23:26:02 +08:00
MengYX	6ef0850c40	Use Small Cover Image for .ncm	2020-09-01 23:17:17 +08:00
MengYX	9af2ba5e62	Update README.md	2020-08-15 10:30:13 +08:00
MengYX	0f52c53d6c	fix .xm filename detect	2020-08-13 21:27:50 +08:00
MengYX	24764875f3	Update CI	2020-08-13 21:27:25 +08:00
MengYX	65a41b21c3	Merge remote-tracking branch 'origin/master'	2020-08-13 16:01:55 +08:00
MengYX	b93b93110b	Update GitHub CI	2020-08-13 16:01:35 +08:00
MengYX	7a5cefd950	Bump Version and Update Deps	2020-08-13 15:58:31 +08:00
MengYX	3b885f82ca	Fix .xm read info from filename	2020-08-13 15:33:15 +08:00
MengYX	b6757e81a2	Fix #84	2020-08-13 15:26:15 +08:00
MengYX	8d79035675	Fix .xm file type recognize error	2020-08-13 15:25:41 +08:00
MengYX	6592f304b6	Update issue templates	2020-08-07 19:33:28 +08:00
MengYX	e5bff35f89	Fix ncm cover image too big to write into meta	2020-08-03 15:04:54 +08:00
MengYX	9b28676c43	Clean up	2020-08-03 14:03:10 +08:00
MengYX	4a2d31238b	Fix #79 ncm->flac no metadata (file downloaded from phone)	2020-08-03 14:02:17 +08:00
MengYX	fd2866f53d	Bump Version	2020-08-02 18:25:56 +08:00
MengYX	5e8af22f08	Fix wrong zip file in release [Skip CI]	2020-08-01 01:20:56 +08:00
MengYX	4aa2ff7f91	Fix #77 ncm flac meta duplicated Fix #78 write flac cover sometimes fail	2020-08-01 01:10:27 +08:00
MengYX	c9a4a901be	Update README.md	2020-07-19 00:03:41 +08:00