From 6f405b5e06279c0aced7e80b7a7c562ad5a95a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E6=A0=91=E4=BA=BA?=
Date: Sat, 15 Jul 2023 20:10:07 +0100
Subject: [PATCH 1/2] chore: replace url to old github project (fix #53)
---
extension-manifest.json | 8 ++-
package.json | 4 +-
public/index.html | 106 ++++++++++++++++++++++--------
src/App.vue | 10 +--
src/component/ConfigDialog.vue | 4 +-
src/decrypt/__test__/joox.test.ts | 2 +-
src/view/Home.vue | 23 +++++--
7 files changed, 110 insertions(+), 47 deletions(-)
diff --git a/extension-manifest.json b/extension-manifest.json
index eaa9512..b31cb73 100644
--- a/extension-manifest.json
+++ b/extension-manifest.json
@@ -6,11 +6,13 @@
"128": "./img/icons/msapplication-icon-144x144.png"
},
"description": "在任何设备上解锁已购的加密音乐!",
- "permissions": ["storage"],
+ "permissions": [
+ "storage"
+ ],
"offline_enabled": true,
"options_page": "./index.html",
- "homepage_url": "https://github.com/ix64/unlock-music",
+ "homepage_url": "https://git.unlock-music.dev/um/web",
"browser_action": {
"default_popup": "./popup.html"
}
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 1d4549b..271a267 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"description": "Unlock encrypted music file in browser.",
"repository": {
"type": "git",
- "url": "https://github.com/ix64/unlock-music"
+ "url": "https://git.unlock-music.dev/um/web"
},
"private": true,
"scripts": {
@@ -57,4 +57,4 @@
"vue-cli-plugin-element": "^1.0.1",
"vue-template-compiler": "^2.6.14"
}
-}
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 0b295d7..16ced03 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,39 +1,89 @@
-
-
-
-
-
+
+
+
+
+
音乐解锁
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/src/App.vue b/src/App.vue
index 176b755..c52a138 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,19 +5,19 @@
@@ -77,7 +77,7 @@ export default {
最近更新
${config.updateInfo}
- 使用提示
+ 使用提示
`,
dangerouslyUseHTMLString: true,
duration: 10000,
diff --git a/src/component/ConfigDialog.vue b/src/component/ConfigDialog.vue
index 8523f02..b0e4155 100644
--- a/src/component/ConfigDialog.vue
+++ b/src/component/ConfigDialog.vue
@@ -43,7 +43,9 @@ form >>> input {
下载该加密文件的 JOOX 应用所记录的设备唯一识别码。
参见:
-
+
获取设备 UUID · unlock-music/joox-crypto Wiki。
diff --git a/src/decrypt/__test__/joox.test.ts b/src/decrypt/__test__/joox.test.ts
index dd0af1d..3960549 100644
--- a/src/decrypt/__test__/joox.test.ts
+++ b/src/decrypt/__test__/joox.test.ts
@@ -22,7 +22,7 @@ describe('decrypt/joox', () => {
album: 'unused',
blob: blob,
artist: 'unused',
- imgUrl: 'https://github.com/unlock-music',
+ imgUrl: 'https://example.unlock-music.dev/',
};
});
diff --git a/src/view/Home.vue b/src/view/Home.vue
index 69a6f5d..579e574 100644
--- a/src/view/Home.vue
+++ b/src/view/Home.vue
@@ -18,7 +18,9 @@
:album="editing_data.album"
:albumartist="editing_data.albumartist"
:genre="editing_data.genre"
- @cancel="showEditDialog = false" @ok="handleEdit">
+ @cancel="showEditDialog = false"
+ @ok="handleEdit"
+ >
@@ -37,14 +39,20 @@
开启后,解锁结果将不会存留于浏览器中,防止内存不足。
- 立即保存
+ 立即保存
-
+
@@ -70,7 +78,7 @@ export default {
return {
showConfigDialog: false,
showEditDialog: false,
- editing_data: { picture: '', title: '', artist: '', album: '', albumartist: '', genre: '', },
+ editing_data: { picture: '', title: '', artist: '', album: '', albumartist: '', genre: '' },
tableData: [],
playing_url: '',
playing_auto: false,
@@ -111,7 +119,7 @@ export default {
errInfo +
',' +
filename +
- ',参考使用提示',
+ ',参考使用提示',
dangerouslyUseHTMLString: true,
duration: 6000,
});
@@ -164,12 +172,13 @@ export default {
console.warn('获取图像失败', this.editing_data.picture);
}
}
- const newMeta = { picture: imageInfo?.buffer,
+ const newMeta = {
+ picture: imageInfo?.buffer,
title: data.title,
artists: data.artist.split(split_regex),
album: data.album,
albumartist: data.albumartist,
- genre: data.genre.split(split_regex)
+ genre: data.genre.split(split_regex),
};
const buffer = Buffer.from(await this.editing_data.blob.arrayBuffer());
const mime = AudioMimeType[this.editing_data.ext] || AudioMimeType.mp3;
From a788f48b6768f35d39cd950ac82cbf5646928fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E6=A0=91=E4=BA=BA?=
Date: Sat, 15 Jul 2023 20:10:19 +0100
Subject: [PATCH 2/2] docs: update issue templates
---
.gitlab/ISSUE_TEMPLATE/bug-report.md | 31 +++++++++++++++++----------
.gitlab/ISSUE_TEMPLATE/new-feature.md | 20 +++++++++--------
2 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/.gitlab/ISSUE_TEMPLATE/bug-report.md b/.gitlab/ISSUE_TEMPLATE/bug-report.md
index 8181d6a..272c2db 100644
--- a/.gitlab/ISSUE_TEMPLATE/bug-report.md
+++ b/.gitlab/ISSUE_TEMPLATE/bug-report.md
@@ -1,39 +1,48 @@
---
+
name: Bug报告
about: 报告Bug以帮助改进程序
title: ''
-labels: bug
-assignees: ''
+labels:
+- bug
---
* 请按照此模板填写,否则可能立即被关闭
- [x] 我确认已经搜索过Issue不存并确认相同的Issue
-- [x] 我有证据表明这是程序导致的问题(如不确认,可以在[Discussions](https://github.com/ix64/unlock-music/discussions)内提出)
+- [x] 我有证据表明这是程序导致的问题(如不确认,可以通过 Telegram 讨论组 (https://t.me/unlock_music_chat) 进行讨论)
-**Bug描述**
+## Bug描述
简要地复述你遇到的Bug
-**复现方法**
+## 复现方法
描述复现方法,必要时请提供样本文件
-**程序截图或者Console报错信息**
+## 程序截图或浏览器开发者控制台(Console)的报错信息
如果可以请提供二者之一
-
-**环境信息:**
+## 环境信息
- 操作系统和浏览器:
- 程序版本:
- - 获取音乐文件所使用的客户端及其版本信息:
+ - 网页版的地址(如果为非官方部署请注明):
+
+## 若为文件无法解密,请填写文件获取途径
+
+
+
+- 音乐平台名称:芝麻音乐 - https://example.com/
+- 客户端平台与版本号:Windows 客户端,版本号 12.34
+- 受影响的资源链接:https://example.com/song/123456
+注意:如果需要会员才能获取该资源,你可能也需要作为附件提交。
-**附加信息**
+## 附加信息
-其他能够帮助确认问题的信息
+如果有,请提供其他能够帮助确认问题的信息到下方:
diff --git a/.gitlab/ISSUE_TEMPLATE/new-feature.md b/.gitlab/ISSUE_TEMPLATE/new-feature.md
index 8d05080..9e5fe49 100644
--- a/.gitlab/ISSUE_TEMPLATE/new-feature.md
+++ b/.gitlab/ISSUE_TEMPLATE/new-feature.md
@@ -1,26 +1,28 @@
---
+
name: 新功能
about: 对于程序新的想法或建议
title: ''
-labels: enhancement
-assignees: ''
+labels:
+- enhancement
---
-- 请按照此模板填写,否则可能立即被关闭
+
+
-**背景和说明**
+## 背景和说明
-简要说明产生此想法的背景和此想法的具体内容
+
-**实现途径**
+## 实现途径
- 如果没有设计方案,请简要描述实现思路
-- 如果你没有任何的实现思路,请通过[Discussions](https://github.com/ix64/unlock-music/discussions)或者Telegram进行讨论
+- 如果你没有任何的实现思路,请通过 Telegram 讨论组 (https://t.me/unlock_music_chat) 进行讨论
-**附加信息**
+## 附加信息
-更多你想要表达的内容
+