Fix STag Filtering & README improvement & Update Supported Extensions #28

Merged
um-dev merged 3 commits from nullptr-0/web:master into master 4 months ago
There is no content yet.
nullptr-0 added 3 commits 4 months ago
nullptr-0 added 1 commit 4 months ago
continuous-integration/drone/pr Build is failing Details
e9ba9c83ef
Merge remote-tracking branch 'upstream/master'
nullptr-0 added 1 commit 4 months ago
continuous-integration/drone/pr Build is failing Details
abcb0a6e68
Update Supported Extensions
nullptr-0 changed title from Fix STag Filtering & README improvement to Fix STag Filtering & README improvement & Update Supported Extensions 4 months ago
jixunmoe requested changes 4 months ago
.drone.yml Outdated
@ -7,6 +7,7 @@ steps:
- name: build-wasm
image: emscripten/emsdk:3.0.0
commands:
- chmod +x ./scripts/build-wasm.sh
Owner

应当直接修改仓库内的文件 mode 后提交,而不是每次构建的时候改这玩意…

Windows 下可使用 git update-index --chmod=+x path_to_file 更改 1

应当直接修改仓库内的文件 mode 后提交,而不是每次构建的时候改这玩意… Windows 下可使用 `git update-index --chmod=+x path_to_file` 更改 [^1] [^1]: https://stackoverflow.com/a/13593391
nullptr-0 marked this conversation as resolved
@ -1,39 +1,39 @@
---
Owner

这两个模板无实质更改,建议移出该 PR。

这两个模板无实质更改,建议移出该 PR。
nullptr-0 marked this conversation as resolved
jest.config.js Outdated
@ -1,7 +1,7 @@
module.exports = {
Owner

文件无实质更改,建议移出该 PR。

文件无实质更改,建议移出该 PR。
nullptr-0 marked this conversation as resolved
@ -1,25 +1,25 @@
const fs = require('fs')
Owner

同上,文件无实质更改,建议移出该 PR。

同上,文件无实质更改,建议移出该 PR。
nullptr-0 marked this conversation as resolved
@ -68,6 +71,7 @@ export async function Decrypt(file: FileInfo, config: Record<string, any>): Prom
case 'mggl': //QQ Music Mac
case 'mflac': //QQ Music New Flac
case 'mflac0': //QQ Music New Flac
case 'mflach': //QQ Music New Flac
Owner

mac 的还不支持,因为需要储存了密钥的 mmkv 数据库。

mac 的还不支持,因为需要储存了密钥的 mmkv 数据库。
Owner

MMKV 相关 GO 实现代码:

https://git.unlock-music.dev/um/cli/src/branch/1bbc707/algo/qmc/key_mmkv.go#L20

逻辑由文件末端提取密钥更改为到 mmkv 密钥数据库使用文件名获取对应密钥。

MMKV 相关 GO 实现代码: https://git.unlock-music.dev/um/cli/src/branch/1bbc707/algo/qmc/key_mmkv.go#L20 逻辑由文件末端提取密钥更改为到 mmkv 密钥数据库使用文件名获取对应密钥。
nullptr-0 marked this conversation as resolved
Owner

有很多文件无实质上的更改,建议对比 PR 的 diff 界面,将无实质更改的文件移出 PR。

有很多文件无实质上的更改,建议对比 PR 的 diff 界面,将无实质更改的文件移出 PR。
nullptr-0 changed title from Fix STag Filtering & README improvement & Update Supported Extensions to WIP: Fix STag Filtering & README improvement & Update Supported Extensions 4 months ago
nullptr-0 force-pushed master from 90d5771af7 to 8867c484cd 4 months ago
nullptr-0 added 1 commit 4 months ago
continuous-integration/drone/pr Build is passing Details
211203b58e
更正对mflach的处理
nullptr-0 added 1 commit 4 months ago
continuous-integration/drone/pr Build is passing Details
61f165d22d
Update Copyright Year
nullptr-0 requested review from jixunmoe 4 months ago
Owner

除了那几个无实质更改的文件我这边 Review 没问题了。

除了那几个无实质更改的文件我这边 Review 没问题了。
Poster

除了那几个无实质更改的文件我这边 Review 没问题了。

那几个无实质更改是把这个repo的更改合并到我自己的repo导致的

> 除了那几个无实质更改的文件我这边 Review 没问题了。 那几个无实质更改是把这个repo的更改合并到我自己的repo导致的
nullptr-0 changed title from WIP: Fix STag Filtering & README improvement & Update Supported Extensions to Fix STag Filtering & README improvement & Update Supported Extensions 4 months ago
nullptr-0 requested review from um-dev 4 months ago
Owner

除了那几个无实质更改的文件我这边 Review 没问题了。

那几个无实质更改是把这个repo的更改合并到我自己的repo导致的

你可以用 git 指令重置文件到 upstream 状态:

git checkout upstream/master -- filename

如果你本地没有配置 upstream,你应当添加:

git remote add upstream https://git.unlock-music.dev/um/web.git
git fetch upstream -p

如果你使用 Windows,请配置 git 让它不要自动更改文件换行符:

https://stackoverflow.com/a/21822812

> > 除了那几个无实质更改的文件我这边 Review 没问题了。 > > 那几个无实质更改是把这个repo的更改合并到我自己的repo导致的 你可以用 git 指令重置文件到 upstream 状态: ``` git checkout upstream/master -- filename ``` 如果你本地没有配置 upstream,你应当添加: ``` git remote add upstream https://git.unlock-music.dev/um/web.git git fetch upstream -p ``` 如果你使用 Windows,请配置 git 让它不要自动更改文件换行符: https://stackoverflow.com/a/21822812
nullptr-0 force-pushed master from 61f165d22d to 6d8389ce19 4 months ago
jixunmoe approved these changes 4 months ago
jixunmoe left a comment
Owner

LGTM

LGTM
um-dev approved these changes 4 months ago
um-dev merged commit 4fec47201e into master 4 months ago

Reviewers

jixunmoe approved these changes 4 months ago
um-dev approved these changes 4 months ago
continuous-integration/drone/pr Build is passing
The pull request has been merged as 4fec47201e.
Sign in to join this conversation.
Loading…
There is no content yet.