diff --git a/.drone.yml b/.drone.yml index 8d0d7d2..236ab2d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,9 +16,9 @@ steps: image: node:lts commands: - npm run build - - tar -czf legacy.tar.gz ./dist/* + - tar -czf legacy.tar.gz -C ./dist . - npm run build -- --modern - - tar -czf morden.tar.gz ./dist/* + - tar -czf morden.tar.gz -C ./dist . - name: release @@ -44,11 +44,21 @@ steps: secret_key: from_secret: aws_secret_access_key source: dist/**/* - target: / + strip_prefix: dist/ + target: /public path_style: true endpoint: https://fs.sz2.ixarea.com -volumes: - - name: cache - host: - path: /tmp/cache \ No newline at end of file + + - 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 diff --git a/package-lock.json b/package-lock.json index bdf61d9..328e77b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1070,6 +1070,11 @@ "integrity": "sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA=", "dev": true }, + "@types/debug": { + "version": "4.1.5", + "resolved": "https://registry.npm.taobao.org/@types/debug/download/@types/debug-4.1.5.tgz", + "integrity": "sha1-sU76iFK3do2JiQZhPCP2iHE+As0=" + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/@types/events/download/@types/events-3.0.0.tgz", @@ -4619,9 +4624,27 @@ } }, "file-type": { - "version": "12.4.2", - "resolved": "https://registry.npm.taobao.org/file-type/download/file-type-12.4.2.tgz?cache=0&sync_timestamp=1579456502251&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-type%2Fdownload%2Ffile-type-12.4.2.tgz", - "integrity": "sha1-o0TqVmSh0BRH7n+xtjX3L+thadk=" + "version": "13.1.2", + "resolved": "https://registry.npm.taobao.org/file-type/download/file-type-13.1.2.tgz", + "integrity": "sha1-DltyvKdWnBUuLVqE7OB+lPd/gz8=", + "requires": { + "readable-web-to-node-stream": "^2.0.0", + "strtok3": "^5.0.2", + "token-types": "^2.0.0", + "typedarray-to-buffer": "^3.1.5" + }, + "dependencies": { + "strtok3": { + "version": "5.0.2", + "resolved": "https://registry.npm.taobao.org/strtok3/download/strtok3-5.0.2.tgz", + "integrity": "sha1-u4Hx9WdC4W8aMMzOXcPZSYqlR1o=", + "requires": { + "@tokenizer/token": "^0.1.1", + "debug": "^4.1.1", + "peek-readable": "^3.1.0" + } + } + } }, "file-uri-to-path": { "version": "1.0.0", @@ -7189,15 +7212,15 @@ "dev": true }, "music-metadata": { - "version": "5.4.3", - "resolved": "https://registry.npm.taobao.org/music-metadata/download/music-metadata-5.4.3.tgz", - "integrity": "sha1-sTwi5ZMSeIkisGVuRaGBB1FIz2s=", + "version": "6.3.1", + "resolved": "https://registry.npm.taobao.org/music-metadata/download/music-metadata-6.3.1.tgz", + "integrity": "sha1-uoSReMdBryECX2XCRmCt9uk7uCo=", "requires": { "content-type": "^1.0.4", "debug": "^4.1.0", - "file-type": "^12.4.2", + "file-type": "^13.1.2", "media-typer": "^1.1.0", - "strtok3": "^4.1.1", + "strtok3": "^6.0.0", "token-types": "^2.0.0" }, "dependencies": { @@ -7209,15 +7232,15 @@ } }, "music-metadata-browser": { - "version": "1.10.0", - "resolved": "https://registry.npm.taobao.org/music-metadata-browser/download/music-metadata-browser-1.10.0.tgz", - "integrity": "sha1-GpwLKqFseELW2y6+WGFxoeRCZEQ=", + "version": "2.0.3", + "resolved": "https://registry.npm.taobao.org/music-metadata-browser/download/music-metadata-browser-2.0.3.tgz", + "integrity": "sha1-CHD1ZbbqemrJ8kAqft5QbrPZCZ8=", "requires": { "assert": "^2.0.0", "buffer": "^5.2.1", "debug": "^4.0.1", - "music-metadata": "^5.3.1", - "readable-stream": "^3.3.0", + "music-metadata": "^6.3.1", + "readable-stream": "^3.5.0", "readable-web-to-node-stream": "^2.0.0", "remove": "^0.1.5", "typedarray-to-buffer": "^3.1.5" @@ -7936,6 +7959,11 @@ "sha.js": "^2.4.8" } }, + "peek-readable": { + "version": "3.1.0", + "resolved": "https://registry.npm.taobao.org/peek-readable/download/peek-readable-3.1.0.tgz", + "integrity": "sha1-JQsIt94J24Vz1/2OpHUhW7/xQ0g=" + }, "performance-now": { "version": "2.1.0", "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz", @@ -9929,13 +9957,14 @@ "dev": true }, "strtok3": { - "version": "4.1.1", - "resolved": "https://registry.npm.taobao.org/strtok3/download/strtok3-4.1.1.tgz", - "integrity": "sha1-dQQ7thdeuyLxDUjf6bBlYDRdxkc=", + "version": "6.0.0", + "resolved": "https://registry.npm.taobao.org/strtok3/download/strtok3-6.0.0.tgz", + "integrity": "sha1-1rkAhj2urP5sFyTG57s216WOg8g=", "requires": { - "@tokenizer/token": "^0.1.0", + "@tokenizer/token": "^0.1.1", + "@types/debug": "^4.1.5", "debug": "^4.1.1", - "then-read-stream": "^3.0.0" + "peek-readable": "^3.1.0" } }, "stylehacks": { @@ -10059,11 +10088,6 @@ } } }, - "then-read-stream": { - "version": "3.0.0", - "resolved": "https://registry.npm.taobao.org/then-read-stream/download/then-read-stream-3.0.0.tgz", - "integrity": "sha1-Sk7DfiPxgTW1b7xhZwtugZXlRbI=" - }, "thenify": { "version": "3.3.0", "resolved": "https://registry.npm.taobao.org/thenify/download/thenify-3.3.0.tgz", diff --git a/package.json b/package.json index 664c02d..5677bce 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "core-js": "^3.6.4", "crypto-js": "^3.1.9-1", "element-ui": "^2.13.0", - "music-metadata-browser": "^1.10.0", + "music-metadata-browser": "^2.0.3", "register-service-worker": "^1.6.2", "vue": "^2.6.11" }, diff --git a/public/index.html b/public/index.html index 9276d8b..ecf93e7 100644 --- a/public/index.html +++ b/public/index.html @@ -12,43 +12,7 @@ 音乐解锁 - By IXarea - + @@ -62,6 +26,7 @@ 音乐解锁采用了一些新特性！建议使用 Google Chrome Mozilla Firefox + Mozilla Firefox | 使用提示 diff --git a/src/App.vue b/src/App.vue index c99d547..ce92925 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,7 +9,7 @@ action="" drag multiple> - +
将文件拖到此处，或点击选择
本工具仅在浏览器内对文件进行解锁，无需消耗流量
@@ -28,7 +28,7 @@ 删除全部 - +