Compare commits
344 Commits
v1.20.0
...
legacy/htt
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e97699e6c | |||
| a810621762 | |||
| a41db79c35 | |||
| 87786d9aef | |||
| 22f5866050 | |||
| 04894fbcf5 | |||
| c17c624ba4 | |||
| bfe7249df8 | |||
| 13c570efe9 | |||
| b299846f0f | |||
| 59e9289d27 | |||
| 8dc29caa1b | |||
| 7fedf88654 | |||
| 5da0202425 | |||
| 6288d0b171 | |||
| 4248d20e8e | |||
| 0b413492ad | |||
| dc73561c8a | |||
| 949a2f6428 | |||
| bceaa05197 | |||
| 776cdac30d | |||
| 4333891cca | |||
| 8a89bbccf7 | |||
| fa4c69d228 | |||
| c25def8901 | |||
| 284a59b721 | |||
| 5fcba8619a | |||
| f3cd759276 | |||
| 9d3981e361 | |||
| 787326948b | |||
| 779251933c | |||
| 1efe835c69 | |||
| 5702978227 | |||
| fa3d742838 | |||
| c460cc2296 | |||
| 4e4af5e830 | |||
| 9a4e98063b | |||
| 8bfe04bb50 | |||
| 6774d54f5e | |||
| 9705f8489d | |||
| a7229cbe14 | |||
| 7577aba45e | |||
| d78fbe476e | |||
| bfe4b2bba7 | |||
| 7625a3aa52 | |||
| 30c8dcf730 | |||
| 00a3e8d35e | |||
| 4d01cdfa6c | |||
| f924b6c8e3 | |||
| 926d98174c | |||
| 41b3972f54 | |||
| 467f29e363 | |||
| 9cc13c3757 | |||
| f8ccb86156 | |||
| b316aa2301 | |||
| 5c49b28664 | |||
| dedf96afd3 | |||
| 3bb5bc2ca1 | |||
| c79fdd9887 | |||
| d7b821727d | |||
| 21c45faf20 | |||
| 92cab89d17 | |||
| fa160b2e90 | |||
| 308ac38e6b | |||
| a62cafb601 | |||
| bf9e3b5f48 | |||
| 3c6b3aeff0 | |||
| 37181a7b5e | |||
| 0b363d6487 | |||
| e9398adac3 | |||
| 6901713036 | |||
| 1d5b2997bd | |||
| 572a023aaa | |||
| 9187f1e240 | |||
| df13d7d0f3 | |||
| 85228fd7d2 | |||
| 17ba071057 | |||
| d7df4d7d10 | |||
| 7aa970cebc | |||
| f08f003cf4 | |||
| 9f99eded9e | |||
| c512f13009 | |||
| b475f780ff | |||
| 2294102006 | |||
| d69a07d025 | |||
| 4f4995c20c | |||
| b6894dca29 | |||
| 73f14e581d | |||
| 2f2e64af4a | |||
| 5710307ddc | |||
| 52ba2dc9ff | |||
| 926b9fb5e6 | |||
| a6c9b3381a | |||
| 5dc13a4698 | |||
| a69085c591 | |||
| a22f7fed21 | |||
| 8b7045fb1b | |||
| efd1b92514 | |||
| 969f6d7bba | |||
| 4f7c92d6a0 | |||
| 24d4a50574 | |||
| 7693a3ba4a | |||
| 7ca4dc5c85 | |||
| 21ff09b605 | |||
| fbf4b3b8b5 | |||
| 5812eb0147 | |||
| b5dbfaf686 | |||
| 6b7fd5ba63 | |||
| 73a049a7bc | |||
| ef0c30e23a | |||
| 59ed2326d9 | |||
| 07a02c8c82 | |||
| f1050cb676 | |||
| 7131893f1c | |||
| e4dfb2ff33 | |||
| 187fad6834 | |||
| 26df435db0 | |||
| 0bee281d1d | |||
| 26de5802a0 | |||
| c258a4855e | |||
| b7b6d50ba2 | |||
| 0376a30fbb | |||
| ca92031e89 | |||
| 986d2ad5b1 | |||
| d9b8d8c48d | |||
| 0ef34d7c71 | |||
| f87607d25d | |||
| cc0bfae067 | |||
| e7d2d04f5a | |||
| f4319ebc6b | |||
| a1f025e23c | |||
| c002263c3b | |||
| 2d69dfd333 | |||
| 9d99ffdc72 | |||
| a859b27eba | |||
| be26827609 | |||
| 457a8b5018 | |||
| 0442e427a6 | |||
| d45ca960b4 | |||
| 0bcfdbf39c | |||
| e3b5afda3e | |||
| 97297a2c49 | |||
| 11ac756da5 | |||
| a273d13086 | |||
| ca11120036 | |||
| 7dac9a2454 | |||
| 30e0e99467 | |||
| 275d8cb2b9 | |||
| 1cc46daead | |||
| 9048da22f9 | |||
| 70fa5aa217 | |||
| 6bf7f3b9eb | |||
| 67579877bc | |||
| 534f96921e | |||
| 22491ae0a0 | |||
| dd39bdd84c | |||
| 935a307235 | |||
| 517e9c0472 | |||
| b2c27b9fdb | |||
| 8acfabf9f8 | |||
| 375fb082f0 | |||
| 8b65f1d6e4 | |||
| d36fb592d0 | |||
| 575a643e55 | |||
| 07853d8b39 | |||
| da9cb8e2f5 | |||
| 22acaf688f | |||
| 063ba1b6c7 | |||
| 0229ccaa1e | |||
| df1e28546b | |||
| 1806d5a0a2 | |||
| 59efba4dec | |||
| 670ed62360 | |||
| 6a2b393b45 | |||
| 4488a3adba | |||
| eb7ef7ab36 | |||
| dcadf0a31a | |||
| 3dda8b7c2e | |||
| 947007cc59 | |||
| bf5ac285d3 | |||
| 5dfbdd4882 | |||
| 3cd1f79886 | |||
| 04234f0b3f | |||
| 7b30896091 | |||
| 2cf29fe88d | |||
| 09ce665df1 | |||
| 299f34d98e | |||
| 1af73a7cf8 | |||
| bcc7397f26 | |||
| 95ac01c9ba | |||
| edd7b80fcd | |||
| 231514ae0d | |||
| 0c948d5ea1 | |||
| 50117ea51b | |||
| 78d8160823 | |||
| 81b2303a6f | |||
| f7a09082a5 | |||
| ca318450b8 | |||
| e86739c99c | |||
| 92a3a55803 | |||
| 7479f2f697 | |||
| 371a7eb475 | |||
| 84f6e46efc | |||
| 110dbd3e18 | |||
| 4b7d94b1d5 | |||
| 9c4aa4bcb2 | |||
| a7fd8bc21b | |||
| 548f82ba0a | |||
| 127e325b2b | |||
| 40745d3946 | |||
| 2c337953eb | |||
| 61cb3135f3 | |||
| 1a2f20042b | |||
| 6e315b9af2 | |||
| 9438cd8b26 | |||
| 6eadc7f7e5 | |||
| 399c6e37ce | |||
| 16a32d1946 | |||
| 45b7422ea8 | |||
| 76c570413a | |||
| b9ea98c115 | |||
| 2c38b8a764 | |||
| 7af418a040 | |||
| bc40fc3d49 | |||
| 831aa3d391 | |||
| 2fe391beba | |||
| 47bd015549 | |||
| 2cb05c9d86 | |||
| 5a7774e7b1 | |||
| a5fe8bc589 | |||
| aed1bbc6d7 | |||
| 042083b112 | |||
| 61b04e9b42 | |||
| f655cdf953 | |||
| 4118b4b6c4 | |||
| 5cd2e78e88 | |||
| 70b5e579b1 | |||
| 71f2123f27 | |||
| 40fa1bac92 | |||
| 10049d1ee9 | |||
| faaf54d0b0 | |||
| 7224620350 | |||
| 549f0f7c7a | |||
| 529d5e165c | |||
| 35f6064b7a | |||
| c11ec3341a | |||
| b7142000ab | |||
| e3d41ccb95 | |||
| 1067417dbd | |||
| c554ed79b1 | |||
| 8fd6bdbdf3 | |||
| 92ecf6a0b0 | |||
| 8d475eda0a | |||
| 46d3a85cc0 | |||
| 72660f5aa1 | |||
| 8fa1c7e5a8 | |||
| f532398a9c | |||
| 6bb33453c7 | |||
| 170e2a696e | |||
| 1ff69c933c | |||
| 0935edd516 | |||
| e7e3e8abe0 | |||
| 3e77064cd3 | |||
| 4651d6d241 | |||
| 7418a1f4b2 | |||
| c6bba51166 | |||
| c8b149281b | |||
| 3276e318d8 | |||
| d0d739e61f | |||
| 3f3a5483ed | |||
| c90ab00c09 | |||
| 5e29235c03 | |||
| e81671f4da | |||
| fbf92971a5 | |||
| 0c06d59a47 | |||
| 5237311f1f | |||
| 7d355ea1f2 | |||
| ad8b9c9bf7 | |||
| f2b532d8fa | |||
| c6ee222e43 | |||
| 9739dbe27f | |||
| 1d6f1d2216 | |||
| 563daae11a | |||
| 451d33707a | |||
| ce264c5d65 | |||
| 9b6e3c850a | |||
| ae1e106ccd | |||
| b362118207 | |||
| 73287cf8b2 | |||
| 42ad78c6cc | |||
| 031875ad86 | |||
| 27086e759f | |||
| 913c69a33d | |||
| 2eaa660a6d | |||
| d811ebadb4 | |||
| 774815c4e5 | |||
| a5bdb257d4 | |||
| 72c8c49edf | |||
| 68d985acba | |||
| 76a7b303fa | |||
| b5472c11df | |||
| 0c45f9850b | |||
| 999d4ab4ab | |||
| 5069913c56 | |||
| 88dea85f03 | |||
| 85793d70f7 | |||
| 12825d8bf2 | |||
| 53f5bda382 | |||
| c0d7972da3 | |||
| 278618bc83 | |||
| 03c1ab0e98 | |||
| 8b5a094eb5 | |||
| 1f52995dc4 | |||
| d30755e5fa | |||
| 82bcadcd64 | |||
| 3e3fdb3c3f | |||
| b67a4ed9bb | |||
| 06b9cf9255 | |||
| 4284bcc329 | |||
| aacc2d261b | |||
| 92da06eb96 | |||
| 897cfd3c7d | |||
| c722896a73 | |||
| 31a7588cee | |||
| da69d4c5a6 | |||
| ce0ee82648 | |||
| c837f104f7 | |||
| 2f73548701 | |||
| efb92a3513 | |||
| 98fc8e3b9d | |||
| 6f0d4fbbe4 | |||
| dab97293be | |||
| f2149e3b72 | |||
| 48b0469a4e | |||
| 1add1a2233 | |||
| 9f4187e64a | |||
| f1bbae69ac | |||
| 98a2c0d82b | |||
| d0733e25dc | |||
| 34aded725d | |||
| bb385d440e | |||
| 1ed43e11ad | |||
| bf8b88cb60 | |||
| f0f85955dc |
@ -1,7 +1,8 @@
|
|||||||
root = true
|
root = true
|
||||||
|
|
||||||
[*]
|
[*]
|
||||||
indent_style = tab
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|||||||
3
.eslintignore
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
.eslintrc.js
|
||||||
|
rollup.main.config.ts
|
||||||
|
rollup.preload.config.ts
|
||||||
69
.eslintrc.js
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
module.exports = {
|
||||||
|
extends: [
|
||||||
|
'eslint:recommended',
|
||||||
|
'plugin:import/recommended',
|
||||||
|
'plugin:import/typescript',
|
||||||
|
'plugin:@typescript-eslint/eslint-recommended',
|
||||||
|
'plugin:@typescript-eslint/recommended',
|
||||||
|
'plugin:@typescript-eslint/recommended-requiring-type-checking',
|
||||||
|
],
|
||||||
|
plugins: ['@typescript-eslint', 'import'],
|
||||||
|
parser: '@typescript-eslint/parser',
|
||||||
|
parserOptions: {
|
||||||
|
project: './tsconfig.json',
|
||||||
|
tsconfigRootDir: __dirname,
|
||||||
|
sourceType: 'module',
|
||||||
|
ecmaVersion: 'latest'
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
'arrow-parens': ['error', 'always'],
|
||||||
|
'object-curly-spacing': ['error', 'always'],
|
||||||
|
'@typescript-eslint/no-floating-promises': 'off',
|
||||||
|
'@typescript-eslint/no-misused-promises': ['off', { checksVoidReturn: false }],
|
||||||
|
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
|
||||||
|
"@typescript-eslint/no-non-null-assertion": "off",
|
||||||
|
'import/first': 'error',
|
||||||
|
'import/newline-after-import': 'error',
|
||||||
|
'import/no-default-export': 'off',
|
||||||
|
'import/no-duplicates': 'error',
|
||||||
|
'import/order': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
'groups': ['builtin', 'external', ['internal', 'index', 'sibling'], 'parent', 'type'],
|
||||||
|
'newlines-between': 'always-and-inside-groups',
|
||||||
|
'alphabetize': {order: 'ignore', caseInsensitive: false}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
'import/prefer-default-export': 'off',
|
||||||
|
'camelcase': ['error', {properties: 'never'}],
|
||||||
|
'class-methods-use-this': 'off',
|
||||||
|
'lines-around-comment': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
beforeBlockComment: false,
|
||||||
|
afterBlockComment: false,
|
||||||
|
beforeLineComment: false,
|
||||||
|
afterLineComment: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'max-len': 'off',
|
||||||
|
'no-mixed-operators': 'error',
|
||||||
|
'no-multi-spaces': ['error', {ignoreEOLComments: true}],
|
||||||
|
'no-tabs': 'error',
|
||||||
|
'no-void': 'error',
|
||||||
|
'no-empty': 'off',
|
||||||
|
'prefer-promise-reject-errors': 'off',
|
||||||
|
'quotes': ['error', 'single', {
|
||||||
|
avoidEscape: true,
|
||||||
|
allowTemplateLiterals: false,
|
||||||
|
}],
|
||||||
|
'quote-props': ['error', 'consistent'],
|
||||||
|
'semi': ['error', 'always'],
|
||||||
|
},
|
||||||
|
env: {
|
||||||
|
browser: true,
|
||||||
|
node: true,
|
||||||
|
es6: true,
|
||||||
|
},
|
||||||
|
ignorePatterns: ['dist', 'node_modules'],
|
||||||
|
};
|
||||||
75
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
name: Bug Report
|
||||||
|
description: Report a YouTube Music bug
|
||||||
|
title: "[Bug]: "
|
||||||
|
labels: "bug :beetle:"
|
||||||
|
body:
|
||||||
|
- type: checkboxes
|
||||||
|
attributes:
|
||||||
|
label: Preflight Checklist
|
||||||
|
description: Please ensure you've completed all of the following.
|
||||||
|
options:
|
||||||
|
- label: I use the latest version of YouTube Music (Application).
|
||||||
|
required: true
|
||||||
|
- label: I have searched the [issue tracker](https://github.com/th-ch/youtube-music/issues) for a bug report that matches the one I want to file, without success.
|
||||||
|
required: true
|
||||||
|
- label: I understand that **th-ch/youtube-music has NO affiliation with Google or YouTube**
|
||||||
|
required: true
|
||||||
|
- type: input
|
||||||
|
attributes:
|
||||||
|
label: YouTube Music (Application) Version
|
||||||
|
description: |
|
||||||
|
What version of the YouTube Music Application are you using?
|
||||||
|
|
||||||
|
Note: Please check if this issue is reproducible with the latest stable release.
|
||||||
|
placeholder: 2.0.0
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
attributes:
|
||||||
|
label: What operating system are you using?
|
||||||
|
options:
|
||||||
|
- Windows
|
||||||
|
- macOS
|
||||||
|
- Ubuntu
|
||||||
|
- Other Linux
|
||||||
|
- Other (specify below)
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: input
|
||||||
|
attributes:
|
||||||
|
label: Operating System Version
|
||||||
|
description: What operating system version are you using? On Windows, click the Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
|
||||||
|
placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
attributes:
|
||||||
|
label: What arch are you using?
|
||||||
|
options:
|
||||||
|
- x64
|
||||||
|
- ia32
|
||||||
|
- arm64 (including Apple Silicon)
|
||||||
|
- Other (specify below)
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: input
|
||||||
|
attributes:
|
||||||
|
label: Last Known Working YouTube Music (Application) version
|
||||||
|
description: (If applicable) What is the last version of YouTube Music this worked in?
|
||||||
|
placeholder: 1.20.0
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Expected Behavior
|
||||||
|
description: A clear and concise description of what you expected to happen. (Add a replication step if applicable)
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Actual Behavior
|
||||||
|
description: A clear description of what actually happens.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Additional Information
|
||||||
|
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.
|
||||||
38
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
name: Feature Request
|
||||||
|
description: Suggest an idea for YouTube Music
|
||||||
|
title: "[Feature Request]: "
|
||||||
|
labels: "enhancement :sparkles:"
|
||||||
|
body:
|
||||||
|
- type: checkboxes
|
||||||
|
attributes:
|
||||||
|
label: Preflight Checklist
|
||||||
|
description: Please ensure you've completed all of the following.
|
||||||
|
options:
|
||||||
|
- label: I use the latest version of YouTube Music (Application).
|
||||||
|
required: true
|
||||||
|
- label: I have searched the [issue tracker](https://github.com/th-ch/youtube-music/issues) for a feature request that matches the one I want to file, without success.
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Problem Description
|
||||||
|
description: Please add a clear and concise description of the problem you are seeking to solve with this feature request.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Proposed Solution
|
||||||
|
description: Describe the solution you'd like in a clear and concise manner.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Alternatives Considered
|
||||||
|
description: A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
attributes:
|
||||||
|
label: Additional Information
|
||||||
|
description: Add any other context about the problem here.
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
177
.github/workflows/build.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
NODE_VERSION: "16.x"
|
NODE_VERSION: "20.x"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@ -18,92 +18,65 @@ jobs:
|
|||||||
os: [ macos-latest, ubuntu-latest, windows-latest ]
|
os: [ macos-latest, ubuntu-latest, windows-latest ]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install pnpm
|
||||||
|
uses: pnpm/action-setup@v2
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
run_install: false
|
||||||
|
|
||||||
- name: Setup NodeJS
|
- name: Setup NodeJS
|
||||||
uses: actions/setup-node@v3
|
if: startsWith(matrix.os, 'macOS') != true
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
cache: 'pnpm'
|
||||||
|
|
||||||
|
- name: Setup NodeJS for macOS
|
||||||
|
if: startsWith(matrix.os, 'macOS')
|
||||||
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
|
||||||
- name: Expose yarn config as "$GITHUB_OUTPUT"
|
|
||||||
id: yarn-config
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "CACHE_FOLDER=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
# Yarn rotates the downloaded cache archives, @see https://github.com/actions/setup-node/issues/325
|
|
||||||
# Yarn cache is also reusable between arch and os.
|
|
||||||
- name: Restore yarn cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
id: yarn-download-cache
|
|
||||||
with:
|
|
||||||
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
|
|
||||||
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
yarn-download-cache-
|
|
||||||
|
|
||||||
# Invalidated on yarn.lock changes
|
|
||||||
- name: Restore yarn install state
|
|
||||||
id: yarn-install-state-cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: .yarn/ci-cache/
|
|
||||||
key: ${{ runner.os }}-yarn-install-state-cache-${{ hashFiles('yarn.lock', '.yarnrc.yml') }}
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
run: pnpm install --frozen-lockfile
|
||||||
|
|
||||||
|
# Only rollup build without release if it is a fork
|
||||||
|
- name: Rollup Build
|
||||||
|
if: github.repository == 'th-ch/youtube-music' && github.event_name == 'pull_request'
|
||||||
run: |
|
run: |
|
||||||
yarn install --immutable --inline-builds
|
pnpm build
|
||||||
|
|
||||||
|
# Build and release if it's the main repository and is not pull-request
|
||||||
|
- name: Build and release on Mac
|
||||||
|
if: startsWith(matrix.os, 'macOS') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
|
||||||
env:
|
env:
|
||||||
# CI optimizations. Overrides yarnrc.yml options (or their defaults) in the CI action.
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
YARN_ENABLE_GLOBAL_CACHE: "false" # Use local cache folder to keep downloaded archives
|
run: |
|
||||||
YARN_NM_MODE: "hardlinks-local" # Hardlinks-(local|global) reduces io / node_modules size
|
pnpm release:mac
|
||||||
YARN_INSTALL_STATE_PATH: .yarn/ci-cache/install-state.gz # Very small speedup when lock does not change
|
|
||||||
|
- name: Build and release on Linux
|
||||||
|
if: startsWith(matrix.os, 'ubuntu') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
pnpm release:linux
|
||||||
|
|
||||||
|
- name: Build and release on Windows
|
||||||
|
if: startsWith(matrix.os, 'windows') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
pnpm release:win
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
uses: GabrielBB/xvfb-action@v1
|
uses: coactions/setup-xvfb@v1
|
||||||
env:
|
env:
|
||||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
|
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
|
||||||
with:
|
with:
|
||||||
run: yarn test
|
run: pnpm test:debug
|
||||||
|
|
||||||
# Build and release if it's the main repository
|
|
||||||
- name: Build and release on Mac
|
|
||||||
if: startsWith(matrix.os, 'macOS') && github.repository == 'th-ch/youtube-music'
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
|
||||||
run: |
|
|
||||||
yarn run release:mac
|
|
||||||
|
|
||||||
- name: Build and release on Linux
|
|
||||||
if: startsWith(matrix.os, 'ubuntu') && github.repository == 'th-ch/youtube-music'
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
|
||||||
run: |
|
|
||||||
yarn run release:linux
|
|
||||||
|
|
||||||
- name: Build and release on Windows
|
|
||||||
if: startsWith(matrix.os, 'windows') && github.repository == 'th-ch/youtube-music'
|
|
||||||
env:
|
|
||||||
GH_TOKEN: ${{ secrets.GH_TOKEN }}
|
|
||||||
run: |
|
|
||||||
yarn run release:win
|
|
||||||
|
|
||||||
# Only build without release if it is a fork
|
|
||||||
- name: Build on Mac
|
|
||||||
if: startsWith(matrix.os, 'macOS') && github.repository != 'th-ch/youtube-music'
|
|
||||||
run: |
|
|
||||||
yarn run build:mac
|
|
||||||
|
|
||||||
- name: Build on Linux
|
|
||||||
if: startsWith(matrix.os, 'ubuntu') && github.repository != 'th-ch/youtube-music'
|
|
||||||
run: |
|
|
||||||
yarn run build:linux
|
|
||||||
|
|
||||||
- name: Build on Windows
|
|
||||||
if: startsWith(matrix.os, 'windows') && github.repository != 'th-ch/youtube-music'
|
|
||||||
run: |
|
|
||||||
yarn run build:win
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -111,49 +84,31 @@ jobs:
|
|||||||
if: github.repository == 'th-ch/youtube-music' && github.ref == 'refs/heads/master'
|
if: github.repository == 'th-ch/youtube-music' && github.ref == 'refs/heads/master'
|
||||||
needs: build
|
needs: build
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Install pnpm
|
||||||
|
uses: pnpm/action-setup@v2
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
run_install: false
|
||||||
|
|
||||||
- name: Setup NodeJS
|
- name: Setup NodeJS
|
||||||
uses: actions/setup-node@v3
|
if: startsWith(matrix.os, 'macOS') != true
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
cache: 'pnpm'
|
||||||
|
|
||||||
|
- name: Setup NodeJS for macOS
|
||||||
|
if: startsWith(matrix.os, 'macOS')
|
||||||
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
|
||||||
- name: Expose yarn config as "$GITHUB_OUTPUT"
|
|
||||||
id: yarn-config
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "CACHE_FOLDER=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
# Yarn rotates the downloaded cache archives, @see https://github.com/actions/setup-node/issues/325
|
|
||||||
# Yarn cache is also reusable between arch and os.
|
|
||||||
- name: Restore yarn cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
id: yarn-download-cache
|
|
||||||
with:
|
|
||||||
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
|
|
||||||
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
yarn-download-cache-
|
|
||||||
|
|
||||||
# Invalidated on yarn.lock changes
|
|
||||||
- name: Restore yarn install state
|
|
||||||
id: yarn-install-state-cache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: .yarn/ci-cache/
|
|
||||||
key: ${{ runner.os }}-yarn-install-state-cache-${{ hashFiles('yarn.lock', '.yarnrc.yml') }}
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
run: pnpm install --frozen-lockfile
|
||||||
run: |
|
|
||||||
yarn install --immutable --inline-builds
|
|
||||||
env:
|
|
||||||
# CI optimizations. Overrides yarnrc.yml options (or their defaults) in the CI action.
|
|
||||||
YARN_ENABLE_GLOBAL_CACHE: "false" # Use local cache folder to keep downloaded archives
|
|
||||||
YARN_NM_MODE: "hardlinks-local" # Hardlinks-(local|global) reduces io / node_modules size
|
|
||||||
YARN_INSTALL_STATE_PATH: .yarn/ci-cache/install-state.gz # Very small speedup when lock does not change
|
|
||||||
|
|
||||||
- name: Get version
|
- name: Get version
|
||||||
run: |
|
run: |
|
||||||
@ -169,7 +124,7 @@ jobs:
|
|||||||
uses: cardinalby/git-get-release-action@v1
|
uses: cardinalby/git-get-release-action@v1
|
||||||
id: get_draft_release
|
id: get_draft_release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
latest: true
|
latest: true
|
||||||
draft: true
|
draft: true
|
||||||
@ -194,11 +149,11 @@ jobs:
|
|||||||
- name: Update changelog
|
- name: Update changelog
|
||||||
if: ${{ env.VERSION_HASH == '' }}
|
if: ${{ env.VERSION_HASH == '' }}
|
||||||
run: |
|
run: |
|
||||||
yarn changelog
|
pnpm changelog
|
||||||
|
|
||||||
- name: Commit changelog
|
- name: Commit changelog
|
||||||
if: ${{ env.VERSION_HASH == '' }}
|
if: ${{ env.VERSION_HASH == '' }}
|
||||||
uses: stefanzweifel/git-auto-commit-action@v4
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
with:
|
with:
|
||||||
commit_message: Update changelog for ${{ env.VERSION_TAG }}
|
commit_message: Update changelog for ${{ env.VERSION_TAG }}
|
||||||
file_pattern: "changelog.md"
|
file_pattern: "changelog.md"
|
||||||
|
|||||||
2
.github/workflows/dependency-review.yml
vendored
@ -15,6 +15,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout Repository"
|
- name: "Checkout Repository"
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: "Dependency Review"
|
- name: "Dependency Review"
|
||||||
uses: actions/dependency-review-action@v3
|
uses: actions/dependency-review-action@v3
|
||||||
|
|||||||
20
.github/workflows/winget-cla.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
name: Submit CLA to Winget PR
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
pr_url:
|
||||||
|
description: "Specific PR URL"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
comment:
|
||||||
|
name: Comment to PR
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Submit CLA to Windows Package Manager Community Repository Pull Request
|
||||||
|
run: gh pr comment $PR_URL --body "@microsoft-github-policy-service agree"
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.WINGET_ACC_TOKEN }}
|
||||||
|
PR_URL: ${{ inputs.pr_url }}
|
||||||
4
.github/workflows/winget-submission.yml
vendored
@ -13,13 +13,13 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
winget:
|
winget:
|
||||||
name: Publish winget package
|
name: Publish winget package
|
||||||
runs-on: windows-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Submit package to Windows Package Manager Community Repository
|
- name: Submit package to Windows Package Manager Community Repository
|
||||||
uses: vedantmgoyal2009/winget-releaser@v2
|
uses: vedantmgoyal2009/winget-releaser@v2
|
||||||
with:
|
with:
|
||||||
identifier: th-ch.YouTubeMusic
|
identifier: th-ch.YouTubeMusic
|
||||||
installers-regex: '^YouTube-Music-Setup-[\d\.]+\.exe$'
|
installers-regex: '^YouTube-Music-Web-Setup-[\d\.]+\.exe$'
|
||||||
version: ${{ inputs.tag_name || github.event.release.tag_name }}
|
version: ${{ inputs.tag_name || github.event.release.tag_name }}
|
||||||
release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
|
release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
|
||||||
token: ${{ secrets.WINGET_ACC_TOKEN }}
|
token: ${{ secrets.WINGET_ACC_TOKEN }}
|
||||||
|
|||||||
1
.gitignore
vendored
@ -1,5 +1,6 @@
|
|||||||
node_modules
|
node_modules
|
||||||
/dist
|
/dist
|
||||||
|
/pack
|
||||||
electron-builder.yml
|
electron-builder.yml
|
||||||
.vscode/settings.json
|
.vscode/settings.json
|
||||||
.idea
|
.idea
|
||||||
|
|||||||
5
.prettierrc
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"tabWidth": 2,
|
||||||
|
"useTabs": false,
|
||||||
|
"singleQuote": true
|
||||||
|
}
|
||||||
@ -1,24 +0,0 @@
|
|||||||
diff --git a/index.js b/index.js
|
|
||||||
index c8f2fd4467c11b484fe654f7f250e2ba37e8100d..c9ae1ed3d3c7683b14dfe0eee801f5a07585d2aa 100644
|
|
||||||
--- a/index.js
|
|
||||||
+++ b/index.js
|
|
||||||
@@ -5,7 +5,16 @@ if (typeof electron === 'string') {
|
|
||||||
throw new TypeError('Not running in an Electron environment!');
|
|
||||||
}
|
|
||||||
|
|
||||||
-const isEnvSet = 'ELECTRON_IS_DEV' in process.env;
|
|
||||||
-const getFromEnv = Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
|
|
||||||
+const isDev = () => {
|
|
||||||
+ if ('ELECTRON_IS_DEV' in process.env) {
|
|
||||||
+ return Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
-module.exports = isEnvSet ? getFromEnv : !electron.app.isPackaged;
|
|
||||||
+ if (process.type === 'browser') {
|
|
||||||
+ return !electron.app.isPackaged;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 'npm_package_name' in process.env;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+module.exports = isDev();
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
/* eslint-disable */
|
|
||||||
//prettier-ignore
|
|
||||||
module.exports = {
|
|
||||||
name: "@yarnpkg/plugin-after-install",
|
|
||||||
factory: function (require) {
|
|
||||||
var plugin=(()=>{var g=Object.create,r=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var k=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var I=t=>r(t,"__esModule",{value:!0});var i=t=>{if(typeof require!="undefined")return require(t);throw new Error('Dynamic require of "'+t+'" is not supported')};var h=(t,o)=>{for(var e in o)r(t,e,{get:o[e],enumerable:!0})},w=(t,o,e)=>{if(o&&typeof o=="object"||typeof o=="function")for(let n of C(o))!y.call(t,n)&&n!=="default"&&r(t,n,{get:()=>o[n],enumerable:!(e=x(o,n))||e.enumerable});return t},a=t=>w(I(r(t!=null?g(k(t)):{},"default",t&&t.__esModule&&"default"in t?{get:()=>t.default,enumerable:!0}:{value:t,enumerable:!0})),t);var j={};h(j,{default:()=>b});var c=a(i("@yarnpkg/core")),m={afterInstall:{description:"Hook that will always run after install",type:c.SettingsType.STRING,default:""}};var u=a(i("clipanion")),d=a(i("@yarnpkg/core"));var p=a(i("@yarnpkg/shell")),l=async(t,o)=>{var f;let e=t.get("afterInstall"),n=!!((f=t.projectCwd)==null?void 0:f.endsWith(`dlx-${process.pid}`));return e&&!n?(o&&console.log("Running `afterInstall` hook..."),(0,p.execute)(e,[],{cwd:t.projectCwd||void 0})):0};var s=class extends u.Command{async execute(){let o=await d.Configuration.find(this.context.cwd,this.context.plugins);return l(o,!1)}};s.paths=[["after-install"]];var P={configuration:m,commands:[s],hooks:{afterAllInstalled:async t=>{if(await l(t.configuration,!0))throw new Error("The `afterInstall` hook failed, see output above.")}}},b=P;return j;})();
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
873
.yarn/releases/yarn-3.4.1.cjs
vendored
@ -1,9 +0,0 @@
|
|||||||
afterInstall: yarn postinstall
|
|
||||||
|
|
||||||
nodeLinker: node-modules
|
|
||||||
|
|
||||||
plugins:
|
|
||||||
- path: .yarn/plugins/@yarnpkg/plugin-after-install.cjs
|
|
||||||
spec: "https://raw.githubusercontent.com/mhassan1/yarn-plugin-after-install/v0.3.1/bundles/@yarnpkg/plugin-after-install.js"
|
|
||||||
|
|
||||||
yarnPath: .yarn/releases/yarn-3.4.1.cjs
|
|
||||||
6
assets/youtube-music.svg
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 176 176" width="32" height="32">
|
||||||
|
<circle fill="red" cx="88" cy="88" r="88"/>
|
||||||
|
<path fill="#FFF"
|
||||||
|
d="M88 46c23.1 0 42 18.8 42 42s-18.8 42-42 42-42-18.8-42-42 18.9-42 42-42m0-4c-25.4 0-46 20.6-46 46s20.6 46 46 46 46-20.6 46-46-20.6-46-46-46z"/>
|
||||||
|
<path fill="#FFF" d="M72 111l39-24-39-22z"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 353 B |
224
changelog.md
@ -2,8 +2,232 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||||
|
|
||||||
|
#### [v2.2.0](https://github.com/th-ch/youtube-music/compare/v2.1.3...v2.2.0)
|
||||||
|
|
||||||
|
- feat(ambient-mode): add config for `ambient-mode` plugin [`#1349`](https://github.com/th-ch/youtube-music/pull/1349)
|
||||||
|
- bump deps [`4248d20`](https://github.com/th-ch/youtube-music/commit/4248d20e8ef926ce7b1d07eb83743755a341d9f6)
|
||||||
|
- Update changelog for v2.1.3 [`dc73561`](https://github.com/th-ch/youtube-music/commit/dc73561c8a8acfc8ba91aff2dc78e4267869f2fd)
|
||||||
|
- Bump version to 2.2.0 [`6288d0b`](https://github.com/th-ch/youtube-music/commit/6288d0b171a65ea015922cdf3af6c7bd9a1f269b)
|
||||||
|
|
||||||
|
#### [v2.1.3](https://github.com/th-ch/youtube-music/compare/v2.1.2...v2.1.3)
|
||||||
|
|
||||||
|
> 23 October 2023
|
||||||
|
|
||||||
|
- fix: fixed bugs in downloader [`#1342`](https://github.com/th-ch/youtube-music/pull/1342)
|
||||||
|
- feat(discord): rename `Listen Along` to `Play on YTM` [`#1341`](https://github.com/th-ch/youtube-music/issues/1341)
|
||||||
|
- chore(deps): bump deps [`4333891`](https://github.com/th-ch/youtube-music/commit/4333891ccabe42aedf756fd48618be715db13262)
|
||||||
|
- Update changelog for v2.1.2 [`fa4c69d`](https://github.com/th-ch/youtube-music/commit/fa4c69d228d4e06a7858e2b22fcdfa075a8ca766)
|
||||||
|
- fix(store): fix listenAlong statement [`bceaa05`](https://github.com/th-ch/youtube-music/commit/bceaa05197d47a4a4bbd22e767d1e4d6ec277514)
|
||||||
|
|
||||||
|
#### [v2.1.2](https://github.com/th-ch/youtube-music/compare/v2.1.1...v2.1.2)
|
||||||
|
|
||||||
|
> 19 October 2023
|
||||||
|
|
||||||
|
- feat(in-app-menu): add an option to hide the window controls [`#1335`](https://github.com/th-ch/youtube-music/pull/1335)
|
||||||
|
- fix: fixed an issue where the album name was missing [`#1334`](https://github.com/th-ch/youtube-music/pull/1334)
|
||||||
|
- chore(deps): update dependency electron to v27.0.1 [`#1331`](https://github.com/th-ch/youtube-music/pull/1331)
|
||||||
|
- fix: fixed an issue where only the first 100 songs in a playlist were downloaded [`#1329`](https://github.com/th-ch/youtube-music/pull/1329)
|
||||||
|
- Updated readme plugins list [`#1326`](https://github.com/th-ch/youtube-music/pull/1326)
|
||||||
|
- QOL: Move source code under the src directory. [`#1318`](https://github.com/th-ch/youtube-music/pull/1318)
|
||||||
|
- feat: migrate from `npm` to `pnpm` [`#1316`](https://github.com/th-ch/youtube-music/pull/1316)
|
||||||
|
- fix: fix unresponsive (fix #1325) [`#1325`](https://github.com/th-ch/youtube-music/issues/1325)
|
||||||
|
- fix(blocker): remove the `app.isPackaged` check (fix #1315) [`#1315`](https://github.com/th-ch/youtube-music/issues/1315)
|
||||||
|
- fix(discord): `Discord RPC fails if a song's title is only one character` (fix #1314) [`#1314`](https://github.com/th-ch/youtube-music/issues/1314)
|
||||||
|
- chore(deps): Bump @rollup/plugin-commonjs, pnpm version, Remove ytpl [`9705f84`](https://github.com/th-ch/youtube-music/commit/9705f8489d7bf262bfd8b15ab84c2d3485f10eae)
|
||||||
|
- chore(deps): Bump rollup, @xhayper/discord-rpc version [`00a3e8d`](https://github.com/th-ch/youtube-music/commit/00a3e8d35ec335e1913be19f30ae09dbe0b7acdd)
|
||||||
|
- chore(deps): update dependency rollup to v4.1.4 [`6774d54`](https://github.com/th-ch/youtube-music/commit/6774d54f5eca432edc2e11743d9d1b1c2fda9ac8)
|
||||||
|
|
||||||
|
#### [v2.1.1](https://github.com/th-ch/youtube-music/compare/v2.1.0...v2.1.1)
|
||||||
|
|
||||||
|
> 14 October 2023
|
||||||
|
|
||||||
|
- hotfix(downloader): can't get an album title (fix #1313) [`#1313`](https://github.com/th-ch/youtube-music/issues/1313)
|
||||||
|
- Update changelog for v2.1.0 [`92cab89`](https://github.com/th-ch/youtube-music/commit/92cab89d17175741e60e65ea61633e23ebdc1f45)
|
||||||
|
- Bump version to 2.1.1 [`3bb5bc2`](https://github.com/th-ch/youtube-music/commit/3bb5bc2ca1856f4e222ee1e01e865f1ab804fdba)
|
||||||
|
- Add "about" menu to show app version [`21c45fa`](https://github.com/th-ch/youtube-music/commit/21c45faf2043cf72a7c14d5cf6c8d848d0448528)
|
||||||
|
|
||||||
|
#### [v2.1.0](https://github.com/th-ch/youtube-music/compare/v2.0.4...v2.1.0)
|
||||||
|
|
||||||
|
> 14 October 2023
|
||||||
|
|
||||||
|
- feat(downloader): Added support for audio format auto-detection [`#1310`](https://github.com/th-ch/youtube-music/pull/1310)
|
||||||
|
- feat(in-app-menu): enable in-app-menu by default (in Windows) [`#1311`](https://github.com/th-ch/youtube-music/pull/1311)
|
||||||
|
- fix: winget publish [`#1307`](https://github.com/th-ch/youtube-music/pull/1307)
|
||||||
|
- hotfix(downloader): fix invalid query selector (fix #1308) [`#1308`](https://github.com/th-ch/youtube-music/issues/1308)
|
||||||
|
- chore(deps): bump dependencies [`3c6b3ae`](https://github.com/th-ch/youtube-music/commit/3c6b3aeff0aae32adb2f2ad9c091b0a9701d3c24)
|
||||||
|
- chore(actions): create winget-cla.yml [`37181a7`](https://github.com/th-ch/youtube-music/commit/37181a7b5e2aa5bed6a36298eac3a66aac2762b8)
|
||||||
|
- Update changelog for v2.0.4 [`e9398ad`](https://github.com/th-ch/youtube-music/commit/e9398adac34a8abb11801e32999a915a8be0ece6)
|
||||||
|
|
||||||
|
#### [v2.0.4](https://github.com/th-ch/youtube-music/compare/v2.0.3...v2.0.4)
|
||||||
|
|
||||||
|
> 12 October 2023
|
||||||
|
|
||||||
|
- hotfix(adblocker): fix `ipcRenderer.sendSync() with ...` [`#1301`](https://github.com/th-ch/youtube-music/pull/1301)
|
||||||
|
- fix(downloader): Korean filename is broken on non-macOS devices [`#1297`](https://github.com/th-ch/youtube-music/pull/1297)
|
||||||
|
- chore(deps): bump deps [`b6894dc`](https://github.com/th-ch/youtube-music/commit/b6894dca2974c63fa2945d3a4995665d11eb2a78)
|
||||||
|
- fix: bump dependencies [`7aa970c`](https://github.com/th-ch/youtube-music/commit/7aa970cebc8e1407ff6937b402ba303e14c73efd)
|
||||||
|
- fix(downloader): private playlist download [`1d5b299`](https://github.com/th-ch/youtube-music/commit/1d5b2997bd0c72c1c007c57b145509e4a8f77fef)
|
||||||
|
|
||||||
|
#### [v2.0.3](https://github.com/th-ch/youtube-music/compare/v2.0.2...v2.0.3)
|
||||||
|
|
||||||
|
> 10 October 2023
|
||||||
|
|
||||||
|
- feat(discord): add `Hide GitHub link Button` [`#1293`](https://github.com/th-ch/youtube-music/pull/1293)
|
||||||
|
- feat(deps): bundle `youtubei.js` (temporary solution) [`#1292`](https://github.com/th-ch/youtube-music/pull/1292)
|
||||||
|
- fix(mpris): fixed an issue where MPRIS information was incorrect [`#1291`](https://github.com/th-ch/youtube-music/pull/1291)
|
||||||
|
- fix(discord): fixed an issue where `timeChanged` was not being applied to Discord activities [`#1290`](https://github.com/th-ch/youtube-music/pull/1290)
|
||||||
|
- Fix: typo in README [`#1286`](https://github.com/th-ch/youtube-music/pull/1286)
|
||||||
|
- fix: chore(deps): update dependency @jellybrick/mpris-service to 2.1.4 (fix #971) [`#971`](https://github.com/th-ch/youtube-music/issues/971)
|
||||||
|
- chore(deps): Bump `@cliqz/adblocker-electron` to 1.26.8 (fix #1269) [`#1269`](https://github.com/th-ch/youtube-music/issues/1269)
|
||||||
|
- fix: missing icons taskbar-mediacontrol [`fbf4b3b`](https://github.com/th-ch/youtube-music/commit/fbf4b3b8b5e39c61975e67efc990c45f62de76d8)
|
||||||
|
- remove: migration scripts [`52ba2dc`](https://github.com/th-ch/youtube-music/commit/52ba2dc9ffd8e235251d1279686f55e33b3fa3bb)
|
||||||
|
- feat: add migration script [`926b9fb`](https://github.com/th-ch/youtube-music/commit/926b9fb5e6db69b69935ec5d7be9a76a84e54ceb)
|
||||||
|
|
||||||
|
#### [v2.0.2](https://github.com/th-ch/youtube-music/compare/v2.0.1...v2.0.2)
|
||||||
|
|
||||||
|
> 8 October 2023
|
||||||
|
|
||||||
|
- fix: discord-rpc [`#1278`](https://github.com/th-ch/youtube-music/pull/1278)
|
||||||
|
- Bump version to 2.0.2 [`b5dbfaf`](https://github.com/th-ch/youtube-music/commit/b5dbfaf68691a546d72f5c1818fd3a44802eb0fa)
|
||||||
|
- Merge pull request #1272 from th-ch/feat/resolves-1265 [`6b7fd5b`](https://github.com/th-ch/youtube-music/commit/6b7fd5ba630888de08004105179c059c6d93e028)
|
||||||
|
- Merge pull request #1279 from th-ch/fix/1274 [`73a049a`](https://github.com/th-ch/youtube-music/commit/73a049a7bc5161f0d53c252cf510f1e2a6f6eeb3)
|
||||||
|
|
||||||
|
#### [v2.0.1](https://github.com/th-ch/youtube-music/compare/v2.0.0...v2.0.1)
|
||||||
|
|
||||||
|
> 8 October 2023
|
||||||
|
|
||||||
|
- Update changelog for v2.0.0 [`2d69dfd`](https://github.com/th-ch/youtube-music/commit/2d69dfd333c3223ecc7de13a0abc98fd99aa3a2b)
|
||||||
|
- hotfix: hotfix for #1267 [`c002263`](https://github.com/th-ch/youtube-music/commit/c002263c3bdd51890b8ffb431283afb60405d8fe)
|
||||||
|
- Bump version to 2.0.1 [`a1f025e`](https://github.com/th-ch/youtube-music/commit/a1f025e23c599fe5eb63b32ea38ee81200d232d6)
|
||||||
|
|
||||||
|
### [v2.0.0](https://github.com/th-ch/youtube-music/compare/v1.20.0...v2.0.0)
|
||||||
|
|
||||||
|
> 7 October 2023
|
||||||
|
|
||||||
|
- Bump version to 2.0.0 [`#1257`](https://github.com/th-ch/youtube-music/pull/1257)
|
||||||
|
- feat(GitHub): add issue template [`#1264`](https://github.com/th-ch/youtube-music/pull/1264)
|
||||||
|
- feat: I guess it's TypeScript [`#1235`](https://github.com/th-ch/youtube-music/pull/1235)
|
||||||
|
- chore(deps): update dependency rollup to v4 [`#44`](https://github.com/th-ch/youtube-music/pull/44)
|
||||||
|
- feat: apply rollup 🚀 [`#20`](https://github.com/th-ch/youtube-music/pull/20)
|
||||||
|
- fix: Fixes the video-toggle being displayed at the wrong position on fullscreen [`#1218`](https://github.com/th-ch/youtube-music/pull/1218)
|
||||||
|
- Change Winget Releaser job to `ubuntu-latest` [`#1225`](https://github.com/th-ch/youtube-music/pull/1225)
|
||||||
|
- Fixes the video-toggle being displayed at the wrong position on fullscreen [`#1218`](https://github.com/th-ch/youtube-music/pull/1218)
|
||||||
|
- Fix Remove upgrade button [`#1206`](https://github.com/th-ch/youtube-music/pull/1206)
|
||||||
|
- Fixed Age Restriction Bypass [`#1221`](https://github.com/th-ch/youtube-music/pull/1221)
|
||||||
|
- fix(tuna): handle `playPaused` [`#1`](https://github.com/th-ch/youtube-music/pull/1)
|
||||||
|
- Add plugin to always use the compact sidebar [`#1190`](https://github.com/th-ch/youtube-music/pull/1190)
|
||||||
|
- Hide login elements [`#1189`](https://github.com/th-ch/youtube-music/pull/1189)
|
||||||
|
- Fix navigation arrows [`#1191`](https://github.com/th-ch/youtube-music/pull/1191)
|
||||||
|
- MacOS better copy paste in readme.md [`#1156`](https://github.com/th-ch/youtube-music/pull/1156)
|
||||||
|
- feat(build-windows): Add support for IA32 (resolves #1110) [`#1110`](https://github.com/th-ch/youtube-music/issues/1110)
|
||||||
|
- fix: fix the downloader to work in a proxy environment (resolve #46) [`#46`](https://github.com/th-ch/youtube-music/issues/46)
|
||||||
|
- fix: fix #34 [`#34`](https://github.com/th-ch/youtube-music/issues/34)
|
||||||
|
- fix: fix #32 [`#32`](https://github.com/th-ch/youtube-music/issues/32)
|
||||||
|
- fix: fix #29 [`#29`](https://github.com/th-ch/youtube-music/issues/29)
|
||||||
|
- fix: fix #30 [`#30`](https://github.com/th-ch/youtube-music/issues/30)
|
||||||
|
- fix: fix #29 [`#29`](https://github.com/th-ch/youtube-music/issues/29)
|
||||||
|
- fix: fix #30 [`#30`](https://github.com/th-ch/youtube-music/issues/30)
|
||||||
|
- hotfix: fix #28 [`#28`](https://github.com/th-ch/youtube-music/issues/28)
|
||||||
|
- fix: resolve #12 [`#12`](https://github.com/th-ch/youtube-music/issues/12)
|
||||||
|
- fix(precise-volume): fix slider ui does not sync [`#15`](https://github.com/th-ch/youtube-music/issues/15)
|
||||||
|
- fix(video-toggle): fix video config not load config [`#16`](https://github.com/th-ch/youtube-music/issues/16)
|
||||||
|
- refactor(in-app-menu): refactor in-app-menu plugin [`#13`](https://github.com/th-ch/youtube-music/issues/13)
|
||||||
|
- feat(disable-autoplay): add `apply once`, resolve #9 [`#9`](https://github.com/th-ch/youtube-music/issues/9)
|
||||||
|
- fix: fix #4 [`#4`](https://github.com/th-ch/youtube-music/issues/4)
|
||||||
|
- fix: fix #7 [`#7`](https://github.com/th-ch/youtube-music/issues/7)
|
||||||
|
- fix: fix #1187 [`#1187`](https://github.com/th-ch/youtube-music/issues/1187)
|
||||||
|
- fix: resolves #978 [`#978`](https://github.com/th-ch/youtube-music/issues/978)
|
||||||
|
- fix: resolves #958 [`#958`](https://github.com/th-ch/youtube-music/issues/958)
|
||||||
|
- Merge pull request #1259 from organization/feat/fork-to-main [`457a8b5`](https://github.com/th-ch/youtube-music/commit/457a8b5018695d82b043cb7fa7264fbcf43f996c)
|
||||||
|
- fix: remove `xo`, migration to `eslint` [`c722896`](https://github.com/th-ch/youtube-music/commit/c722896a73cfbca3bbbab67bfcdfa639474e9030)
|
||||||
|
- fix: rollback changelog [`9048da2`](https://github.com/th-ch/youtube-music/commit/9048da22f98b9091ab606464a6cbdaad8bc185ae)
|
||||||
|
|
||||||
|
#### [v1.20.0](https://github.com/th-ch/youtube-music/compare/v1.19.0...v1.20.0)
|
||||||
|
|
||||||
|
> 18 May 2023
|
||||||
|
|
||||||
|
- Bump version to 1.20.0 [`#1117`](https://github.com/th-ch/youtube-music/pull/1117)
|
||||||
|
- Multiple implementations for the Adblocker plugin [`#1134`](https://github.com/th-ch/youtube-music/pull/1134)
|
||||||
|
- add xesam:url mpris from songInfo.url [`#1138`](https://github.com/th-ch/youtube-music/pull/1138)
|
||||||
|
- revert adblocker bump [`#1124`](https://github.com/th-ch/youtube-music/pull/1124)
|
||||||
|
- fix security issues in dependencies [`#1116`](https://github.com/th-ch/youtube-music/pull/1116)
|
||||||
|
- commit assets/generated [`#1118`](https://github.com/th-ch/youtube-music/pull/1118)
|
||||||
|
- remove `electron.remote` dependency [`#1113`](https://github.com/th-ch/youtube-music/pull/1113)
|
||||||
|
- .gitattributes set `eol=lf` on *all* files [`#1115`](https://github.com/th-ch/youtube-music/pull/1115)
|
||||||
|
- [crossfade] add `[beta]` tag to warn of possible bugs [`#1096`](https://github.com/th-ch/youtube-music/pull/1096)
|
||||||
|
- [crossfade] add menu options [`#1065`](https://github.com/th-ch/youtube-music/pull/1065)
|
||||||
|
- [captions-selector] add `autoload` option [`#1079`](https://github.com/th-ch/youtube-music/pull/1079)
|
||||||
|
- [downloader] Cleanup metadata [`#1091`](https://github.com/th-ch/youtube-music/pull/1091)
|
||||||
|
- fix protocol handler on unix [`#1099`](https://github.com/th-ch/youtube-music/pull/1099)
|
||||||
|
- fix merge conflict mistake in #1032 [`#1090`](https://github.com/th-ch/youtube-music/pull/1090)
|
||||||
|
- Create providers/decorators.js [`#1068`](https://github.com/th-ch/youtube-music/pull/1068)
|
||||||
|
- [adblocker] fix ads showing on program start [`#1100`](https://github.com/th-ch/youtube-music/pull/1100)
|
||||||
|
- Allow downloading age restricted videos [`#1086`](https://github.com/th-ch/youtube-music/pull/1086)
|
||||||
|
- add starting page option [`#1073`](https://github.com/th-ch/youtube-music/pull/1073)
|
||||||
|
- [downloader] plugin overhaul [`#1054`](https://github.com/th-ch/youtube-music/pull/1054)
|
||||||
|
- [Snyk] Upgrade @cliqz/adblocker-electron from 1.25.2 to 1.26.0 [`#1070`](https://github.com/th-ch/youtube-music/pull/1070)
|
||||||
|
- [in-app-menu] fix css style of the library of uploaded songs [`#1072`](https://github.com/th-ch/youtube-music/pull/1072)
|
||||||
|
- add option to hide the like buttons [`#1077`](https://github.com/th-ch/youtube-music/pull/1077)
|
||||||
|
- Nitpick: Fix name casing in tray icon tooltip [`#1081`](https://github.com/th-ch/youtube-music/pull/1081)
|
||||||
|
- [lyrics-genius] Improved reliability of east asian language detection #1080 [`#1082`](https://github.com/th-ch/youtube-music/pull/1082)
|
||||||
|
- Add dynamic synced plugin config provider [`#1064`](https://github.com/th-ch/youtube-music/pull/1064)
|
||||||
|
- [captions-selector] fix button showing when there aren't any captions available [`#1063`](https://github.com/th-ch/youtube-music/pull/1063)
|
||||||
|
- [in-app-menu] fix items hidden by navbar in library [`#1067`](https://github.com/th-ch/youtube-music/pull/1067)
|
||||||
|
- Fix Youtube Music logo is draggable [`#1061`](https://github.com/th-ch/youtube-music/pull/1061)
|
||||||
|
- fix build action failing on forks, and run it on pull requests [`#1069`](https://github.com/th-ch/youtube-music/pull/1069)
|
||||||
|
- try to fix songInfo time&album [`#1032`](https://github.com/th-ch/youtube-music/pull/1032)
|
||||||
|
- [lyrics] Romanization toggle for Genius plugin [`#1039`](https://github.com/th-ch/youtube-music/pull/1039)
|
||||||
|
- [Snyk] Upgrade html-to-text from 9.0.3 to 9.0.4 [`#1056`](https://github.com/th-ch/youtube-music/pull/1056)
|
||||||
|
- [in-app-menu] add toggle menu icon [`#988`](https://github.com/th-ch/youtube-music/pull/988)
|
||||||
|
- Fix playback speed slider not showing and PiP button showing when it shouldn't [`#1048`](https://github.com/th-ch/youtube-music/pull/1048)
|
||||||
|
- [lyrics-genius] Fix lyrics not showing up or showing up when they shouldn't [`#1052`](https://github.com/th-ch/youtube-music/pull/1052)
|
||||||
|
- [in-app-menu] disable nav-bar drag when menu is open [`#1055`](https://github.com/th-ch/youtube-music/pull/1055)
|
||||||
|
- [Notifications] [Windows] Native interactive notifications [`#946`](https://github.com/th-ch/youtube-music/pull/946)
|
||||||
|
- automate winget releases [`#1049`](https://github.com/th-ch/youtube-music/pull/1049)
|
||||||
|
- build win target on ARM [`#1029`](https://github.com/th-ch/youtube-music/pull/1029)
|
||||||
|
- feat: auto reconnect rpc and CSP fix [`#961`](https://github.com/th-ch/youtube-music/pull/961)
|
||||||
|
- [in-app-menu] make navbar draggable [`#989`](https://github.com/th-ch/youtube-music/pull/989)
|
||||||
|
- Add option `useNativePiP` in PiP plugin to use native PiP [`#1013`](https://github.com/th-ch/youtube-music/pull/1013)
|
||||||
|
- [PiP] fix hotkey activating when typing in the search box [`#1025`](https://github.com/th-ch/youtube-music/pull/1025)
|
||||||
|
- [PiP] Remove titlebar when in-app-menu is enabled [`#1024`](https://github.com/th-ch/youtube-music/pull/1024)
|
||||||
|
- [Shortcuts] MPRIS fixes, Repeat Language bug fix [`#1005`](https://github.com/th-ch/youtube-music/pull/1005)
|
||||||
|
- Build without release in forks [`#1023`](https://github.com/th-ch/youtube-music/pull/1023)
|
||||||
|
- [in-app-menu] fix navbar position [`#997`](https://github.com/th-ch/youtube-music/pull/997)
|
||||||
|
- Migrate to yarn v3 [`#1022`](https://github.com/th-ch/youtube-music/pull/1022)
|
||||||
|
- [precise-volume] fix arrows shortcuts active in search box [`#1002`](https://github.com/th-ch/youtube-music/pull/1002)
|
||||||
|
- [new plugin] Add first version for crossfade plugin [`#1012`](https://github.com/th-ch/youtube-music/pull/1012)
|
||||||
|
- Fix bypass-age-restriction lib import [`#984`](https://github.com/th-ch/youtube-music/pull/984)
|
||||||
|
- Add menu entry to copy current URL [`#977`](https://github.com/th-ch/youtube-music/pull/977)
|
||||||
|
- Remove deprecated code [`#979`](https://github.com/th-ch/youtube-music/pull/979)
|
||||||
|
- Update dev dependencies [`#976`](https://github.com/th-ch/youtube-music/pull/976)
|
||||||
|
- Update electron and various dependencies [`#974`](https://github.com/th-ch/youtube-music/pull/974)
|
||||||
|
- Add CI job for dependency review [`#973`](https://github.com/th-ch/youtube-music/pull/973)
|
||||||
|
- Improve captions plugin [`#972`](https://github.com/th-ch/youtube-music/pull/972)
|
||||||
|
- fix malformed json in tuna-obs [`#817`](https://github.com/th-ch/youtube-music/pull/817)
|
||||||
|
- Add Captions selector [`#866`](https://github.com/th-ch/youtube-music/pull/866)
|
||||||
|
- fix SnoreToast implementation [`#941`](https://github.com/th-ch/youtube-music/pull/941)
|
||||||
|
- Bump json5 from 1.0.1 to 1.0.2 [`#942`](https://github.com/th-ch/youtube-music/pull/942)
|
||||||
|
- [Snyk] Upgrade custom-electron-titlebar from 4.1.3 to 4.1.5 [`#969`](https://github.com/th-ch/youtube-music/pull/969)
|
||||||
|
- Fixed video-toggle aligning running before #main-panel exists [`#956`](https://github.com/th-ch/youtube-music/pull/956)
|
||||||
|
- [New plugin] Music visualizers [`#953`](https://github.com/th-ch/youtube-music/pull/953)
|
||||||
|
- fix PiP buttons not showing up [`#964`](https://github.com/th-ch/youtube-music/pull/964)
|
||||||
|
- Use same audio context/source everywhere [`#951`](https://github.com/th-ch/youtube-music/pull/951)
|
||||||
|
- revert adblocker bump [`#1105`](https://github.com/th-ch/youtube-music/issues/1105)
|
||||||
|
- Allow downloading age restricted videos [`#1084`](https://github.com/th-ch/youtube-music/issues/1084)
|
||||||
|
- add option to hide the like buttons [`#1075`](https://github.com/th-ch/youtube-music/issues/1075)
|
||||||
|
- add starting page option [`#1071`](https://github.com/th-ch/youtube-music/issues/1071)
|
||||||
|
- add slight delay to lyrics genius [`#1041`](https://github.com/th-ch/youtube-music/issues/1041)
|
||||||
|
- fix unescaped url params [`#1050`](https://github.com/th-ch/youtube-music/issues/1050)
|
||||||
|
- fix playback speed selector [`#1045`](https://github.com/th-ch/youtube-music/issues/1045)
|
||||||
|
- fix PiP button [`#959`](https://github.com/th-ch/youtube-music/issues/959)
|
||||||
|
- fix security issues in deps [`9cde19d`](https://github.com/th-ch/youtube-music/commit/9cde19d906081fe1851f90fa44581b2b74c328e3)
|
||||||
|
- rome lint [`325026e`](https://github.com/th-ch/youtube-music/commit/325026e3eae3daed33a6d66d1ef9f898d6805b28)
|
||||||
|
- lint [`b652a01`](https://github.com/th-ch/youtube-music/commit/b652a011a5a08978db6660aeca6908c47a7cf07a)
|
||||||
|
|
||||||
#### [v1.19.0](https://github.com/th-ch/youtube-music/compare/v1.18.0...v1.19.0)
|
#### [v1.19.0](https://github.com/th-ch/youtube-music/compare/v1.18.0...v1.19.0)
|
||||||
|
|
||||||
|
> 31 December 2022
|
||||||
|
|
||||||
- Automatic release by CI when version is updated [`#936`](https://github.com/th-ch/youtube-music/pull/936)
|
- Automatic release by CI when version is updated [`#936`](https://github.com/th-ch/youtube-music/pull/936)
|
||||||
- Center toggle of video-toggle [`#894`](https://github.com/th-ch/youtube-music/pull/894)
|
- Center toggle of video-toggle [`#894`](https://github.com/th-ch/youtube-music/pull/894)
|
||||||
- Load plugins as soon as the window is created [`#890`](https://github.com/th-ch/youtube-music/pull/890)
|
- Load plugins as soon as the window is created [`#890`](https://github.com/th-ch/youtube-music/pull/890)
|
||||||
|
|||||||
@ -1,184 +0,0 @@
|
|||||||
const defaultConfig = {
|
|
||||||
"window-size": {
|
|
||||||
width: 1100,
|
|
||||||
height: 550,
|
|
||||||
},
|
|
||||||
url: "https://music.youtube.com",
|
|
||||||
options: {
|
|
||||||
tray: false,
|
|
||||||
appVisible: true,
|
|
||||||
autoUpdates: true,
|
|
||||||
hideMenu: false,
|
|
||||||
startAtLogin: false,
|
|
||||||
disableHardwareAcceleration: false,
|
|
||||||
restartOnConfigChanges: false,
|
|
||||||
trayClickPlayPause: false,
|
|
||||||
autoResetAppCache: false,
|
|
||||||
resumeOnStart: true,
|
|
||||||
proxy: "",
|
|
||||||
startingPage: "",
|
|
||||||
},
|
|
||||||
plugins: {
|
|
||||||
// Enabled plugins
|
|
||||||
navigation: {
|
|
||||||
enabled: true,
|
|
||||||
},
|
|
||||||
adblocker: {
|
|
||||||
enabled: true,
|
|
||||||
cache: true,
|
|
||||||
additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
|
|
||||||
},
|
|
||||||
// Disabled plugins
|
|
||||||
shortcuts: {
|
|
||||||
enabled: false,
|
|
||||||
overrideMediaKeys: false,
|
|
||||||
},
|
|
||||||
downloader: {
|
|
||||||
enabled: false,
|
|
||||||
ffmpegArgs: [], // e.g. ["-b:a", "192k"] for an audio bitrate of 192kb/s
|
|
||||||
downloadFolder: undefined, // Custom download folder (absolute path)
|
|
||||||
preset: "mp3",
|
|
||||||
},
|
|
||||||
"last-fm": {
|
|
||||||
enabled: false,
|
|
||||||
api_root: "http://ws.audioscrobbler.com/2.0/",
|
|
||||||
api_key: "04d76faaac8726e60988e14c105d421a", // api key registered by @semvis123
|
|
||||||
secret: "a5d2a36fdf64819290f6982481eaffa2",
|
|
||||||
},
|
|
||||||
discord: {
|
|
||||||
enabled: false,
|
|
||||||
autoReconnect: true, // if enabled, will try to reconnect to discord every 5 seconds after disconnecting or failing to connect
|
|
||||||
activityTimoutEnabled: true, // if enabled, the discord rich presence gets cleared when music paused after the time specified below
|
|
||||||
activityTimoutTime: 10 * 60 * 1000, // 10 minutes
|
|
||||||
listenAlong: true, // add a "listen along" button to rich presence
|
|
||||||
hideDurationLeft: false, // hides the start and end time of the song to rich presence
|
|
||||||
},
|
|
||||||
notifications: {
|
|
||||||
enabled: false,
|
|
||||||
unpauseNotification: false,
|
|
||||||
urgency: "normal", //has effect only on Linux
|
|
||||||
// the following has effect only on Windows
|
|
||||||
interactive: true,
|
|
||||||
toastStyle: 1, // see plugins/notifications/utils for more info
|
|
||||||
refreshOnPlayPause: false,
|
|
||||||
trayControls: true,
|
|
||||||
hideButtonText: false
|
|
||||||
},
|
|
||||||
"precise-volume": {
|
|
||||||
enabled: false,
|
|
||||||
steps: 1, //percentage of volume to change
|
|
||||||
arrowsShortcut: true, //enable ArrowUp + ArrowDown local shortcuts
|
|
||||||
globalShortcuts: {
|
|
||||||
volumeUp: "",
|
|
||||||
volumeDown: ""
|
|
||||||
},
|
|
||||||
savedVolume: undefined //plugin save volume between session here
|
|
||||||
},
|
|
||||||
sponsorblock: {
|
|
||||||
enabled: false,
|
|
||||||
apiURL: "https://sponsor.ajay.app",
|
|
||||||
categories: [
|
|
||||||
"sponsor",
|
|
||||||
"intro",
|
|
||||||
"outro",
|
|
||||||
"interaction",
|
|
||||||
"selfpromo",
|
|
||||||
"music_offtopic",
|
|
||||||
],
|
|
||||||
},
|
|
||||||
"video-toggle": {
|
|
||||||
enabled: false,
|
|
||||||
mode: "custom",
|
|
||||||
forceHide: false,
|
|
||||||
},
|
|
||||||
"picture-in-picture": {
|
|
||||||
"enabled": false,
|
|
||||||
"alwaysOnTop": true,
|
|
||||||
"savePosition": true,
|
|
||||||
"saveSize": false,
|
|
||||||
"hotkey": "P"
|
|
||||||
},
|
|
||||||
"captions-selector": {
|
|
||||||
enabled: false,
|
|
||||||
disableCaptions: false
|
|
||||||
},
|
|
||||||
"skip-silences": {
|
|
||||||
onlySkipBeginning: false,
|
|
||||||
},
|
|
||||||
"crossfade": {
|
|
||||||
enabled: false,
|
|
||||||
fadeInDuration: 1500, // ms
|
|
||||||
fadeOutDuration: 5000, // ms
|
|
||||||
secondsBeforeEnd: 10, // s
|
|
||||||
fadeScaling: "linear", // 'linear', 'logarithmic' or a positive number in dB
|
|
||||||
},
|
|
||||||
visualizer: {
|
|
||||||
enabled: false,
|
|
||||||
type: "butterchurn",
|
|
||||||
// Config per visualizer
|
|
||||||
butterchurn: {
|
|
||||||
preset: "martin [shadow harlequins shape code] - fata morgana",
|
|
||||||
renderingFrequencyInMs: 500,
|
|
||||||
blendTimeInSeconds: 2.7,
|
|
||||||
},
|
|
||||||
vudio: {
|
|
||||||
effect: "lighting",
|
|
||||||
accuracy: 128,
|
|
||||||
lighting: {
|
|
||||||
maxHeight: 160,
|
|
||||||
maxSize: 12,
|
|
||||||
lineWidth: 1,
|
|
||||||
color: "#49f3f7",
|
|
||||||
shadowBlur: 2,
|
|
||||||
shadowColor: "rgba(244,244,244,.5)",
|
|
||||||
fadeSide: true,
|
|
||||||
prettify: false,
|
|
||||||
horizontalAlign: "center",
|
|
||||||
verticalAlign: "middle",
|
|
||||||
dottify: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
wave: {
|
|
||||||
animations: [
|
|
||||||
{
|
|
||||||
type: "Cubes",
|
|
||||||
config: {
|
|
||||||
bottom: true,
|
|
||||||
count: 30,
|
|
||||||
cubeHeight: 5,
|
|
||||||
fillColor: { gradient: ["#FAD961", "#F76B1C"] },
|
|
||||||
lineColor: "rgba(0,0,0,0)",
|
|
||||||
radius: 20,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: "Cubes",
|
|
||||||
config: {
|
|
||||||
top: true,
|
|
||||||
count: 12,
|
|
||||||
cubeHeight: 5,
|
|
||||||
fillColor: { gradient: ["#FAD961", "#F76B1C"] },
|
|
||||||
lineColor: "rgba(0,0,0,0)",
|
|
||||||
radius: 10,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: "Circles",
|
|
||||||
config: {
|
|
||||||
lineColor: {
|
|
||||||
gradient: ["#FAD961", "#FAD961", "#F76B1C"],
|
|
||||||
rotate: 90,
|
|
||||||
},
|
|
||||||
lineWidth: 4,
|
|
||||||
diameter: 20,
|
|
||||||
count: 10,
|
|
||||||
frequencyBand: "base",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = defaultConfig;
|
|
||||||
@ -1,205 +0,0 @@
|
|||||||
const { ipcRenderer, ipcMain } = require("electron");
|
|
||||||
|
|
||||||
const defaultConfig = require("./defaults");
|
|
||||||
const { getOptions, setOptions, setMenuOptions } = require("./plugins");
|
|
||||||
const { sendToFront } = require("../providers/app-controls");
|
|
||||||
|
|
||||||
const activePlugins = {};
|
|
||||||
/**
|
|
||||||
* [!IMPORTANT!]
|
|
||||||
* The method is **sync** in the main process and **async** in the renderer process.
|
|
||||||
*/
|
|
||||||
module.exports.getActivePlugins =
|
|
||||||
process.type === "renderer"
|
|
||||||
? async () => ipcRenderer.invoke("get-active-plugins")
|
|
||||||
: () => activePlugins;
|
|
||||||
|
|
||||||
if (process.type === "browser") {
|
|
||||||
ipcMain.handle("get-active-plugins", this.getActivePlugins);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [!IMPORTANT!]
|
|
||||||
* The method is **sync** in the main process and **async** in the renderer process.
|
|
||||||
*/
|
|
||||||
module.exports.isActive =
|
|
||||||
process.type === "renderer"
|
|
||||||
? async (plugin) =>
|
|
||||||
plugin in (await ipcRenderer.invoke("get-active-plugins"))
|
|
||||||
: (plugin) => plugin in activePlugins;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is used to create a dynamic synced config for plugins.
|
|
||||||
*
|
|
||||||
* [!IMPORTANT!]
|
|
||||||
* The methods are **sync** in the main process and **async** in the renderer process.
|
|
||||||
*
|
|
||||||
* @param {string} name - The name of the plugin.
|
|
||||||
* @param {boolean} [options.enableFront] - Whether the config should be available in front.js. Default: false.
|
|
||||||
* @param {object} [options.initialOptions] - The initial options for the plugin. Default: loaded from store.
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* const { PluginConfig } = require("../../config/dynamic");
|
|
||||||
* const config = new PluginConfig("plugin-name", { enableFront: true });
|
|
||||||
* module.exports = { ...config };
|
|
||||||
*
|
|
||||||
* // or
|
|
||||||
*
|
|
||||||
* module.exports = (win, options) => {
|
|
||||||
* const config = new PluginConfig("plugin-name", {
|
|
||||||
* enableFront: true,
|
|
||||||
* initialOptions: options,
|
|
||||||
* });
|
|
||||||
* setupMyPlugin(win, config);
|
|
||||||
* };
|
|
||||||
*/
|
|
||||||
module.exports.PluginConfig = class PluginConfig {
|
|
||||||
#name;
|
|
||||||
#config;
|
|
||||||
#defaultConfig;
|
|
||||||
#enableFront;
|
|
||||||
|
|
||||||
#subscribers = {};
|
|
||||||
#allSubscribers = [];
|
|
||||||
|
|
||||||
constructor(name, { enableFront = false, initialOptions = undefined } = {}) {
|
|
||||||
const pluginDefaultConfig = defaultConfig.plugins[name] || {};
|
|
||||||
const pluginConfig = initialOptions || getOptions(name) || {};
|
|
||||||
|
|
||||||
this.#name = name;
|
|
||||||
this.#enableFront = enableFront;
|
|
||||||
this.#defaultConfig = pluginDefaultConfig;
|
|
||||||
this.#config = { ...pluginDefaultConfig, ...pluginConfig };
|
|
||||||
|
|
||||||
if (this.#enableFront) {
|
|
||||||
this.#setupFront();
|
|
||||||
}
|
|
||||||
|
|
||||||
activePlugins[name] = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
get = (option) => {
|
|
||||||
return this.#config[option];
|
|
||||||
};
|
|
||||||
|
|
||||||
set = (option, value) => {
|
|
||||||
this.#config[option] = value;
|
|
||||||
this.#onChange(option);
|
|
||||||
this.#save();
|
|
||||||
};
|
|
||||||
|
|
||||||
toggle = (option) => {
|
|
||||||
this.#config[option] = !this.#config[option];
|
|
||||||
this.#onChange(option);
|
|
||||||
this.#save();
|
|
||||||
};
|
|
||||||
|
|
||||||
getAll = () => {
|
|
||||||
return { ...this.#config };
|
|
||||||
};
|
|
||||||
|
|
||||||
setAll = (options) => {
|
|
||||||
if (!options || typeof options !== "object")
|
|
||||||
throw new Error("Options must be an object.");
|
|
||||||
|
|
||||||
let changed = false;
|
|
||||||
for (const [key, val] of Object.entries(options)) {
|
|
||||||
if (this.#config[key] !== val) {
|
|
||||||
this.#config[key] = val;
|
|
||||||
this.#onChange(key, false);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (changed) this.#allSubscribers.forEach((fn) => fn(this.#config));
|
|
||||||
this.#save();
|
|
||||||
};
|
|
||||||
|
|
||||||
getDefaultConfig = () => {
|
|
||||||
return this.#defaultConfig;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Use this method to set an option and restart the app if `appConfig.restartOnConfigChange === true`
|
|
||||||
*
|
|
||||||
* Used for options that require a restart to take effect.
|
|
||||||
*/
|
|
||||||
setAndMaybeRestart = (option, value) => {
|
|
||||||
this.#config[option] = value;
|
|
||||||
setMenuOptions(this.#name, this.#config);
|
|
||||||
this.#onChange(option);
|
|
||||||
};
|
|
||||||
|
|
||||||
subscribe = (valueName, fn) => {
|
|
||||||
this.#subscribers[valueName] = fn;
|
|
||||||
};
|
|
||||||
|
|
||||||
subscribeAll = (fn) => {
|
|
||||||
this.#allSubscribers.push(fn);
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Called only from back */
|
|
||||||
#save() {
|
|
||||||
setOptions(this.#name, this.#config);
|
|
||||||
}
|
|
||||||
|
|
||||||
#onChange(valueName, single = true) {
|
|
||||||
this.#subscribers[valueName]?.(this.#config[valueName]);
|
|
||||||
if (single) this.#allSubscribers.forEach((fn) => fn(this.#config));
|
|
||||||
}
|
|
||||||
|
|
||||||
#setupFront() {
|
|
||||||
const ignoredMethods = ["subscribe", "subscribeAll"];
|
|
||||||
|
|
||||||
if (process.type === "renderer") {
|
|
||||||
for (const [fnName, fn] of Object.entries(this)) {
|
|
||||||
if (typeof fn !== "function" || fn.name in ignoredMethods) return;
|
|
||||||
this[fnName] = async (...args) => {
|
|
||||||
return await ipcRenderer.invoke(
|
|
||||||
`${this.#name}-config-${fnName}`,
|
|
||||||
...args,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.subscribe = (valueName, fn) => {
|
|
||||||
if (valueName in this.#subscribers) {
|
|
||||||
console.error(`Already subscribed to ${valueName}`);
|
|
||||||
}
|
|
||||||
this.#subscribers[valueName] = fn;
|
|
||||||
ipcRenderer.on(
|
|
||||||
`${this.#name}-config-changed-${valueName}`,
|
|
||||||
(_, value) => {
|
|
||||||
fn(value);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
ipcRenderer.send(`${this.#name}-config-subscribe`, valueName);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.subscribeAll = (fn) => {
|
|
||||||
ipcRenderer.on(`${this.#name}-config-changed`, (_, value) => {
|
|
||||||
fn(value);
|
|
||||||
});
|
|
||||||
ipcRenderer.send(`${this.#name}-config-subscribe-all`);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} else if (process.type === "browser") {
|
|
||||||
for (const [fnName, fn] of Object.entries(this)) {
|
|
||||||
if (typeof fn !== "function" || fn.name in ignoredMethods) return;
|
|
||||||
ipcMain.handle(`${this.#name}-config-${fnName}`, (_, ...args) => {
|
|
||||||
return fn(...args);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
ipcMain.on(`${this.#name}-config-subscribe`, (_, valueName) => {
|
|
||||||
this.subscribe(valueName, (value) => {
|
|
||||||
sendToFront(`${this.#name}-config-changed-${valueName}`, value);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
ipcMain.on(`${this.#name}-config-subscribe-all`, () => {
|
|
||||||
this.subscribeAll((value) => {
|
|
||||||
sendToFront(`${this.#name}-config-changed`, value);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
const defaultConfig = require("./defaults");
|
|
||||||
const plugins = require("./plugins");
|
|
||||||
const store = require("./store");
|
|
||||||
const { restart } = require("../providers/app-controls");
|
|
||||||
|
|
||||||
const set = (key, value) => {
|
|
||||||
store.set(key, value);
|
|
||||||
};
|
|
||||||
|
|
||||||
function setMenuOption(key, value) {
|
|
||||||
set(key, value);
|
|
||||||
if (store.get("options.restartOnConfigChanges")) restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
const get = (key) => {
|
|
||||||
return store.get(key);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
defaultConfig,
|
|
||||||
get,
|
|
||||||
set,
|
|
||||||
setMenuOption,
|
|
||||||
edit: () => store.openInEditor(),
|
|
||||||
watch: (cb) => {
|
|
||||||
store.onDidChange("options", cb);
|
|
||||||
store.onDidChange("plugins", cb);
|
|
||||||
},
|
|
||||||
plugins,
|
|
||||||
};
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
const store = require("./store");
|
|
||||||
const { restart } = require("../providers/app-controls");
|
|
||||||
|
|
||||||
function getEnabled() {
|
|
||||||
const plugins = store.get("plugins");
|
|
||||||
const enabledPlugins = Object.entries(plugins).filter(([plugin, options]) =>
|
|
||||||
isEnabled(plugin)
|
|
||||||
);
|
|
||||||
return enabledPlugins;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isEnabled(plugin) {
|
|
||||||
const pluginConfig = store.get("plugins")[plugin];
|
|
||||||
return pluginConfig !== undefined && pluginConfig.enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setOptions(plugin, options) {
|
|
||||||
const plugins = store.get("plugins");
|
|
||||||
store.set("plugins", {
|
|
||||||
...plugins,
|
|
||||||
[plugin]: {
|
|
||||||
...plugins[plugin],
|
|
||||||
...options,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function setMenuOptions(plugin, options) {
|
|
||||||
setOptions(plugin, options);
|
|
||||||
if (store.get("options.restartOnConfigChanges")) restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
function getOptions(plugin) {
|
|
||||||
return store.get("plugins")[plugin];
|
|
||||||
}
|
|
||||||
|
|
||||||
function enable(plugin) {
|
|
||||||
setMenuOptions(plugin, { enabled: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
function disable(plugin) {
|
|
||||||
setMenuOptions(plugin, { enabled: false });
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
isEnabled,
|
|
||||||
getEnabled,
|
|
||||||
enable,
|
|
||||||
disable,
|
|
||||||
setOptions,
|
|
||||||
setMenuOptions,
|
|
||||||
getOptions,
|
|
||||||
};
|
|
||||||
112
config/store.js
@ -1,112 +0,0 @@
|
|||||||
const Store = require("electron-store");
|
|
||||||
|
|
||||||
const defaults = require("./defaults");
|
|
||||||
|
|
||||||
const setDefaultPluginOptions = (store, plugin) => {
|
|
||||||
if (!store.get(`plugins.${plugin}`)) {
|
|
||||||
store.set(`plugins.${plugin}`, defaults.plugins[plugin]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const migrations = {
|
|
||||||
">=1.20.0": (store) => {
|
|
||||||
setDefaultPluginOptions(store, "visualizer");
|
|
||||||
|
|
||||||
if (store.get("plugins.notifications.toastStyle") === undefined) {
|
|
||||||
const pluginOptions = store.get("plugins.notifications") || {};
|
|
||||||
store.set("plugins.notifications", {
|
|
||||||
...defaults.plugins.notifications,
|
|
||||||
...pluginOptions,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (store.get("options.ForceShowLikeButtons")) {
|
|
||||||
store.delete("options.ForceShowLikeButtons");
|
|
||||||
store.set("options.likeButtons", 'force');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.17.0": (store) => {
|
|
||||||
setDefaultPluginOptions(store, "picture-in-picture");
|
|
||||||
|
|
||||||
if (store.get("plugins.video-toggle.mode") === undefined) {
|
|
||||||
store.set("plugins.video-toggle.mode", "custom");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.14.0": (store) => {
|
|
||||||
if (
|
|
||||||
typeof store.get("plugins.precise-volume.globalShortcuts") !== "object"
|
|
||||||
) {
|
|
||||||
store.set("plugins.precise-volume.globalShortcuts", {});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (store.get("plugins.hide-video-player.enabled")) {
|
|
||||||
store.delete("plugins.hide-video-player");
|
|
||||||
store.set("plugins.video-toggle.enabled", true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.13.0": (store) => {
|
|
||||||
if (store.get("plugins.discord.listenAlong") === undefined) {
|
|
||||||
store.set("plugins.discord.listenAlong", true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.12.0": (store) => {
|
|
||||||
const options = store.get("plugins.shortcuts");
|
|
||||||
let updated = false;
|
|
||||||
for (const optionType of ["global", "local"]) {
|
|
||||||
if (Array.isArray(options[optionType])) {
|
|
||||||
const updatedOptions = {};
|
|
||||||
for (const optionObject of options[optionType]) {
|
|
||||||
if (optionObject.action && optionObject.shortcut) {
|
|
||||||
updatedOptions[optionObject.action] = optionObject.shortcut;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
options[optionType] = updatedOptions;
|
|
||||||
updated = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (updated) {
|
|
||||||
store.set("plugins.shortcuts", options);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.11.0": (store) => {
|
|
||||||
if (store.get("options.resumeOnStart") === undefined) {
|
|
||||||
store.set("options.resumeOnStart", true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
">=1.7.0": (store) => {
|
|
||||||
const enabledPlugins = store.get("plugins");
|
|
||||||
if (!Array.isArray(enabledPlugins)) {
|
|
||||||
console.warn("Plugins are not in array format, cannot migrate");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Include custom options
|
|
||||||
const plugins = {
|
|
||||||
adblocker: {
|
|
||||||
enabled: true,
|
|
||||||
cache: true,
|
|
||||||
additionalBlockLists: [],
|
|
||||||
},
|
|
||||||
downloader: {
|
|
||||||
enabled: false,
|
|
||||||
ffmpegArgs: [], // e.g. ["-b:a", "192k"] for an audio bitrate of 192kb/s
|
|
||||||
downloadFolder: undefined, // Custom download folder (absolute path)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
enabledPlugins.forEach((enabledPlugin) => {
|
|
||||||
plugins[enabledPlugin] = {
|
|
||||||
...plugins[enabledPlugin],
|
|
||||||
enabled: true,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
store.set("plugins", plugins);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = new Store({
|
|
||||||
defaults,
|
|
||||||
clearInvalidConfig: false,
|
|
||||||
migrations,
|
|
||||||
});
|
|
||||||
@ -1 +1,9 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400"><g transform="translate(183.604 196.396)" stroke="#fff" stroke-width="2.23"><path style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" d="M-116.99 106.245l31.82 31.82 236.31-236.31-31.82-31.82z" color="#000" font-weight="400" font-family="Sans" overflow="visible" fill="#fff" stroke="none"/><circle r="171.304" cy="4" cx="16" fill="none" stroke-width="44.6"/></g></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400">
|
||||||
|
<g transform="translate(183.604 196.396)" stroke="#fff" stroke-width="2.23">
|
||||||
|
<path
|
||||||
|
style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none"
|
||||||
|
d="M-116.99 106.245l31.82 31.82 236.31-236.31-31.82-31.82z" color="#000" font-weight="400"
|
||||||
|
font-family="Sans" overflow="visible" fill="#fff" stroke="none"/>
|
||||||
|
<circle r="171.304" cy="4" cx="16" fill="none" stroke-width="44.6"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 588 B |
@ -1 +1,23 @@
|
|||||||
<svg width="1440" height="347" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a"><stop stop-color="#606483" stop-opacity="0" offset="0%"/><stop stop-color="#0B0D19" stop-opacity=".72" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="b"><stop stop-color="#0B0D19" offset="0%"/><stop stop-color="#0B0D19" stop-opacity="0" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path d="M177.486 208.219c78.18 89.285 218.65-81.067 218.65-119.337 0-38.27-86.408-69.295-193-69.295-106.59 0-193 31.024-193 69.295 0 38.27 89.17 30.051 167.35 119.337z" transform="rotate(6 -140.175 3980.948)" fill="url(#a)"/><path d="M252.464 335.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z" fill="url(#a)" transform="rotate(24 321.92 -247.724)"/><path d="M302.512 242.909c88.025 32.428 156-25.04 156-55.93 0-30.888-69.844-55.928-156-55.928-86.157 0-156 25.04-156 55.929 0 30.888 67.974 23.5 156 55.929z" fill="url(#b)" transform="rotate(24 338.741 -285.505)"/></g></svg>
|
<svg width="1440" height="347" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<defs>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a">
|
||||||
|
<stop stop-color="#606483" stop-opacity="0" offset="0%"/>
|
||||||
|
<stop stop-color="#0B0D19" stop-opacity=".72" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="b">
|
||||||
|
<stop stop-color="#0B0D19" offset="0%"/>
|
||||||
|
<stop stop-color="#0B0D19" stop-opacity="0" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<g fill="none" fill-rule="evenodd">
|
||||||
|
<path
|
||||||
|
d="M177.486 208.219c78.18 89.285 218.65-81.067 218.65-119.337 0-38.27-86.408-69.295-193-69.295-106.59 0-193 31.024-193 69.295 0 38.27 89.17 30.051 167.35 119.337z"
|
||||||
|
transform="rotate(6 -140.175 3980.948)" fill="url(#a)"/>
|
||||||
|
<path
|
||||||
|
d="M252.464 335.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z"
|
||||||
|
fill="url(#a)" transform="rotate(24 321.92 -247.724)"/>
|
||||||
|
<path
|
||||||
|
d="M302.512 242.909c88.025 32.428 156-25.04 156-55.93 0-30.888-69.844-55.928-156-55.928-86.157 0-156 25.04-156 55.929 0 30.888 67.974 23.5 156 55.929z"
|
||||||
|
fill="url(#b)" transform="rotate(24 338.741 -285.505)"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
@ -1 +1,32 @@
|
|||||||
<svg width="1440" height="318" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="38.706%" y1="-187.115%" x2="18.675%" y2="110.984%" id="a"><stop stop-color="#FFF" stop-opacity="0" offset="0%"/><stop stop-color="#c3352e" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="c"><stop stop-color="#606483" stop-opacity="0" offset="0%"/><stop stop-color="#0B0D19" stop-opacity=".72" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="d"><stop stop-color="#0B0D19" stop-opacity=".32" offset="0%"/><stop stop-color="#0B0D19" stop-opacity="0" offset="100%"/></linearGradient><filter id="b"><feTurbulence type="fractalNoise" numOctaves="2" baseFrequency=".3" result="turb"/><feComposite in="turb" operator="arithmetic" k1=".1" k2=".1" k3=".1" k4=".1" result="result1"/><feComposite operator="in" in="result1" in2="SourceGraphic" result="finalFilter"/><feBlend mode="multiply" in="finalFilter" in2="SourceGraphic"/></filter></defs><g fill="none" fill-rule="evenodd"><path d="M88.494 90c67.04 7.177 161.094-24.753 224.996-90H.2c25.3 48.079 42.361 85.083 88.294 90z" transform="translate(1051)" fill="url(#a)" filter="url(#b)"/><path d="M250.464 367.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z" fill="url(#c)" transform="rotate(143 810.285 354.367)"/><path d="M373.408 256.178c88.026 32.429 156-25.04 156-55.929 0-30.888-69.843-55.929-156-55.929-86.156 0-156 25.04-156 55.93 0 30.888 67.975 23.5 156 55.928z" fill="url(#d)" transform="rotate(136 905.21 332.676)"/></g></svg>
|
<svg width="1440" height="318" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<defs>
|
||||||
|
<linearGradient x1="38.706%" y1="-187.115%" x2="18.675%" y2="110.984%" id="a">
|
||||||
|
<stop stop-color="#FFF" stop-opacity="0" offset="0%"/>
|
||||||
|
<stop stop-color="#c3352e" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="c">
|
||||||
|
<stop stop-color="#606483" stop-opacity="0" offset="0%"/>
|
||||||
|
<stop stop-color="#0B0D19" stop-opacity=".72" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="d">
|
||||||
|
<stop stop-color="#0B0D19" stop-opacity=".32" offset="0%"/>
|
||||||
|
<stop stop-color="#0B0D19" stop-opacity="0" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<filter id="b">
|
||||||
|
<feTurbulence type="fractalNoise" numOctaves="2" baseFrequency=".3" result="turb"/>
|
||||||
|
<feComposite in="turb" operator="arithmetic" k1=".1" k2=".1" k3=".1" k4=".1" result="result1"/>
|
||||||
|
<feComposite operator="in" in="result1" in2="SourceGraphic" result="finalFilter"/>
|
||||||
|
<feBlend mode="multiply" in="finalFilter" in2="SourceGraphic"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<g fill="none" fill-rule="evenodd">
|
||||||
|
<path d="M88.494 90c67.04 7.177 161.094-24.753 224.996-90H.2c25.3 48.079 42.361 85.083 88.294 90z"
|
||||||
|
transform="translate(1051)" fill="url(#a)" filter="url(#b)"/>
|
||||||
|
<path
|
||||||
|
d="M250.464 367.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z"
|
||||||
|
fill="url(#c)" transform="rotate(143 810.285 354.367)"/>
|
||||||
|
<path
|
||||||
|
d="M373.408 256.178c88.026 32.429 156-25.04 156-55.929 0-30.888-69.843-55.929-156-55.929-86.156 0-156 25.04-156 55.93 0 30.888 67.975 23.5 156 55.928z"
|
||||||
|
fill="url(#d)" transform="rotate(136 905.21 332.676)"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1 +1,5 @@
|
|||||||
<svg width="96" height="48" xmlns="http://www.w3.org/2000/svg"><text y="35" x="48" fill="#fff" stroke-width="0" font-size="36" font-family="Monospace" text-anchor="middle" stroke="#fff"></></text></svg>
|
<svg width="96" height="48" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<text y="35" x="48" fill="#fff" stroke-width="0" font-size="36" font-family="Monospace" text-anchor="middle"
|
||||||
|
stroke="#fff"></>
|
||||||
|
</text>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 208 B After Width: | Height: | Size: 224 B |
@ -1 +1,8 @@
|
|||||||
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="style-scope yt-icon" style="width:100%;height:100%" pointer-events="none" display="block" fill="#fff"><g class="style-scope yt-icon"><path d="M25.462 19.105v6.848H4.515v-6.848H.489v8.861c0 1.111.9 2.012 2.016 2.012h24.967c1.115 0 2.016-.9 2.016-2.012v-8.861h-4.026zM14.62 18.426l-5.764-6.965s-.877-.828.074-.828h3.248V9.217.494S12.049 0 12.793 0h4.572c.536 0 .524.416.524.416V10.424h2.998c1.154 0 .285.867.285.867s-4.904 6.51-5.588 7.193c-.492.495-.964-.058-.964-.058z" class="style-scope yt-icon"/></g></svg>
|
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="style-scope yt-icon" style="width:100%;height:100%"
|
||||||
|
pointer-events="none" display="block" fill="#fff">
|
||||||
|
<g class="style-scope yt-icon">
|
||||||
|
<path
|
||||||
|
d="M25.462 19.105v6.848H4.515v-6.848H.489v8.861c0 1.111.9 2.012 2.016 2.012h24.967c1.115 0 2.016-.9 2.016-2.012v-8.861h-4.026zM14.62 18.426l-5.764-6.965s-.877-.828.074-.828h3.248V9.217.494S12.049 0 12.793 0h4.572c.536 0 .524.416.524.416V10.424h2.998c1.154 0 .285.867.285.867s-4.904 6.51-5.588 7.193c-.492.495-.964-.058-.964-.058z"
|
||||||
|
class="style-scope yt-icon"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 576 B After Width: | Height: | Size: 634 B |
@ -1 +1,35 @@
|
|||||||
<svg width="1440" height="582" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a"><stop stop-color="#606483" stop-opacity="0" offset="0%"/><stop stop-color="#363636" stop-opacity=".72" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="b"><stop stop-color="#363636" offset="0%"/><stop stop-color="#363636" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="33.3%" cy="43.394%" fx="33.3%" fy="43.394%" r="57.93%" gradientTransform="matrix(.24796 -.96592 .92535 .25883 -.151 .643)" id="c"><stop stop-color="#c3352e" stop-opacity="0" offset="0%"/><stop stop-color="#c3352e" stop-opacity=".64" offset="51.712%"/><stop stop-color="#c3352e" stop-opacity=".24" offset="100%"/></radialGradient><filter id="d"><feTurbulence type="fractalNoise" numOctaves="2" baseFrequency=".3" result="turb"/><feComposite in="turb" operator="arithmetic" k1=".1" k2=".1" k3=".1" k4=".1" result="result1"/><feComposite operator="in" in="result1" in2="SourceGraphic" result="finalFilter"/><feBlend mode="multiply" in="finalFilter" in2="SourceGraphic"/></filter></defs><g fill="none" fill-rule="evenodd"><path d="M252.464 335.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z" fill="url(#a)" transform="rotate(24 -272.272 -82.087)"/><path d="M302.512 242.909c88.025 32.428 156-25.04 156-55.93 0-30.888-69.844-55.928-156-55.928-86.157 0-156 25.04-156 55.929 0 30.888 67.974 23.5 156 55.929z" fill="url(#b)" transform="rotate(24 -255.451 -119.868)"/><path d="M103.064 315.218c128.156 12.998 192.38 157.059 218.627 106.632 26.247-50.427-44.059-106.456 60.397-202.707 104.457-96.252-143.2-285.785-172.392-122.551C180.503 259.825-25.091 302.22 103.064 315.218z" transform="translate(1176 -33)" fill="url(#c)" filter="url(#d)"/></g></svg>
|
<svg width="1440" height="582" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<defs>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="a">
|
||||||
|
<stop stop-color="#606483" stop-opacity="0" offset="0%"/>
|
||||||
|
<stop stop-color="#363636" stop-opacity=".72" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient x1="50%" y1="0%" x2="39.334%" y2="79.282%" id="b">
|
||||||
|
<stop stop-color="#363636" offset="0%"/>
|
||||||
|
<stop stop-color="#363636" stop-opacity="0" offset="100%"/>
|
||||||
|
</linearGradient>
|
||||||
|
<radialGradient cx="33.3%" cy="43.394%" fx="33.3%" fy="43.394%" r="57.93%"
|
||||||
|
gradientTransform="matrix(.24796 -.96592 .92535 .25883 -.151 .643)" id="c">
|
||||||
|
<stop stop-color="#c3352e" stop-opacity="0" offset="0%"/>
|
||||||
|
<stop stop-color="#c3352e" stop-opacity=".64" offset="51.712%"/>
|
||||||
|
<stop stop-color="#c3352e" stop-opacity=".24" offset="100%"/>
|
||||||
|
</radialGradient>
|
||||||
|
<filter id="d">
|
||||||
|
<feTurbulence type="fractalNoise" numOctaves="2" baseFrequency=".3" result="turb"/>
|
||||||
|
<feComposite in="turb" operator="arithmetic" k1=".1" k2=".1" k3=".1" k4=".1" result="result1"/>
|
||||||
|
<feComposite operator="in" in="result1" in2="SourceGraphic" result="finalFilter"/>
|
||||||
|
<feBlend mode="multiply" in="finalFilter" in2="SourceGraphic"/>
|
||||||
|
</filter>
|
||||||
|
</defs>
|
||||||
|
<g fill="none" fill-rule="evenodd">
|
||||||
|
<path
|
||||||
|
d="M252.464 335.471c101.27 115.965 283.227-105.29 283.227-154.996 0-49.705-111.929-90-250-90s-250 40.295-250 90c0 49.706 115.503 39.032 216.773 154.996z"
|
||||||
|
fill="url(#a)" transform="rotate(24 -272.272 -82.087)"/>
|
||||||
|
<path
|
||||||
|
d="M302.512 242.909c88.025 32.428 156-25.04 156-55.93 0-30.888-69.844-55.928-156-55.928-86.157 0-156 25.04-156 55.929 0 30.888 67.974 23.5 156 55.929z"
|
||||||
|
fill="url(#b)" transform="rotate(24 -255.451 -119.868)"/>
|
||||||
|
<path
|
||||||
|
d="M103.064 315.218c128.156 12.998 192.38 157.059 218.627 106.632 26.247-50.427-44.059-106.456 60.397-202.707 104.457-96.252-143.2-285.785-172.392-122.551C180.503 259.825-25.091 302.22 103.064 315.218z"
|
||||||
|
transform="translate(1176 -33)" fill="url(#c)" filter="url(#d)"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.2 KiB |
@ -1 +1,6 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" fill="#fff"><path d="M45.563 29.174l-22-15A1 1 0 0022 15v30a.999.999 0 001.563.826l22-15a1 1 0 000-1.652zM24 43.107V16.893L43.225 30 24 43.107z"/><path d="M30 0C13.458 0 0 13.458 0 30s13.458 30 30 30 30-13.458 30-30S46.542 0 30 0zm0 58C14.561 58 2 45.439 2 30S14.561 2 30 2s28 12.561 28 28-12.561 28-28 28z"/></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" fill="#fff">
|
||||||
|
<path
|
||||||
|
d="M45.563 29.174l-22-15A1 1 0 0022 15v30a.999.999 0 001.563.826l22-15a1 1 0 000-1.652zM24 43.107V16.893L43.225 30 24 43.107z"/>
|
||||||
|
<path
|
||||||
|
d="M30 0C13.458 0 0 13.458 0 30s13.458 30 30 30 30-13.458 30-30S46.542 0 30 0zm0 58C14.561 58 2 45.439 2 30S14.561 2 30 2s28 12.561 28 28-12.561 28-28 28z"/>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 375 B After Width: | Height: | Size: 391 B |
@ -1 +1,6 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 176 176" width="32" height="32"><circle fill="red" cx="88" cy="88" r="88"/><path fill="#FFF" d="M88 46c23.1 0 42 18.8 42 42s-18.8 42-42 42-42-18.8-42-42 18.9-42 42-42m0-4c-25.4 0-46 20.6-46 46s20.6 46 46 46 46-20.6 46-46-20.6-46-46-46z"/><path fill="#FFF" d="M72 111l39-24-39-22z"/></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 176 176" width="32" height="32">
|
||||||
|
<circle fill="red" cx="88" cy="88" r="88"/>
|
||||||
|
<path fill="#FFF"
|
||||||
|
d="M88 46c23.1 0 42 18.8 42 42s-18.8 42-42 42-42-18.8-42-42 18.9-42 42-42m0-4c-25.4 0-46 20.6-46 46s20.6 46 46 46 46-20.6 46-46-20.6-46-46-46z"/>
|
||||||
|
<path fill="#FFF" d="M72 111l39-24-39-22z"/>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 360 B |
@ -1,65 +1,65 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
|
||||||
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
<meta content="IE=edge" http-equiv="X-UA-Compatible"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta content="width=device-width, initial-scale=1" name="viewport"/>
|
||||||
<title>YouTube Music Desktop App (Unofficial)</title>
|
<title>YouTube Music Desktop App (Unofficial)</title>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
|
||||||
href="./favicon/favicon.ico"
|
href="./favicon/favicon.ico"
|
||||||
|
rel="icon"
|
||||||
sizes="16x16"
|
sizes="16x16"
|
||||||
type="image/x-icon"
|
type="image/x-icon"
|
||||||
/>
|
/>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
|
||||||
href="./favicon/favicon_32.png"
|
href="./favicon/favicon_32.png"
|
||||||
|
rel="icon"
|
||||||
sizes="32x32"
|
sizes="32x32"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
/>
|
/>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
|
||||||
href="./favicon/favicon_48.png"
|
href="./favicon/favicon_48.png"
|
||||||
|
rel="icon"
|
||||||
sizes="48x48"
|
sizes="48x48"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
/>
|
/>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
|
||||||
href="./favicon/favicon_96.png"
|
href="./favicon/favicon_96.png"
|
||||||
|
rel="icon"
|
||||||
sizes="96x96"
|
sizes="96x96"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
/>
|
/>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
|
||||||
href="./favicon/favicon_144.png"
|
href="./favicon/favicon_144.png"
|
||||||
|
rel="icon"
|
||||||
sizes="144x144"
|
sizes="144x144"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<meta name="theme-color" content="#131313" />
|
<meta content="#131313" name="theme-color"/>
|
||||||
<meta
|
<meta
|
||||||
name="description"
|
|
||||||
content="YouTube Music Unofficial Desktop App with built-in ad blocker and downloader"
|
content="YouTube Music Unofficial Desktop App with built-in ad blocker and downloader"
|
||||||
|
name="description"
|
||||||
/>
|
/>
|
||||||
<meta
|
<meta
|
||||||
property="og:site_name"
|
|
||||||
content="YouTube Music Desktop App"
|
content="YouTube Music Desktop App"
|
||||||
|
property="og:site_name"
|
||||||
/>
|
/>
|
||||||
<meta
|
<meta
|
||||||
|
class="meta-url"
|
||||||
|
content="https://th-ch.github.io/youtube-music"
|
||||||
property="og:url"
|
property="og:url"
|
||||||
class="meta-url"
|
|
||||||
content="https://th-ch.github.io/youtube-music"
|
|
||||||
/>
|
/>
|
||||||
<meta property="og:type" content="website" />
|
<meta content="website" property="og:type"/>
|
||||||
<meta
|
<meta
|
||||||
name="twitter:url"
|
|
||||||
class="meta-url"
|
class="meta-url"
|
||||||
content="https://th-ch.github.io/youtube-music"
|
content="https://th-ch.github.io/youtube-music"
|
||||||
|
name="twitter:url"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<link href="./style/fonts.css" rel="stylesheet"/>
|
<link href="./style/fonts.css" rel="stylesheet"/>
|
||||||
<link rel="stylesheet" href="./style/style.css" />
|
<link href="./style/style.css" rel="stylesheet"/>
|
||||||
<script src="https://unpkg.com/scrollreveal"></script>
|
<script src="https://unpkg.com/scrollreveal"></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="has-animations vsc-initialized" style="height: 100%;">
|
<body class="has-animations vsc-initialized" style="height: 100%;">
|
||||||
@ -71,9 +71,9 @@
|
|||||||
<h1 class="m-0">
|
<h1 class="m-0">
|
||||||
<a href="https://github.com/th-ch/youtube-music">
|
<a href="https://github.com/th-ch/youtube-music">
|
||||||
<img
|
<img
|
||||||
|
alt="YouTube Music"
|
||||||
class="header-logo-image"
|
class="header-logo-image"
|
||||||
src="./img/youtube-music.svg"
|
src="./img/youtube-music.svg"
|
||||||
alt="YouTube Music"
|
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</h1>
|
</h1>
|
||||||
@ -110,9 +110,9 @@
|
|||||||
<div class="mockup-container">
|
<div class="mockup-container">
|
||||||
<div class="mockup-bg">
|
<div class="mockup-bg">
|
||||||
<img
|
<img
|
||||||
src="./img/youtube-music.png"
|
|
||||||
id="mockup-header-img"
|
|
||||||
alt="YouTube Music"
|
alt="YouTube Music"
|
||||||
|
id="mockup-header-img"
|
||||||
|
src="./img/youtube-music.png"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -127,11 +127,10 @@
|
|||||||
<div class="feature-extended">
|
<div class="feature-extended">
|
||||||
<div class="feature-extended-image">
|
<div class="feature-extended-image">
|
||||||
<img
|
<img
|
||||||
class="device-mockup"
|
|
||||||
src="./img/adblock.svg"
|
|
||||||
width="100px"
|
|
||||||
alt="Adblocker"
|
alt="Adblocker"
|
||||||
|
class="device-mockup"
|
||||||
data-sr-id="0"
|
data-sr-id="0"
|
||||||
|
src="./img/adblock.svg"
|
||||||
style="
|
style="
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
@ -157,6 +156,7 @@
|
|||||||
cubic-bezier(0.215, 0.61, 0.355, 1) 0s,
|
cubic-bezier(0.215, 0.61, 0.355, 1) 0s,
|
||||||
transform 0.6s cubic-bezier(0.215, 0.61, 0.355, 1) 0s;
|
transform 0.6s cubic-bezier(0.215, 0.61, 0.355, 1) 0s;
|
||||||
"
|
"
|
||||||
|
width="100px"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
@ -195,10 +195,10 @@
|
|||||||
<div class="feature-extended">
|
<div class="feature-extended">
|
||||||
<div class="feature-extended-image">
|
<div class="feature-extended-image">
|
||||||
<img
|
<img
|
||||||
class="device-mockup"
|
|
||||||
src="./img/download.svg"
|
|
||||||
alt="Downloader"
|
alt="Downloader"
|
||||||
|
class="device-mockup"
|
||||||
data-sr-id="2"
|
data-sr-id="2"
|
||||||
|
src="./img/download.svg"
|
||||||
style="
|
style="
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
@ -265,10 +265,10 @@
|
|||||||
<div class="feature-extended">
|
<div class="feature-extended">
|
||||||
<div class="feature-extended-image">
|
<div class="feature-extended-image">
|
||||||
<img
|
<img
|
||||||
class="device-mockup"
|
|
||||||
src="./img/plugins.svg"
|
|
||||||
alt="Plugins"
|
alt="Plugins"
|
||||||
|
class="device-mockup"
|
||||||
data-sr-id="3"
|
data-sr-id="3"
|
||||||
|
src="./img/plugins.svg"
|
||||||
style="
|
style="
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
@ -337,10 +337,10 @@
|
|||||||
<div class="feature-extended">
|
<div class="feature-extended">
|
||||||
<div class="feature-extended-image">
|
<div class="feature-extended-image">
|
||||||
<img
|
<img
|
||||||
class="device-mockup"
|
|
||||||
src="./img/code.svg"
|
|
||||||
alt="Code"
|
alt="Code"
|
||||||
|
class="device-mockup"
|
||||||
data-sr-id="4"
|
data-sr-id="4"
|
||||||
|
src="./img/code.svg"
|
||||||
style="
|
style="
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
width: 200%;
|
width: 200%;
|
||||||
@ -442,7 +442,7 @@
|
|||||||
<div class="site-footer-inner">
|
<div class="site-footer-inner">
|
||||||
<div class="brand footer-brand">
|
<div class="brand footer-brand">
|
||||||
<a href="https://github.com/th-ch/youtube-music">
|
<a href="https://github.com/th-ch/youtube-music">
|
||||||
<img src="./img/youtube-music.svg" alt="YouTube Music logo" />
|
<img alt="YouTube Music logo" src="./img/youtube-music.svg"/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<ul class="footer-links list-reset">
|
<ul class="footer-links list-reset">
|
||||||
@ -465,10 +465,10 @@
|
|||||||
<a href="https://github.com/th-ch/youtube-music">
|
<a href="https://github.com/th-ch/youtube-music">
|
||||||
<span class="screen-reader-text">GitHub</span>
|
<span class="screen-reader-text">GitHub</span>
|
||||||
<svg
|
<svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
width="16"
|
|
||||||
height="16"
|
height="16"
|
||||||
viewBox="0 0 1792 1792"
|
viewBox="0 0 1792 1792"
|
||||||
|
width="16"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
d="M896 128q209 0 385.5 103t279.5 279.5 103 385.5q0 251-146.5 451.5t-378.5 277.5q-27 5-40-7t-13-30q0-3 .5-76.5t.5-134.5q0-97-52-142 57-6 102.5-18t94-39 81-66.5 53-105 20.5-150.5q0-119-79-206 37-91-8-204-28-9-81 11t-92 44l-38 24q-93-26-192-26t-192 26q-16-11-42.5-27t-83.5-38.5-85-13.5q-45 113-8 204-79 87-79 206 0 85 20.5 150t52.5 105 80.5 67 94 39 102.5 18q-39 36-49 103-21 10-45 15t-57 5-65.5-21.5-55.5-62.5q-19-32-48.5-52t-49.5-24l-20-3q-21 0-29 4.5t-5 11.5 9 14 13 12l7 5q22 10 43.5 38t31.5 51l10 23q13 38 44 61.5t67 30 69.5 7 55.5-3.5l23-4q0 38 .5 88.5t.5 54.5q0 18-13 30t-40 7q-232-77-378.5-277.5t-146.5-451.5q0-209 103-385.5t279.5-279.5 385.5-103zm-477 1103q3-7-7-12-10-3-13 2-3 7 7 12 9 6 13-2zm31 34q7-5-2-16-10-9-16-3-7 5 2 16 10 10 16 3zm30 45q9-7 0-19-8-13-17-6-9 5 0 18t17 7zm42 42q8-8-4-19-12-12-20-3-9 8 4 19 12 12 20 3zm57 25q3-11-13-16-15-4-19 7t13 15q15 6 19-6zm63 5q0-13-17-11-16 0-16 11 0 13 17 11 16 0 16-11zm58-10q-2-11-18-9-16 3-14 15t18 8 14-14z"
|
d="M896 128q209 0 385.5 103t279.5 279.5 103 385.5q0 251-146.5 451.5t-378.5 277.5q-27 5-40-7t-13-30q0-3 .5-76.5t.5-134.5q0-97-52-142 57-6 102.5-18t94-39 81-66.5 53-105 20.5-150.5q0-119-79-206 37-91-8-204-28-9-81 11t-92 44l-38 24q-93-26-192-26t-192 26q-16-11-42.5-27t-83.5-38.5-85-13.5q-45 113-8 204-79 87-79 206 0 85 20.5 150t52.5 105 80.5 67 94 39 102.5 18q-39 36-49 103-21 10-45 15t-57 5-65.5-21.5-55.5-62.5q-19-32-48.5-52t-49.5-24l-20-3q-21 0-29 4.5t-5 11.5 9 14 13 12l7 5q22 10 43.5 38t31.5 51l10 23q13 38 44 61.5t67 30 69.5 7 55.5-3.5l23-4q0 38 .5 88.5t.5 54.5q0 18-13 30t-40 7q-232-77-378.5-277.5t-146.5-451.5q0-209 103-385.5t279.5-279.5 385.5-103zm-477 1103q3-7-7-12-10-3-13 2-3 7 7 12 9 6 13-2zm31 34q7-5-2-16-10-9-16-3-7 5 2 16 10 10 16 3zm30 45q9-7 0-19-8-13-17-6-9 5 0 18t17 7zm42 42q8-8-4-19-12-12-20-3-9 8 4 19 12 12 20 3zm57 25q3-11-13-16-15-4-19 7t13 15q15 6 19-6zm63 5q0-13-17-11-16 0-16 11 0 13 17 11 16 0 16-11zm58-10q-2-11-18-9-16 3-14 15t18 8 14-14z"
|
||||||
|
|||||||
124
docs/js/main.js
@ -1,46 +1,49 @@
|
|||||||
|
/* eslint-disable */
|
||||||
|
|
||||||
// Constants
|
// Constants
|
||||||
const element = document.documentElement,
|
const element = document.documentElement;
|
||||||
body = document.body,
|
const { body } = document;
|
||||||
revealOnScroll = (window.sr = ScrollReveal({ mobile: false }));
|
const revealOnScroll = (window.sr = ScrollReveal({ mobile: false }));
|
||||||
|
|
||||||
// Load animations
|
// Load animations
|
||||||
element.classList.remove("no-js");
|
element.classList.remove('no-js');
|
||||||
element.classList.add("js");
|
element.classList.add('js');
|
||||||
window.addEventListener("load", function () {
|
window.addEventListener('load', () => {
|
||||||
body.classList.add("is-loaded");
|
body.classList.add('is-loaded');
|
||||||
});
|
});
|
||||||
|
|
||||||
if (body.classList.contains("has-animations")) {
|
if (body.classList.contains('has-animations')) {
|
||||||
window.addEventListener("load", function () {
|
window.addEventListener('load', () => {
|
||||||
revealOnScroll.reveal(".feature-extended .device-mockup", {
|
revealOnScroll.reveal('.feature-extended .device-mockup', {
|
||||||
duration: 600,
|
duration: 600,
|
||||||
distance: "100px",
|
distance: '100px',
|
||||||
easing: "cubic-bezier(0.215, 0.61, 0.355, 1)",
|
easing: 'cubic-bezier(0.215, 0.61, 0.355, 1)',
|
||||||
origin: "bottom",
|
origin: 'bottom',
|
||||||
viewFactor: 0.6,
|
viewFactor: 0.6,
|
||||||
});
|
});
|
||||||
revealOnScroll.reveal(".feature-extended .feature-extended-body", {
|
revealOnScroll.reveal('.feature-extended .feature-extended-body', {
|
||||||
duration: 600,
|
duration: 600,
|
||||||
distance: "40px",
|
distance: '40px',
|
||||||
easing: "cubic-bezier(0.215, 0.61, 0.355, 1)",
|
easing: 'cubic-bezier(0.215, 0.61, 0.355, 1)',
|
||||||
origin: "top",
|
origin: 'top',
|
||||||
viewFactor: 0.6,
|
viewFactor: 0.6,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bubble canvas
|
// Bubble canvas
|
||||||
let bubbleCanvas = function (t) {
|
const bubbleCanvas = function (t) {
|
||||||
let e = this;
|
const e = this;
|
||||||
e.parentNode = t;
|
e.parentNode = t;
|
||||||
e.setCanvasSize();
|
e.setCanvasSize();
|
||||||
window.addEventListener("resize", function () {
|
window.addEventListener('resize', () => {
|
||||||
e.setCanvasSize();
|
e.setCanvasSize();
|
||||||
});
|
});
|
||||||
e.mouseX = 0;
|
e.mouseX = 0;
|
||||||
e.mouseY = 0;
|
e.mouseY = 0;
|
||||||
window.addEventListener("mousemove", function (t) {
|
window.addEventListener('mousemove', (t) => {
|
||||||
(e.mouseX = t.clientX), (e.mouseY = t.clientY);
|
e.mouseX = t.clientX;
|
||||||
|
e.mouseY = t.clientY;
|
||||||
});
|
});
|
||||||
e.randomise();
|
e.randomise();
|
||||||
};
|
};
|
||||||
@ -55,15 +58,15 @@ bubbleCanvas.prototype.generateDecimalBetween = function (start, end) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
bubbleCanvas.prototype.update = function () {
|
bubbleCanvas.prototype.update = function () {
|
||||||
let t = this;
|
const t = this;
|
||||||
t.translateX = t.translateX - t.movementX;
|
t.translateX -= t.movementX;
|
||||||
t.translateY = t.translateY - t.movementY;
|
t.translateY -= t.movementY;
|
||||||
t.posX += (t.mouseX / (t.staticity / t.magnetism) - t.posX) / t.smoothFactor;
|
t.posX += (t.mouseX / (t.staticity / t.magnetism) - t.posX) / t.smoothFactor;
|
||||||
t.posY += (t.mouseY / (t.staticity / t.magnetism) - t.posY) / t.smoothFactor;
|
t.posY += (t.mouseY / (t.staticity / t.magnetism) - t.posY) / t.smoothFactor;
|
||||||
if (
|
if (
|
||||||
t.translateY + t.posY < 0 ||
|
t.translateY + t.posY < 0
|
||||||
t.translateX + t.posX < 0 ||
|
|| t.translateX + t.posX < 0
|
||||||
t.translateX + t.posX > t.canvasWidth
|
|| t.translateX + t.posX > t.canvasWidth
|
||||||
) {
|
) {
|
||||||
t.randomise();
|
t.randomise();
|
||||||
t.translateY = t.canvasHeight;
|
t.translateY = t.canvasHeight;
|
||||||
@ -71,7 +74,7 @@ bubbleCanvas.prototype.update = function () {
|
|||||||
};
|
};
|
||||||
|
|
||||||
bubbleCanvas.prototype.randomise = function () {
|
bubbleCanvas.prototype.randomise = function () {
|
||||||
this.colors = ["195,53,46", "172,54,46"];
|
this.colors = ['195,53,46', '172,54,46'];
|
||||||
|
|
||||||
this.velocity = 20;
|
this.velocity = 20;
|
||||||
this.smoothFactor = 50;
|
this.smoothFactor = 50;
|
||||||
@ -88,17 +91,17 @@ bubbleCanvas.prototype.randomise = function () {
|
|||||||
this.translateY = this.generateDecimalBetween(0, this.canvasHeight);
|
this.translateY = this.generateDecimalBetween(0, this.canvasHeight);
|
||||||
};
|
};
|
||||||
|
|
||||||
let drawBubbleCanvas = function (t) {
|
const drawBubbleCanvas = function (t) {
|
||||||
this.canvas = document.getElementById(t);
|
this.canvas = document.getElementById(t);
|
||||||
this.ctx = this.canvas.getContext("2d");
|
this.ctx = this.canvas.getContext('2d');
|
||||||
this.dpr = window.devicePixelRatio;
|
this.dpr = window.devicePixelRatio;
|
||||||
};
|
};
|
||||||
|
|
||||||
drawBubbleCanvas.prototype.start = function (bubbleDensity) {
|
drawBubbleCanvas.prototype.start = function (bubbleDensity) {
|
||||||
let t = this;
|
const t = this;
|
||||||
t.bubbleDensity = bubbleDensity;
|
t.bubbleDensity = bubbleDensity;
|
||||||
t.setCanvasSize();
|
t.setCanvasSize();
|
||||||
window.addEventListener("resize", function () {
|
window.addEventListener('resize', () => {
|
||||||
t.setCanvasSize();
|
t.setCanvasSize();
|
||||||
});
|
});
|
||||||
t.bubblesList = [];
|
t.bubblesList = [];
|
||||||
@ -114,23 +117,24 @@ drawBubbleCanvas.prototype.setCanvasSize = function () {
|
|||||||
this.hdpi = this.h * this.dpr;
|
this.hdpi = this.h * this.dpr;
|
||||||
this.canvas.width = this.wdpi;
|
this.canvas.width = this.wdpi;
|
||||||
this.canvas.height = this.hdpi;
|
this.canvas.height = this.hdpi;
|
||||||
this.canvas.style.width = this.w + "px";
|
this.canvas.style.width = this.w + 'px';
|
||||||
this.canvas.style.height = this.h + "px";
|
this.canvas.style.height = this.h + 'px';
|
||||||
this.ctx.scale(this.dpr, this.dpr);
|
this.ctx.scale(this.dpr, this.dpr);
|
||||||
};
|
};
|
||||||
|
|
||||||
drawBubbleCanvas.prototype.animate = function () {
|
drawBubbleCanvas.prototype.animate = function () {
|
||||||
let t = this;
|
const t = this;
|
||||||
t.ctx.clearRect(0, 0, t.canvas.clientWidth, t.canvas.clientHeight);
|
t.ctx.clearRect(0, 0, t.canvas.clientWidth, t.canvas.clientHeight);
|
||||||
t.bubblesList.forEach(function (e) {
|
for (const e of t.bubblesList) {
|
||||||
e.update();
|
e.update();
|
||||||
t.ctx.translate(e.translateX, e.translateY);
|
t.ctx.translate(e.translateX, e.translateY);
|
||||||
t.ctx.beginPath();
|
t.ctx.beginPath();
|
||||||
t.ctx.arc(e.posX, e.posY, e.size, 0, 2 * Math.PI);
|
t.ctx.arc(e.posX, e.posY, e.size, 0, 2 * Math.PI);
|
||||||
t.ctx.fillStyle = "rgba(" + e.color + "," + e.alpha + ")";
|
t.ctx.fillStyle = 'rgba(' + e.color + ',' + e.alpha + ')';
|
||||||
t.ctx.fill();
|
t.ctx.fill();
|
||||||
t.ctx.setTransform(t.dpr, 0, 0, t.dpr, 0, 0);
|
t.ctx.setTransform(t.dpr, 0, 0, t.dpr, 0, 0);
|
||||||
});
|
}
|
||||||
|
|
||||||
requestAnimationFrame(this.animate.bind(this));
|
requestAnimationFrame(this.animate.bind(this));
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -139,15 +143,16 @@ drawBubbleCanvas.prototype.addBubble = function (t) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
drawBubbleCanvas.prototype.generateBubbles = function () {
|
drawBubbleCanvas.prototype.generateBubbles = function () {
|
||||||
let t = this;
|
const t = this;
|
||||||
for (let e = 0; e < t.bubbleDensity; e++)
|
for (let e = 0; e < t.bubbleDensity; e++) {
|
||||||
t.addBubble(new bubbleCanvas(t.canvas.parentNode));
|
t.addBubble(new bubbleCanvas(t.canvas.parentNode));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Night sky with stars canvas
|
// Night sky with stars canvas
|
||||||
let starCanvas = function (t) {
|
const starCanvas = function (t) {
|
||||||
this.canvas = document.getElementById(t);
|
this.canvas = document.getElementById(t);
|
||||||
this.ctx = this.canvas.getContext("2d");
|
this.ctx = this.canvas.getContext('2d');
|
||||||
this.dpr = window.devicePixelRatio;
|
this.dpr = window.devicePixelRatio;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -164,9 +169,9 @@ starCanvas.prototype.start = function () {
|
|||||||
|
|
||||||
setCanvasExtents();
|
setCanvasExtents();
|
||||||
|
|
||||||
window.onresize = () => {
|
window.addEventListener('resize', () => {
|
||||||
setCanvasExtents();
|
setCanvasExtents();
|
||||||
};
|
});
|
||||||
|
|
||||||
const makeStars = (count) => {
|
const makeStars = (count) => {
|
||||||
const out = [];
|
const out = [];
|
||||||
@ -178,19 +183,20 @@ starCanvas.prototype.start = function () {
|
|||||||
};
|
};
|
||||||
out.push(s);
|
out.push(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
return out;
|
return out;
|
||||||
};
|
};
|
||||||
|
|
||||||
let stars = makeStars(10000);
|
const stars = makeStars(10_000);
|
||||||
|
|
||||||
const clear = () => {
|
const clear = () => {
|
||||||
this.ctx.fillStyle = "#212121";
|
this.ctx.fillStyle = '#212121';
|
||||||
this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
|
this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
|
||||||
};
|
};
|
||||||
|
|
||||||
const putPixel = (x, y, brightness) => {
|
const putPixel = (x, y, brightness) => {
|
||||||
const intensity = brightness * 255;
|
const intensity = brightness * 255;
|
||||||
const rgb = "rgb(" + intensity + "," + intensity + "," + intensity + ")";
|
const rgb = 'rgb(' + intensity + ',' + intensity + ',' + intensity + ')';
|
||||||
this.ctx.beginPath();
|
this.ctx.beginPath();
|
||||||
this.ctx.arc(x, y, 0.9, 0, 2 * Math.PI);
|
this.ctx.arc(x, y, 0.9, 0, 2 * Math.PI);
|
||||||
this.ctx.fillStyle = rgb;
|
this.ctx.fillStyle = rgb;
|
||||||
@ -199,7 +205,7 @@ starCanvas.prototype.start = function () {
|
|||||||
|
|
||||||
const moveStars = (distance) => {
|
const moveStars = (distance) => {
|
||||||
const count = stars.length;
|
const count = stars.length;
|
||||||
for (var i = 0; i < count; i++) {
|
for (let i = 0; i < count; i++) {
|
||||||
const s = stars[i];
|
const s = stars[i];
|
||||||
s.z -= distance;
|
s.z -= distance;
|
||||||
while (s.z <= 1) {
|
while (s.z <= 1) {
|
||||||
@ -208,15 +214,15 @@ starCanvas.prototype.start = function () {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let prevTime;
|
let previousTime;
|
||||||
const init = (time) => {
|
const init = (time) => {
|
||||||
prevTime = time;
|
previousTime = time;
|
||||||
requestAnimationFrame(tick);
|
requestAnimationFrame(tick);
|
||||||
};
|
};
|
||||||
|
|
||||||
const tick = (time) => {
|
const tick = (time) => {
|
||||||
let elapsed = time - prevTime;
|
const elapsed = time - previousTime;
|
||||||
prevTime = time;
|
previousTime = time;
|
||||||
|
|
||||||
moveStars(elapsed * 0.1);
|
moveStars(elapsed * 0.1);
|
||||||
|
|
||||||
@ -226,7 +232,7 @@ starCanvas.prototype.start = function () {
|
|||||||
const cy = h / 2;
|
const cy = h / 2;
|
||||||
|
|
||||||
const count = stars.length;
|
const count = stars.length;
|
||||||
for (var i = 0; i < count; i++) {
|
for (let i = 0; i < count; i++) {
|
||||||
const star = stars[i];
|
const star = stars[i];
|
||||||
|
|
||||||
const x = cx + star.x / (star.z * 0.001);
|
const x = cx + star.x / (star.z * 0.001);
|
||||||
@ -236,7 +242,7 @@ starCanvas.prototype.start = function () {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const d = star.z / 1000.0;
|
const d = star.z / 1000;
|
||||||
const b = 1 - d * d;
|
const b = 1 - d * d;
|
||||||
|
|
||||||
putPixel(x, y, b);
|
putPixel(x, y, b);
|
||||||
@ -249,12 +255,12 @@ starCanvas.prototype.start = function () {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Start canvas animations
|
// Start canvas animations
|
||||||
window.addEventListener("load", function () {
|
window.addEventListener('load', () => {
|
||||||
// Stars
|
// Stars
|
||||||
const headCanvas = new starCanvas("hero-particles");
|
const headCanvas = new starCanvas('hero-particles');
|
||||||
// Bubbles
|
// Bubbles
|
||||||
const footerCanvas = new drawBubbleCanvas("footer-particles");
|
const footerCanvas = new drawBubbleCanvas('footer-particles');
|
||||||
const mainCanvas = new drawBubbleCanvas("main-particles");
|
const mainCanvas = new drawBubbleCanvas('main-particles');
|
||||||
|
|
||||||
headCanvas.start();
|
headCanvas.start();
|
||||||
footerCanvas.start(30);
|
footerCanvas.start(30);
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H0TbFhsqMA6aw.woff2) format('woff2');
|
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H0TbFhsqMA6aw.woff2) format('woff2');
|
||||||
unicode-range: U+0590-05FF, U+20AA, U+25CC, U+FB1D-FB4F;
|
unicode-range: U+0590-05FF, U+20AA, U+25CC, U+FB1D-FB4F;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* latin */
|
/* latin */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heebo';
|
font-family: 'Heebo';
|
||||||
@ -14,6 +15,7 @@
|
|||||||
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H2TbFhsqMA.woff2) format('woff2');
|
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H2TbFhsqMA.woff2) format('woff2');
|
||||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* hebrew */
|
/* hebrew */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heebo';
|
font-family: 'Heebo';
|
||||||
@ -22,6 +24,7 @@
|
|||||||
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H0TbFhsqMA6aw.woff2) format('woff2');
|
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H0TbFhsqMA6aw.woff2) format('woff2');
|
||||||
unicode-range: U+0590-05FF, U+20AA, U+25CC, U+FB1D-FB4F;
|
unicode-range: U+0590-05FF, U+20AA, U+25CC, U+FB1D-FB4F;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* latin */
|
/* latin */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heebo';
|
font-family: 'Heebo';
|
||||||
@ -30,6 +33,7 @@
|
|||||||
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H2TbFhsqMA.woff2) format('woff2');
|
src: url(https://fonts.gstatic.com/s/heebo/v9/NGS6v5_NC0k9P9H2TbFhsqMA.woff2) format('woff2');
|
||||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* latin-ext */
|
/* latin-ext */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Oxygen';
|
font-family: 'Oxygen';
|
||||||
@ -38,6 +42,7 @@
|
|||||||
src: url(https://fonts.gstatic.com/s/oxygen/v10/2sDcZG1Wl4LcnbuCNWgzZmW5Kb8VZBHR.woff2) format('woff2');
|
src: url(https://fonts.gstatic.com/s/oxygen/v10/2sDcZG1Wl4LcnbuCNWgzZmW5Kb8VZBHR.woff2) format('woff2');
|
||||||
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* latin */
|
/* latin */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Oxygen';
|
font-family: 'Oxygen';
|
||||||
|
|||||||
50
error.html
@ -1,50 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<title>Cannot load YouTube Music</title>
|
|
||||||
<style>
|
|
||||||
body {
|
|
||||||
background: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
margin: 0;
|
|
||||||
font-family: Roboto, Arial, sans-serif;
|
|
||||||
font-size: 20px;
|
|
||||||
font-weight: 500;
|
|
||||||
color: rgba(255, 255, 255, 0.5);
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
margin-right: -50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button {
|
|
||||||
background: #065fd4;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: nowrap;
|
|
||||||
color: white;
|
|
||||||
font: inherit;
|
|
||||||
text-transform: uppercase;
|
|
||||||
text-decoration: none;
|
|
||||||
border-radius: 2px;
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: normal;
|
|
||||||
text-align: center;
|
|
||||||
padding: 8px 22px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="container">
|
|
||||||
<p>Cannot load YouTube Music… Internet disconnected?</p>
|
|
||||||
<a href="#" class="button" onclick="reload()">Retry</a>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
516
index.js
@ -1,516 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
const electron = require("electron");
|
|
||||||
const enhanceWebRequest = require("electron-better-web-request").default;
|
|
||||||
const is = require("electron-is");
|
|
||||||
const unhandled = require("electron-unhandled");
|
|
||||||
const { autoUpdater } = require("electron-updater");
|
|
||||||
|
|
||||||
const config = require("./config");
|
|
||||||
const { setApplicationMenu } = require("./menu");
|
|
||||||
const { fileExists, injectCSS } = require("./plugins/utils");
|
|
||||||
const { isTesting } = require("./utils/testing");
|
|
||||||
const { setUpTray } = require("./tray");
|
|
||||||
const { setupSongInfo } = require("./providers/song-info");
|
|
||||||
const { setupAppControls, restart } = require("./providers/app-controls");
|
|
||||||
const { APP_PROTOCOL, setupProtocolHandler, handleProtocol } = require("./providers/protocol-handler");
|
|
||||||
|
|
||||||
// Catch errors and log them
|
|
||||||
unhandled({
|
|
||||||
logger: console.error,
|
|
||||||
showDialog: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Disable Node options if the env var is set
|
|
||||||
process.env.NODE_OPTIONS = "";
|
|
||||||
|
|
||||||
const app = electron.app;
|
|
||||||
// Prevent window being garbage collected
|
|
||||||
let mainWindow;
|
|
||||||
autoUpdater.autoDownload = false;
|
|
||||||
|
|
||||||
|
|
||||||
const gotTheLock = app.requestSingleInstanceLock();
|
|
||||||
if (!gotTheLock) app.exit();
|
|
||||||
|
|
||||||
app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer"); // Required for downloader
|
|
||||||
app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
|
|
||||||
if (config.get("options.disableHardwareAcceleration")) {
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log("Disabling hardware acceleration");
|
|
||||||
}
|
|
||||||
app.disableHardwareAcceleration();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is.linux() && config.plugins.isEnabled("shortcuts")) {
|
|
||||||
//stops chromium from launching it's own mpris service
|
|
||||||
app.commandLine.appendSwitch('disable-features', 'MediaSessionService');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config.get("options.proxy")) {
|
|
||||||
app.commandLine.appendSwitch("proxy-server", config.get("options.proxy"));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Adds debug features like hotkeys for triggering dev tools and reload
|
|
||||||
require("electron-debug")({
|
|
||||||
showDevTools: false //disable automatic devTools on new window
|
|
||||||
});
|
|
||||||
|
|
||||||
let icon = "assets/youtube-music.png";
|
|
||||||
if (process.platform == "win32") {
|
|
||||||
icon = "assets/generated/icon.ico";
|
|
||||||
} else if (process.platform == "darwin") {
|
|
||||||
icon = "assets/generated/icon.icns";
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClosed() {
|
|
||||||
// Dereference the window
|
|
||||||
// For multiple windows store them in an array
|
|
||||||
mainWindow = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @param {Electron.BrowserWindow} win */
|
|
||||||
function loadPlugins(win) {
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
|
|
||||||
// Load user CSS
|
|
||||||
const themes = config.get("options.themes");
|
|
||||||
if (Array.isArray(themes)) {
|
|
||||||
themes.forEach((cssFile) => {
|
|
||||||
fileExists(
|
|
||||||
cssFile,
|
|
||||||
() => {
|
|
||||||
injectCSS(win.webContents, cssFile);
|
|
||||||
},
|
|
||||||
() => {
|
|
||||||
console.warn(`CSS file "${cssFile}" does not exist, ignoring`);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
win.webContents.once("did-finish-load", () => {
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log("did finish load");
|
|
||||||
win.webContents.openDevTools();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
config.plugins.getEnabled().forEach(([plugin, options]) => {
|
|
||||||
console.log("Loaded plugin - " + plugin);
|
|
||||||
const pluginPath = path.join(__dirname, "plugins", plugin, "back.js");
|
|
||||||
fileExists(pluginPath, () => {
|
|
||||||
const handle = require(pluginPath);
|
|
||||||
handle(win, options);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function createMainWindow() {
|
|
||||||
const windowSize = config.get("window-size");
|
|
||||||
const windowMaximized = config.get("window-maximized");
|
|
||||||
const windowPosition = config.get("window-position");
|
|
||||||
const useInlineMenu = config.plugins.isEnabled("in-app-menu");
|
|
||||||
|
|
||||||
const win = new electron.BrowserWindow({
|
|
||||||
icon: icon,
|
|
||||||
width: windowSize.width,
|
|
||||||
height: windowSize.height,
|
|
||||||
backgroundColor: "#000",
|
|
||||||
show: false,
|
|
||||||
webPreferences: {
|
|
||||||
// TODO: re-enable contextIsolation once it can work with ffmepg.wasm
|
|
||||||
// Possible bundling? https://github.com/ffmpegwasm/ffmpeg.wasm/issues/126
|
|
||||||
contextIsolation: false,
|
|
||||||
preload: path.join(__dirname, "preload.js"),
|
|
||||||
nodeIntegrationInSubFrames: true,
|
|
||||||
affinity: "main-window", // main window, and addition windows should work in one process
|
|
||||||
...(!isTesting()
|
|
||||||
? {
|
|
||||||
// Sandbox is only enabled in tests for now
|
|
||||||
// See https://www.electronjs.org/docs/latest/tutorial/sandbox#preload-scripts
|
|
||||||
sandbox: false,
|
|
||||||
}
|
|
||||||
: undefined),
|
|
||||||
},
|
|
||||||
frame: !is.macOS() && !useInlineMenu,
|
|
||||||
titleBarStyle: useInlineMenu
|
|
||||||
? "hidden"
|
|
||||||
: is.macOS()
|
|
||||||
? "hiddenInset"
|
|
||||||
: "default",
|
|
||||||
autoHideMenuBar: config.get("options.hideMenu"),
|
|
||||||
});
|
|
||||||
loadPlugins(win);
|
|
||||||
|
|
||||||
if (windowPosition) {
|
|
||||||
const { x, y } = windowPosition;
|
|
||||||
const winSize = win.getSize();
|
|
||||||
const displaySize =
|
|
||||||
electron.screen.getDisplayNearestPoint(windowPosition).bounds;
|
|
||||||
if (
|
|
||||||
x + winSize[0] < displaySize.x - 8 ||
|
|
||||||
x - winSize[0] > displaySize.x + displaySize.width ||
|
|
||||||
y < displaySize.y - 8 ||
|
|
||||||
y > displaySize.y + displaySize.height
|
|
||||||
) {
|
|
||||||
//Window is offscreen
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log(
|
|
||||||
`Window tried to render offscreen, windowSize=${winSize}, displaySize=${displaySize}, position=${windowPosition}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
win.setPosition(x, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (windowMaximized) {
|
|
||||||
win.maximize();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(config.get("options.alwaysOnTop")){
|
|
||||||
win.setAlwaysOnTop(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
const urlToLoad = config.get("options.resumeOnStart")
|
|
||||||
? config.get("url")
|
|
||||||
: config.defaultConfig.url;
|
|
||||||
win.webContents.loadURL(urlToLoad);
|
|
||||||
win.on("closed", onClosed);
|
|
||||||
|
|
||||||
const setPiPOptions = config.plugins.isEnabled("picture-in-picture")
|
|
||||||
? (key, value) => require("./plugins/picture-in-picture/back").setOptions({ [key]: value })
|
|
||||||
: () => {};
|
|
||||||
|
|
||||||
win.on("move", () => {
|
|
||||||
if (win.isMaximized()) return;
|
|
||||||
let position = win.getPosition();
|
|
||||||
const isPiPEnabled =
|
|
||||||
config.plugins.isEnabled("picture-in-picture") &&
|
|
||||||
config.plugins.getOptions("picture-in-picture")["isInPiP"];
|
|
||||||
if (!isPiPEnabled) {
|
|
||||||
lateSave("window-position", { x: position[0], y: position[1] });
|
|
||||||
} else if(config.plugins.getOptions("picture-in-picture")["savePosition"]) {
|
|
||||||
lateSave("pip-position", position, setPiPOptions);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let winWasMaximized;
|
|
||||||
|
|
||||||
win.on("resize", () => {
|
|
||||||
const windowSize = win.getSize();
|
|
||||||
const isMaximized = win.isMaximized();
|
|
||||||
|
|
||||||
const isPiPEnabled =
|
|
||||||
config.plugins.isEnabled("picture-in-picture") &&
|
|
||||||
config.plugins.getOptions("picture-in-picture")["isInPiP"];
|
|
||||||
|
|
||||||
if (!isPiPEnabled && winWasMaximized !== isMaximized) {
|
|
||||||
winWasMaximized = isMaximized;
|
|
||||||
config.set("window-maximized", isMaximized);
|
|
||||||
}
|
|
||||||
if (isMaximized) return;
|
|
||||||
|
|
||||||
if (!isPiPEnabled) {
|
|
||||||
lateSave("window-size", {
|
|
||||||
width: windowSize[0],
|
|
||||||
height: windowSize[1],
|
|
||||||
});
|
|
||||||
} else if(config.plugins.getOptions("picture-in-picture")["saveSize"]) {
|
|
||||||
lateSave("pip-size", windowSize, setPiPOptions);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let savedTimeouts = {};
|
|
||||||
function lateSave(key, value, fn = config.set) {
|
|
||||||
if (savedTimeouts[key]) clearTimeout(savedTimeouts[key]);
|
|
||||||
|
|
||||||
savedTimeouts[key] = setTimeout(() => {
|
|
||||||
fn(key, value);
|
|
||||||
savedTimeouts[key] = undefined;
|
|
||||||
}, 600);
|
|
||||||
}
|
|
||||||
|
|
||||||
win.webContents.on("render-process-gone", (event, webContents, details) => {
|
|
||||||
showUnresponsiveDialog(win, details);
|
|
||||||
});
|
|
||||||
|
|
||||||
win.once("ready-to-show", () => {
|
|
||||||
if (config.get("options.appVisible")) {
|
|
||||||
win.show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
removeContentSecurityPolicy();
|
|
||||||
|
|
||||||
return win;
|
|
||||||
}
|
|
||||||
|
|
||||||
app.once("browser-window-created", (event, win) => {
|
|
||||||
if (config.get("options.overrideUserAgent")) {
|
|
||||||
// User agents are from https://developers.whatismybrowser.com/useragents/explore/
|
|
||||||
const originalUserAgent = win.webContents.userAgent;
|
|
||||||
const userAgents = {
|
|
||||||
mac: "Mozilla/5.0 (Macintosh; Intel Mac OS X 12.1; rv:95.0) Gecko/20100101 Firefox/95.0",
|
|
||||||
windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:95.0) Gecko/20100101 Firefox/95.0",
|
|
||||||
linux: "Mozilla/5.0 (Linux x86_64; rv:95.0) Gecko/20100101 Firefox/95.0",
|
|
||||||
}
|
|
||||||
|
|
||||||
const updatedUserAgent =
|
|
||||||
is.macOS() ? userAgents.mac :
|
|
||||||
is.windows() ? userAgents.windows :
|
|
||||||
userAgents.linux;
|
|
||||||
|
|
||||||
win.webContents.userAgent = updatedUserAgent;
|
|
||||||
app.userAgentFallback = updatedUserAgent;
|
|
||||||
|
|
||||||
win.webContents.session.webRequest.onBeforeSendHeaders((details, cb) => {
|
|
||||||
// this will only happen if login failed, and "retry" was pressed
|
|
||||||
if (win.webContents.getURL().startsWith("https://accounts.google.com") && details.url.startsWith("https://accounts.google.com")) {
|
|
||||||
details.requestHeaders["User-Agent"] = originalUserAgent;
|
|
||||||
}
|
|
||||||
cb({ requestHeaders: details.requestHeaders });
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
setupSongInfo(win);
|
|
||||||
setupAppControls();
|
|
||||||
|
|
||||||
win.webContents.on("did-fail-load", (
|
|
||||||
_event,
|
|
||||||
errorCode,
|
|
||||||
errorDescription,
|
|
||||||
validatedURL,
|
|
||||||
isMainFrame,
|
|
||||||
frameProcessId,
|
|
||||||
frameRoutingId,
|
|
||||||
) => {
|
|
||||||
const log = JSON.stringify({
|
|
||||||
error: "did-fail-load",
|
|
||||||
errorCode,
|
|
||||||
errorDescription,
|
|
||||||
validatedURL,
|
|
||||||
isMainFrame,
|
|
||||||
frameProcessId,
|
|
||||||
frameRoutingId,
|
|
||||||
}, null, "\t");
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log(log);
|
|
||||||
}
|
|
||||||
if( !(config.plugins.isEnabled("in-app-menu") && errorCode === -3)) { // -3 is a false positive with in-app-menu
|
|
||||||
win.webContents.send("log", log);
|
|
||||||
win.webContents.loadFile(path.join(__dirname, "error.html"));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
win.webContents.on("will-prevent-unload", (event) => {
|
|
||||||
event.preventDefault();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("window-all-closed", () => {
|
|
||||||
if (process.platform !== "darwin") {
|
|
||||||
app.quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unregister all shortcuts.
|
|
||||||
electron.globalShortcut.unregisterAll();
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("activate", () => {
|
|
||||||
// On OS X it's common to re-create a window in the app when the
|
|
||||||
// dock icon is clicked and there are no other windows open.
|
|
||||||
if (mainWindow === null) {
|
|
||||||
mainWindow = createMainWindow();
|
|
||||||
} else if (!mainWindow.isVisible()) {
|
|
||||||
mainWindow.show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.on("ready", () => {
|
|
||||||
if (config.get("options.autoResetAppCache")) {
|
|
||||||
// Clear cache after 20s
|
|
||||||
const clearCacheTimeout = setTimeout(() => {
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log("Clearing app cache.");
|
|
||||||
}
|
|
||||||
electron.session.defaultSession.clearCache();
|
|
||||||
clearTimeout(clearCacheTimeout);
|
|
||||||
}, 20000);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register appID on windows
|
|
||||||
if (is.windows()) {
|
|
||||||
const appID = "com.github.th-ch.youtube-music";
|
|
||||||
app.setAppUserModelId(appID);
|
|
||||||
const appLocation = process.execPath;
|
|
||||||
const appData = app.getPath("appData");
|
|
||||||
// check shortcut validity if not in dev mode / running portable app
|
|
||||||
if (!is.dev() && !appLocation.startsWith(path.join(appData, "..", "Local", "Temp"))) {
|
|
||||||
const shortcutPath = path.join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "YouTube Music.lnk");
|
|
||||||
try { // check if shortcut is registered and valid
|
|
||||||
const shortcutDetails = electron.shell.readShortcutLink(shortcutPath); // throw error if doesn't exist yet
|
|
||||||
if (
|
|
||||||
shortcutDetails.target !== appLocation ||
|
|
||||||
shortcutDetails.appUserModelId !== appID
|
|
||||||
) {
|
|
||||||
throw "needUpdate";
|
|
||||||
}
|
|
||||||
} catch (error) { // if not valid -> Register shortcut
|
|
||||||
electron.shell.writeShortcutLink(
|
|
||||||
shortcutPath,
|
|
||||||
error === "needUpdate" ? "update" : "create",
|
|
||||||
{
|
|
||||||
target: appLocation,
|
|
||||||
cwd: path.dirname(appLocation),
|
|
||||||
description: "YouTube Music Desktop App - including custom plugins",
|
|
||||||
appUserModelId: appID,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mainWindow = createMainWindow();
|
|
||||||
setApplicationMenu(mainWindow);
|
|
||||||
setUpTray(app, mainWindow);
|
|
||||||
|
|
||||||
setupProtocolHandler(mainWindow);
|
|
||||||
|
|
||||||
app.on('second-instance', (_event, commandLine, _workingDirectory) => {
|
|
||||||
const uri = `${APP_PROTOCOL}://`;
|
|
||||||
const protocolArgv = commandLine.find(arg => arg.startsWith(uri));
|
|
||||||
if (protocolArgv) {
|
|
||||||
const lastIndex = protocolArgv.endsWith("/") ? -1 : undefined;
|
|
||||||
const command = protocolArgv.slice(uri.length, lastIndex);
|
|
||||||
if (is.dev()) console.debug(`Received command over protocol: "${command}"`);
|
|
||||||
handleProtocol(command);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!mainWindow) return;
|
|
||||||
if (mainWindow.isMinimized()) mainWindow.restore();
|
|
||||||
if (!mainWindow.isVisible()) mainWindow.show();
|
|
||||||
mainWindow.focus();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Autostart at login
|
|
||||||
app.setLoginItemSettings({
|
|
||||||
openAtLogin: config.get("options.startAtLogin"),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!is.dev() && config.get("options.autoUpdates")) {
|
|
||||||
const updateTimeout = setTimeout(() => {
|
|
||||||
autoUpdater.checkForUpdatesAndNotify();
|
|
||||||
clearTimeout(updateTimeout);
|
|
||||||
}, 2000);
|
|
||||||
autoUpdater.on("update-available", () => {
|
|
||||||
const downloadLink =
|
|
||||||
"https://github.com/th-ch/youtube-music/releases/latest";
|
|
||||||
const dialogOpts = {
|
|
||||||
type: "info",
|
|
||||||
buttons: ["OK", "Download", "Disable updates"],
|
|
||||||
title: "Application Update",
|
|
||||||
message: "A new version is available",
|
|
||||||
detail: `A new version is available and can be downloaded at ${downloadLink}`,
|
|
||||||
};
|
|
||||||
electron.dialog.showMessageBox(dialogOpts).then((dialogOutput) => {
|
|
||||||
switch (dialogOutput.response) {
|
|
||||||
// Download
|
|
||||||
case 1:
|
|
||||||
electron.shell.openExternal(downloadLink);
|
|
||||||
break;
|
|
||||||
// Disable updates
|
|
||||||
case 2:
|
|
||||||
config.set("options.autoUpdates", false);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config.get("options.hideMenu") && !config.get("options.hideMenuWarned")) {
|
|
||||||
electron.dialog.showMessageBox(mainWindow, {
|
|
||||||
type: 'info', title: 'Hide Menu Enabled',
|
|
||||||
message: "Menu is hidden, use 'Alt' to show it (or 'Escape' if using in-app-menu)"
|
|
||||||
});
|
|
||||||
config.set("options.hideMenuWarned", true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optimized for Mac OS X
|
|
||||||
if (is.macOS() && !config.get("options.appVisible")) {
|
|
||||||
app.dock.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
let forceQuit = false;
|
|
||||||
app.on("before-quit", () => {
|
|
||||||
forceQuit = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (is.macOS() || config.get("options.tray")) {
|
|
||||||
mainWindow.on("close", (event) => {
|
|
||||||
// Hide the window instead of quitting (quit is available in tray options)
|
|
||||||
if (!forceQuit) {
|
|
||||||
event.preventDefault();
|
|
||||||
mainWindow.hide();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
function showUnresponsiveDialog(win, details) {
|
|
||||||
if (!!details) {
|
|
||||||
console.log("Unresponsive Error!\n"+JSON.stringify(details, null, "\t"))
|
|
||||||
}
|
|
||||||
electron.dialog.showMessageBox(win, {
|
|
||||||
type: "error",
|
|
||||||
title: "Window Unresponsive",
|
|
||||||
message: "The Application is Unresponsive",
|
|
||||||
details: "We are sorry for the inconvenience! please choose what to do:",
|
|
||||||
buttons: ["Wait", "Relaunch", "Quit"],
|
|
||||||
cancelId: 0
|
|
||||||
}).then( result => {
|
|
||||||
switch (result.response) {
|
|
||||||
case 1: restart(); break;
|
|
||||||
case 2: app.quit(); break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeContentSecurityPolicy(
|
|
||||||
session = electron.session.defaultSession
|
|
||||||
) {
|
|
||||||
// Allows defining multiple "onHeadersReceived" listeners
|
|
||||||
// by enhancing the session.
|
|
||||||
// Some plugins (e.g. adblocker) also define a "onHeadersReceived" listener
|
|
||||||
enhanceWebRequest(session);
|
|
||||||
|
|
||||||
// Custom listener to tweak the content security policy
|
|
||||||
session.webRequest.onHeadersReceived(function (details, callback) {
|
|
||||||
details.responseHeaders ??= {}
|
|
||||||
|
|
||||||
// Remove the content security policy
|
|
||||||
delete details.responseHeaders["content-security-policy-report-only"];
|
|
||||||
delete details.responseHeaders["content-security-policy"];
|
|
||||||
|
|
||||||
callback({ cancel: false, responseHeaders: details.responseHeaders });
|
|
||||||
});
|
|
||||||
|
|
||||||
// When multiple listeners are defined, apply them all
|
|
||||||
session.webRequest.setResolver("onHeadersReceived", (listeners) => {
|
|
||||||
const response = listeners.reduce(
|
|
||||||
async (accumulator, listener) => {
|
|
||||||
if (accumulator.cancel) {
|
|
||||||
return accumulator;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await listener.apply();
|
|
||||||
return { ...accumulator, ...result };
|
|
||||||
},
|
|
||||||
{ cancel: false }
|
|
||||||
);
|
|
||||||
|
|
||||||
return response;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
437
menu.js
@ -1,437 +0,0 @@
|
|||||||
const { existsSync } = require("fs");
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
const { app, clipboard, Menu, dialog } = require("electron");
|
|
||||||
const is = require("electron-is");
|
|
||||||
const { restart } = require("./providers/app-controls");
|
|
||||||
|
|
||||||
const { getAllPlugins } = require("./plugins/utils");
|
|
||||||
const config = require("./config");
|
|
||||||
const { startingPages } = require("./providers/extracted-data");
|
|
||||||
|
|
||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
const promptOptions = require("./providers/prompt-options");
|
|
||||||
|
|
||||||
// true only if in-app-menu was loaded on launch
|
|
||||||
const inAppMenuActive = config.plugins.isEnabled("in-app-menu");
|
|
||||||
|
|
||||||
const pluginEnabledMenu = (plugin, label = "", hasSubmenu = false, refreshMenu = undefined) => ({
|
|
||||||
label: label || plugin,
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.plugins.isEnabled(plugin),
|
|
||||||
click: (item) => {
|
|
||||||
if (item.checked) {
|
|
||||||
config.plugins.enable(plugin);
|
|
||||||
} else {
|
|
||||||
config.plugins.disable(plugin);
|
|
||||||
}
|
|
||||||
if (hasSubmenu) {
|
|
||||||
refreshMenu();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const mainMenuTemplate = (win) => {
|
|
||||||
const refreshMenu = () => {
|
|
||||||
this.setApplicationMenu(win);
|
|
||||||
if (inAppMenuActive) {
|
|
||||||
win.webContents.send("refreshMenu");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
label: "Plugins",
|
|
||||||
submenu: [
|
|
||||||
...getAllPlugins().map((plugin) => {
|
|
||||||
const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js")
|
|
||||||
if (existsSync(pluginPath)) {
|
|
||||||
let pluginLabel = plugin;
|
|
||||||
if (pluginLabel === "crossfade") {
|
|
||||||
pluginLabel = "crossfade [beta]";
|
|
||||||
}
|
|
||||||
if (!config.plugins.isEnabled(plugin)) {
|
|
||||||
return pluginEnabledMenu(plugin, pluginLabel, true, refreshMenu);
|
|
||||||
}
|
|
||||||
const getPluginMenu = require(pluginPath);
|
|
||||||
return {
|
|
||||||
label: pluginLabel,
|
|
||||||
submenu: [
|
|
||||||
pluginEnabledMenu(plugin, "Enabled", true, refreshMenu),
|
|
||||||
{ type: "separator" },
|
|
||||||
...getPluginMenu(win, config.plugins.getOptions(plugin), refreshMenu),
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return pluginEnabledMenu(plugin);
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Options",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Auto-update",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.autoUpdates"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.autoUpdates", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Resume last song when app starts",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.resumeOnStart"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.resumeOnStart", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Starting page',
|
|
||||||
submenu: Object.keys(startingPages).map((name) => ({
|
|
||||||
label: name,
|
|
||||||
type: 'radio',
|
|
||||||
checked: config.get('options.startingPage') === name,
|
|
||||||
click: () => {
|
|
||||||
config.set('options.startingPage', name);
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Visual Tweaks",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Remove upgrade button",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.removeUpgradeButton"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.removeUpgradeButton", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Like buttons",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Default",
|
|
||||||
type: "radio",
|
|
||||||
checked: !config.get("options.likeButtons"),
|
|
||||||
click: () => {
|
|
||||||
config.set("options.likeButtons", '');
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Force show",
|
|
||||||
type: "radio",
|
|
||||||
checked: config.get("options.likeButtons") === 'force',
|
|
||||||
click: () => {
|
|
||||||
config.set("options.likeButtons", 'force');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Hide",
|
|
||||||
type: "radio",
|
|
||||||
checked: config.get("options.likeButtons") === 'hide',
|
|
||||||
click: () => {
|
|
||||||
config.set("options.likeButtons", 'hide');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Theme",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "No theme",
|
|
||||||
type: "radio",
|
|
||||||
checked: !config.get("options.themes"), // todo rename "themes"
|
|
||||||
click: () => {
|
|
||||||
config.set("options.themes", []);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Import custom CSS file",
|
|
||||||
type: "radio",
|
|
||||||
checked: false,
|
|
||||||
click: async () => {
|
|
||||||
const { filePaths } = await dialog.showOpenDialog({
|
|
||||||
filters: [{ name: "CSS Files", extensions: ["css"] }],
|
|
||||||
properties: ["openFile", "multiSelections"],
|
|
||||||
});
|
|
||||||
if (filePaths) {
|
|
||||||
config.set("options.themes", filePaths);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Single instance lock",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: true,
|
|
||||||
click: (item) => {
|
|
||||||
if (!item.checked && app.hasSingleInstanceLock())
|
|
||||||
app.releaseSingleInstanceLock();
|
|
||||||
else if (item.checked && !app.hasSingleInstanceLock())
|
|
||||||
app.requestSingleInstanceLock();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Always on top",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.alwaysOnTop"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.alwaysOnTop", item.checked);
|
|
||||||
win.setAlwaysOnTop(item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
...(is.windows() || is.linux()
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
label: "Hide menu",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.hideMenu"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.hideMenu", item.checked);
|
|
||||||
if (item.checked && !config.get("options.hideMenuWarned")) {
|
|
||||||
dialog.showMessageBox(win, {
|
|
||||||
type: 'info', title: 'Hide Menu Enabled',
|
|
||||||
message: "Menu will be hidden on next launch, use [Alt] to show it (or backtick [`] if using in-app-menu)"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
...(is.windows() || is.macOS()
|
|
||||||
? // Only works on Win/Mac
|
|
||||||
// https://www.electronjs.org/docs/api/app#appsetloginitemsettingssettings-macos-windows
|
|
||||||
[
|
|
||||||
{
|
|
||||||
label: "Start at login",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.startAtLogin"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.startAtLogin", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
{
|
|
||||||
label: "Tray",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Disabled",
|
|
||||||
type: "radio",
|
|
||||||
checked: !config.get("options.tray"),
|
|
||||||
click: () => {
|
|
||||||
config.setMenuOption("options.tray", false);
|
|
||||||
config.setMenuOption("options.appVisible", true);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Enabled + app visible",
|
|
||||||
type: "radio",
|
|
||||||
checked:
|
|
||||||
config.get("options.tray") && config.get("options.appVisible"),
|
|
||||||
click: () => {
|
|
||||||
config.setMenuOption("options.tray", true);
|
|
||||||
config.setMenuOption("options.appVisible", true);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Enabled + app hidden",
|
|
||||||
type: "radio",
|
|
||||||
checked:
|
|
||||||
config.get("options.tray") && !config.get("options.appVisible"),
|
|
||||||
click: () => {
|
|
||||||
config.setMenuOption("options.tray", true);
|
|
||||||
config.setMenuOption("options.appVisible", false);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Play/Pause on click",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.trayClickPlayPause"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.trayClickPlayPause", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Advanced options",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Proxy",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: !!config.get("options.proxy"),
|
|
||||||
click: (item) => {
|
|
||||||
setProxy(item, win);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Override useragent",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.overrideUserAgent"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.overrideUserAgent", item.checked);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Disable hardware acceleration",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.disableHardwareAcceleration"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.disableHardwareAcceleration", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Restart on config changes",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.restartOnConfigChanges"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.restartOnConfigChanges", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Reset App cache when app starts",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("options.autoResetAppCache"),
|
|
||||||
click: (item) => {
|
|
||||||
config.setMenuOption("options.autoResetAppCache", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
is.macOS() ?
|
|
||||||
{
|
|
||||||
label: "Toggle DevTools",
|
|
||||||
// Cannot use "toggleDevTools" role in MacOS
|
|
||||||
click: () => {
|
|
||||||
const { webContents } = win;
|
|
||||||
if (webContents.isDevToolsOpened()) {
|
|
||||||
webContents.closeDevTools();
|
|
||||||
} else {
|
|
||||||
const devToolsOptions = {};
|
|
||||||
webContents.openDevTools(devToolsOptions);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
} :
|
|
||||||
{ role: "toggleDevTools" },
|
|
||||||
{
|
|
||||||
label: "Edit config.json",
|
|
||||||
click: () => {
|
|
||||||
config.edit();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "View",
|
|
||||||
submenu: [
|
|
||||||
{ role: "reload" },
|
|
||||||
{ role: "forceReload" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "zoomIn" },
|
|
||||||
{ role: "zoomOut" },
|
|
||||||
{ role: "resetZoom" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "togglefullscreen" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Navigation",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Go back",
|
|
||||||
click: () => {
|
|
||||||
if (win.webContents.canGoBack()) {
|
|
||||||
win.webContents.goBack();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Go forward",
|
|
||||||
click: () => {
|
|
||||||
if (win.webContents.canGoForward()) {
|
|
||||||
win.webContents.goForward();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Copy current URL",
|
|
||||||
click: () => {
|
|
||||||
const currentURL = win.webContents.getURL();
|
|
||||||
clipboard.writeText(currentURL);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Restart App",
|
|
||||||
click: restart
|
|
||||||
},
|
|
||||||
{ role: "quit" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports.mainMenuTemplate = mainMenuTemplate;
|
|
||||||
module.exports.setApplicationMenu = (win) => {
|
|
||||||
const menuTemplate = [...mainMenuTemplate(win)];
|
|
||||||
if (process.platform === "darwin") {
|
|
||||||
const name = app.name;
|
|
||||||
menuTemplate.unshift({
|
|
||||||
label: name,
|
|
||||||
submenu: [
|
|
||||||
{ role: "about" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "hide" },
|
|
||||||
{ role: "hideothers" },
|
|
||||||
{ role: "unhide" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Select All",
|
|
||||||
accelerator: "CmdOrCtrl+A",
|
|
||||||
selector: "selectAll:",
|
|
||||||
},
|
|
||||||
{ label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
|
|
||||||
{ label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
|
|
||||||
{ label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
|
|
||||||
{ type: "separator" },
|
|
||||||
{ role: "minimize" },
|
|
||||||
{ role: "close" },
|
|
||||||
{ role: "quit" },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const menu = Menu.buildFromTemplate(menuTemplate);
|
|
||||||
Menu.setApplicationMenu(menu);
|
|
||||||
};
|
|
||||||
|
|
||||||
async function setProxy(item, win) {
|
|
||||||
const output = await prompt({
|
|
||||||
title: 'Set Proxy',
|
|
||||||
label: 'Enter Proxy Address: (leave empty to disable)',
|
|
||||||
value: config.get("options.proxy"),
|
|
||||||
type: 'input',
|
|
||||||
inputAttrs: {
|
|
||||||
type: 'url',
|
|
||||||
placeholder: "Example: 'socks5://127.0.0.1:9999"
|
|
||||||
},
|
|
||||||
width: 450,
|
|
||||||
...promptOptions()
|
|
||||||
}, win);
|
|
||||||
|
|
||||||
if (typeof output === "string") {
|
|
||||||
config.setMenuOption("options.proxy", output);
|
|
||||||
item.checked = output !== "";
|
|
||||||
} else { //user pressed cancel
|
|
||||||
item.checked = !item.checked; //reset checkbox
|
|
||||||
}
|
|
||||||
}
|
|
||||||
213
package.json
@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "youtube-music",
|
"name": "youtube-music",
|
||||||
"productName": "YouTube Music",
|
"productName": "YouTube Music",
|
||||||
"version": "1.20.0",
|
"version": "2.2.0",
|
||||||
"description": "YouTube Music Desktop App - including custom plugins",
|
"description": "YouTube Music Desktop App - including custom plugins",
|
||||||
|
"main": "./dist/index.js",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": "th-ch/youtube-music",
|
"repository": "th-ch/youtube-music",
|
||||||
"author": {
|
"author": {
|
||||||
@ -13,11 +14,19 @@
|
|||||||
"build": {
|
"build": {
|
||||||
"appId": "com.github.th-ch.youtube-music",
|
"appId": "com.github.th-ch.youtube-music",
|
||||||
"productName": "YouTube Music",
|
"productName": "YouTube Music",
|
||||||
|
"files": [
|
||||||
|
"!*",
|
||||||
|
"dist",
|
||||||
|
"license",
|
||||||
|
"!node_modules",
|
||||||
|
"node_modules/custom-electron-prompt/**",
|
||||||
|
"node_modules/@cliqz/adblocker-electron-preload/**",
|
||||||
|
"node_modules/@ffmpeg.wasm/core-mt/**",
|
||||||
|
"!node_modules/**/*.map",
|
||||||
|
"!node_modules/**/*.ts"
|
||||||
|
],
|
||||||
"mac": {
|
"mac": {
|
||||||
"identity": null,
|
"identity": null,
|
||||||
"files": [
|
|
||||||
"!plugins/taskbar-mediacontrol${/*}"
|
|
||||||
],
|
|
||||||
"target": [
|
"target": [
|
||||||
{
|
{
|
||||||
"target": "dmg",
|
"target": "dmg",
|
||||||
@ -31,14 +40,12 @@
|
|||||||
},
|
},
|
||||||
"win": {
|
"win": {
|
||||||
"icon": "assets/generated/icons/win/icon.ico",
|
"icon": "assets/generated/icons/win/icon.ico",
|
||||||
"files": [
|
|
||||||
"!plugins/touchbar${/*}"
|
|
||||||
],
|
|
||||||
"target": [
|
"target": [
|
||||||
{
|
{
|
||||||
"target": "nsis",
|
"target": "nsis-web",
|
||||||
"arch": [
|
"arch": [
|
||||||
"x64",
|
"x64",
|
||||||
|
"ia32",
|
||||||
"arm64"
|
"arm64"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -46,19 +53,17 @@
|
|||||||
"target": "portable",
|
"target": "portable",
|
||||||
"arch": [
|
"arch": [
|
||||||
"x64",
|
"x64",
|
||||||
|
"ia32",
|
||||||
"arm64"
|
"arm64"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"nsis": {
|
"nsisWeb": {
|
||||||
"runAfterFinish": false
|
"runAfterFinish": false
|
||||||
},
|
},
|
||||||
"linux": {
|
"linux": {
|
||||||
"icon": "assets/generated/icons/png",
|
"icon": "assets/generated/icons/png",
|
||||||
"files": [
|
|
||||||
"!plugins/{touchbar,taskbar-mediacontrol}${/*}"
|
|
||||||
],
|
|
||||||
"category": "AudioVideo",
|
"category": "AudioVideo",
|
||||||
"target": [
|
"target": [
|
||||||
"AppImage",
|
"AppImage",
|
||||||
@ -76,81 +81,117 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"directories": {
|
||||||
|
"output": "./pack/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "playwright test",
|
"test": "playwright test",
|
||||||
"test:debug": "DEBUG=pw:browser* playwright test",
|
"test:debug": "cross-env DEBUG=pw:*,-pw:test:protocol playwright test",
|
||||||
"start": "electron .",
|
"rollup:preload": "rollup -c rollup.preload.config.ts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",
|
||||||
"start:debug": "ELECTRON_ENABLE_LOGGING=1 electron .",
|
"rollup:main": "rollup -c rollup.main.config.ts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",
|
||||||
"generate:package": "node utils/generate-package-json.js",
|
"build": "yarpm-pnpm run rollup:preload && yarpm-pnpm run rollup:main",
|
||||||
"postinstall": "yarn run plugins",
|
"start": "yarpm-pnpm run build && electron ./dist/index.js",
|
||||||
"clean": "del-cli dist",
|
"start:debug": "cross-env ELECTRON_ENABLE_LOGGING=1 yarpm-pnpm run start",
|
||||||
"build": "yarn run clean && electron-builder --win --mac --linux -p never",
|
"clean": "del-cli dist && del-cli pack",
|
||||||
"build:linux": "yarn run clean && electron-builder --linux -p never",
|
"dist": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win --mac --linux -p never",
|
||||||
"build:mac": "yarn run clean && electron-builder --mac dmg:x64 -p never",
|
"dist:linux": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --linux -p never",
|
||||||
"build:mac:arm64": "yarn run clean && electron-builder --mac dmg:arm64 -p never",
|
"dist:mac": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --mac dmg:x64 -p never",
|
||||||
"build:win": "yarn run clean && electron-builder --win -p never",
|
"dist:mac:arm64": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --mac dmg:arm64 -p never",
|
||||||
"lint": "xo",
|
"dist:win": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win -p never",
|
||||||
"changelog": "auto-changelog",
|
"dist:win:x64": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win nsis-web:x64 -p never",
|
||||||
"plugins": "yarn run plugin:adblocker && yarn run plugin:bypass-age-restrictions",
|
"lint": "eslint .",
|
||||||
"plugin:adblocker": "del-cli plugins/adblocker/ad-blocker-engine.bin && node plugins/adblocker/blocker.js",
|
"changelog": "npx --yes auto-changelog",
|
||||||
"plugin:bypass-age-restrictions": "del-cli node_modules/simple-youtube-age-restriction-bypass/package.json && yarn run generate:package simple-youtube-age-restriction-bypass",
|
"release:linux": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --linux -p always -c.snap.publish=github",
|
||||||
"release:linux": "yarn run clean && electron-builder --linux -p always -c.snap.publish=github",
|
"release:mac": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --mac -p always",
|
||||||
"release:mac": "yarn run clean && electron-builder --mac -p always",
|
"release:win": "yarpm-pnpm run clean && yarpm-pnpm run build && electron-builder --win -p always",
|
||||||
"release:win": "yarn run clean && electron-builder --win -p always"
|
"typecheck": "tsc -p tsconfig.json --noEmit"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16.0.0",
|
"node": ">=16.0.0"
|
||||||
"npm": "Please use yarn instead"
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"overrides": {
|
||||||
|
"rollup": "4.2.0",
|
||||||
|
"node-gyp": "10.0.1",
|
||||||
|
"xml2js": "0.6.2",
|
||||||
|
"node-fetch": "3.3.2",
|
||||||
|
"@electron/universal": "1.4.4",
|
||||||
|
"@babel/runtime": "7.23.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"overrides": {
|
||||||
|
"rollup": "4.2.0",
|
||||||
|
"node-gyp": "10.0.1",
|
||||||
|
"xml2js": "0.6.2",
|
||||||
|
"node-fetch": "3.3.2",
|
||||||
|
"@electron/universal": "1.4.4",
|
||||||
|
"@babel/runtime": "7.23.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@cliqz/adblocker-electron": "^1.26.5",
|
"@cliqz/adblocker-electron": "1.26.10",
|
||||||
"@ffmpeg/core": "^0.11.0",
|
"@cliqz/adblocker-electron-preload": "1.26.10",
|
||||||
"@ffmpeg/ffmpeg": "^0.11.6",
|
"@ffmpeg.wasm/core-mt": "0.12.0",
|
||||||
"@foobar404/wave": "^2.0.4",
|
"@ffmpeg.wasm/main": "0.12.0",
|
||||||
"@xhayper/discord-rpc": "^1.0.16",
|
"@foobar404/wave": "2.0.4",
|
||||||
"async-mutex": "^0.4.0",
|
"@jellybrick/electron-better-web-request": "1.0.4",
|
||||||
"browser-id3-writer": "^5.0.0",
|
"@jellybrick/mpris-service": "2.1.4",
|
||||||
"butterchurn": "^2.6.7",
|
"@xhayper/discord-rpc": "1.0.24",
|
||||||
"butterchurn-presets": "^2.4.7",
|
"async-mutex": "0.4.0",
|
||||||
"custom-electron-prompt": "^1.5.7",
|
"butterchurn": "3.0.0-beta.4",
|
||||||
"custom-electron-titlebar": "^4.1.6",
|
"butterchurn-presets": "3.0.0-beta.4",
|
||||||
"electron-better-web-request": "^1.0.1",
|
"conf": "10.2.0",
|
||||||
"electron-debug": "^3.2.0",
|
"custom-electron-prompt": "1.5.7",
|
||||||
"electron-is": "^3.0.0",
|
"electron-debug": "3.2.0",
|
||||||
"electron-localshortcut": "^3.2.1",
|
"electron-is": "3.0.0",
|
||||||
"electron-store": "^8.1.0",
|
"electron-localshortcut": "3.2.1",
|
||||||
"electron-unhandled": "^4.0.1",
|
"electron-store": "8.1.0",
|
||||||
"electron-updater": "^5.3.0",
|
"electron-unhandled": "4.0.1",
|
||||||
"filenamify": "^4.3.0",
|
"electron-updater": "6.1.4",
|
||||||
"howler": "^2.2.3",
|
"fast-average-color": "9.4.0",
|
||||||
"html-to-text": "^9.0.5",
|
"filenamify": "6.0.0",
|
||||||
"keyboardevent-from-electron-accelerator": "^2.0.0",
|
"howler": "2.2.4",
|
||||||
"keyboardevents-areequal": "^0.2.2",
|
"html-to-text": "9.0.5",
|
||||||
"md5": "^2.3.0",
|
"keyboardevent-from-electron-accelerator": "2.0.0",
|
||||||
"mpris-service": "^2.1.2",
|
"keyboardevents-areequal": "0.2.2",
|
||||||
"node-fetch": "^2.6.9",
|
"node-id3": "0.2.6",
|
||||||
"simple-youtube-age-restriction-bypass": "https://gitpkg.now.sh/api/pkg.tgz?url=zerodytrash/Simple-YouTube-Age-Restriction-Bypass&commit=v2.5.4",
|
"simple-youtube-age-restriction-bypass": "git+https://github.com/organization/Simple-YouTube-Age-Restriction-Bypass.git#v2.5.8",
|
||||||
"vudio": "^2.1.1",
|
"vudio": "2.1.1",
|
||||||
"youtubei.js": "^4.3.0",
|
"x11": "2.3.0",
|
||||||
"ytpl": "^2.3.0"
|
"youtubei.js": "7.0.0"
|
||||||
},
|
|
||||||
"resolutions": {
|
|
||||||
"xml2js": "^0.5.0",
|
|
||||||
"@electron/universal": "^1.3.4",
|
|
||||||
"electron-is-dev": "patch:electron-is-dev@npm%3A2.0.0#./.yarn/patches/electron-is-dev-npm-2.0.0-9d41637d91.patch"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "^1.29.2",
|
"@playwright/test": "1.39.0",
|
||||||
"auto-changelog": "^2.4.0",
|
"@rollup/plugin-commonjs": "25.0.7",
|
||||||
"del-cli": "^5.0.0",
|
"@rollup/plugin-image": "3.0.3",
|
||||||
"electron": "^22.3.6",
|
"@rollup/plugin-json": "6.0.1",
|
||||||
"electron-builder": "^23.6.0",
|
"@rollup/plugin-node-resolve": "15.2.3",
|
||||||
"electron-devtools-installer": "^3.2.0",
|
"@rollup/plugin-terser": "0.4.4",
|
||||||
"node-gyp": "^9.3.1",
|
"@rollup/plugin-typescript": "11.1.5",
|
||||||
"playwright": "^1.29.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
"xo": "^0.53.1"
|
"@total-typescript/ts-reset": "0.5.1",
|
||||||
|
"@types/electron-localshortcut": "3.1.2",
|
||||||
|
"@types/howler": "2.2.10",
|
||||||
|
"@types/html-to-text": "9.0.3",
|
||||||
|
"@typescript-eslint/eslint-plugin": "6.9.1",
|
||||||
|
"builtin-modules": "^3.3.0",
|
||||||
|
"cross-env": "7.0.3",
|
||||||
|
"del-cli": "5.1.0",
|
||||||
|
"electron": "27.0.3",
|
||||||
|
"electron-builder": "24.6.4",
|
||||||
|
"electron-devtools-installer": "3.2.0",
|
||||||
|
"eslint": "8.52.0",
|
||||||
|
"eslint-plugin-import": "2.29.0",
|
||||||
|
"eslint-plugin-prettier": "5.0.1",
|
||||||
|
"node-gyp": "10.0.1",
|
||||||
|
"playwright": "1.39.0",
|
||||||
|
"rollup": "4.2.0",
|
||||||
|
"rollup-plugin-copy": "3.5.0",
|
||||||
|
"rollup-plugin-import-css": "3.3.5",
|
||||||
|
"rollup-plugin-string": "3.0.0",
|
||||||
|
"typescript": "5.2.2",
|
||||||
|
"yarpm": "1.2.0"
|
||||||
},
|
},
|
||||||
"auto-changelog": {
|
"auto-changelog": {
|
||||||
"hideCredit": true,
|
"hideCredit": true,
|
||||||
@ -158,21 +199,5 @@
|
|||||||
"unreleased": true,
|
"unreleased": true,
|
||||||
"output": "changelog.md"
|
"output": "changelog.md"
|
||||||
},
|
},
|
||||||
"xo": {
|
"packageManager": "pnpm@8.10.2"
|
||||||
"envs": [
|
|
||||||
"node",
|
|
||||||
"browser"
|
|
||||||
],
|
|
||||||
"rules": {
|
|
||||||
"quotes": [
|
|
||||||
"error",
|
|
||||||
"double",
|
|
||||||
{
|
|
||||||
"avoidEscape": true,
|
|
||||||
"allowTemplateLiterals": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"packageManager": "yarn@3.4.1"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
const { loadAdBlockerEngine } = require("./blocker");
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = async (win, options) => {
|
|
||||||
if (await config.shouldUseBlocklists()) {
|
|
||||||
loadAdBlockerEngine(
|
|
||||||
win.webContents.session,
|
|
||||||
options.cache,
|
|
||||||
options.additionalBlockLists,
|
|
||||||
options.disableDefaultLists,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
const { promises } = require("fs"); // used for caching
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
const { ElectronBlocker } = require("@cliqz/adblocker-electron");
|
|
||||||
const fetch = require("node-fetch");
|
|
||||||
|
|
||||||
const SOURCES = [
|
|
||||||
"https://raw.githubusercontent.com/kbinani/adblock-youtube-ads/master/signed.txt",
|
|
||||||
// uBlock Origin
|
|
||||||
"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt",
|
|
||||||
"https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt",
|
|
||||||
// Fanboy Annoyances
|
|
||||||
"https://secure.fanboy.co.nz/fanboy-annoyance_ubo.txt",
|
|
||||||
];
|
|
||||||
|
|
||||||
const loadAdBlockerEngine = (
|
|
||||||
session = undefined,
|
|
||||||
cache = true,
|
|
||||||
additionalBlockLists = [],
|
|
||||||
disableDefaultLists = false
|
|
||||||
) => {
|
|
||||||
// Only use cache if no additional blocklists are passed
|
|
||||||
const cachingOptions =
|
|
||||||
cache && additionalBlockLists.length === 0
|
|
||||||
? {
|
|
||||||
path: path.resolve(__dirname, "ad-blocker-engine.bin"),
|
|
||||||
read: promises.readFile,
|
|
||||||
write: promises.writeFile,
|
|
||||||
}
|
|
||||||
: undefined;
|
|
||||||
const lists = [
|
|
||||||
...(disableDefaultLists ? [] : SOURCES),
|
|
||||||
...additionalBlockLists,
|
|
||||||
];
|
|
||||||
|
|
||||||
ElectronBlocker.fromLists(
|
|
||||||
fetch,
|
|
||||||
lists,
|
|
||||||
{
|
|
||||||
// when generating the engine for caching, do not load network filters
|
|
||||||
// So that enhancing the session works as expected
|
|
||||||
// Allowing to define multiple webRequest listeners
|
|
||||||
loadNetworkFilters: session !== undefined,
|
|
||||||
},
|
|
||||||
cachingOptions
|
|
||||||
)
|
|
||||||
.then((blocker) => {
|
|
||||||
if (session) {
|
|
||||||
blocker.enableBlockingInSession(session);
|
|
||||||
} else {
|
|
||||||
console.log("Successfully generated adBlocker engine.");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((err) => console.log("Error loading adBlocker engine", err));
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = { loadAdBlockerEngine };
|
|
||||||
if (require.main === module) {
|
|
||||||
loadAdBlockerEngine(); // Generate the engine without enabling it
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
const { PluginConfig } = require("../../config/dynamic");
|
|
||||||
|
|
||||||
const config = new PluginConfig("adblocker", { enableFront: true });
|
|
||||||
|
|
||||||
const blockers = {
|
|
||||||
WithBlocklists: "With blocklists",
|
|
||||||
InPlayer: "In player",
|
|
||||||
};
|
|
||||||
|
|
||||||
const shouldUseBlocklists = async () =>
|
|
||||||
(await config.get("blocker")) !== blockers.InPlayer;
|
|
||||||
|
|
||||||
module.exports = { shouldUseBlocklists, blockers, ...config };
|
|
||||||
@ -1,289 +0,0 @@
|
|||||||
// Source: https://addons.mozilla.org/en-US/firefox/addon/adblock-for-youtube/
|
|
||||||
// https://robwu.nl/crxviewer/?crx=https%3A%2F%2Faddons.mozilla.org%2Fen-US%2Ffirefox%2Faddon%2Fadblock-for-youtube%2F
|
|
||||||
|
|
||||||
/*
|
|
||||||
Parts of this code is derived from set-constant.js:
|
|
||||||
https://github.com/gorhill/uBlock/blob/5de0ce975753b7565759ac40983d31978d1f84ca/assets/resources/scriptlets.js#L704
|
|
||||||
*/
|
|
||||||
|
|
||||||
{
|
|
||||||
let pruner = function (o) {
|
|
||||||
delete o.playerAds;
|
|
||||||
delete o.adPlacements;
|
|
||||||
//
|
|
||||||
if (o.playerResponse) {
|
|
||||||
delete o.playerResponse.playerAds;
|
|
||||||
delete o.playerResponse.adPlacements;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
return o;
|
|
||||||
};
|
|
||||||
|
|
||||||
JSON.parse = new Proxy(JSON.parse, {
|
|
||||||
apply: function () {
|
|
||||||
return pruner(Reflect.apply(...arguments));
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
Response.prototype.json = new Proxy(Response.prototype.json, {
|
|
||||||
apply: function () {
|
|
||||||
return Reflect.apply(...arguments).then((o) => pruner(o));
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
let cValue = "undefined";
|
|
||||||
const chain = "playerResponse.adPlacements";
|
|
||||||
const thisScript = document.currentScript;
|
|
||||||
//
|
|
||||||
if (cValue === "null") cValue = null;
|
|
||||||
else if (cValue === "''") cValue = "";
|
|
||||||
else if (cValue === "true") cValue = true;
|
|
||||||
else if (cValue === "false") cValue = false;
|
|
||||||
else if (cValue === "undefined") cValue = undefined;
|
|
||||||
else if (cValue === "noopFunc") cValue = function () {};
|
|
||||||
else if (cValue === "trueFunc")
|
|
||||||
cValue = function () {
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
else if (cValue === "falseFunc")
|
|
||||||
cValue = function () {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
else if (/^\d+$/.test(cValue)) {
|
|
||||||
cValue = parseFloat(cValue);
|
|
||||||
//
|
|
||||||
if (isNaN(cValue)) return;
|
|
||||||
if (Math.abs(cValue) > 0x7fff) return;
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
let aborted = false;
|
|
||||||
const mustAbort = function (v) {
|
|
||||||
if (aborted) return true;
|
|
||||||
aborted =
|
|
||||||
v !== undefined &&
|
|
||||||
v !== null &&
|
|
||||||
cValue !== undefined &&
|
|
||||||
cValue !== null &&
|
|
||||||
typeof v !== typeof cValue;
|
|
||||||
return aborted;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
Support multiple trappers for the same property:
|
|
||||||
https://github.com/uBlockOrigin/uBlock-issues/issues/156
|
|
||||||
*/
|
|
||||||
|
|
||||||
const trapProp = function (owner, prop, configurable, handler) {
|
|
||||||
if (handler.init(owner[prop]) === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
const odesc = Object.getOwnPropertyDescriptor(owner, prop);
|
|
||||||
let prevGetter, prevSetter;
|
|
||||||
if (odesc instanceof Object) {
|
|
||||||
if (odesc.configurable === false) return;
|
|
||||||
if (odesc.get instanceof Function) prevGetter = odesc.get;
|
|
||||||
if (odesc.set instanceof Function) prevSetter = odesc.set;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
Object.defineProperty(owner, prop, {
|
|
||||||
configurable,
|
|
||||||
get() {
|
|
||||||
if (prevGetter !== undefined) {
|
|
||||||
prevGetter();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
return handler.getter();
|
|
||||||
},
|
|
||||||
set(a) {
|
|
||||||
if (prevSetter !== undefined) {
|
|
||||||
prevSetter(a);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
handler.setter(a);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const trapChain = function (owner, chain) {
|
|
||||||
const pos = chain.indexOf(".");
|
|
||||||
if (pos === -1) {
|
|
||||||
trapProp(owner, chain, false, {
|
|
||||||
v: undefined,
|
|
||||||
getter: function () {
|
|
||||||
return document.currentScript === thisScript ? this.v : cValue;
|
|
||||||
},
|
|
||||||
setter: function (a) {
|
|
||||||
if (mustAbort(a) === false) return;
|
|
||||||
cValue = a;
|
|
||||||
},
|
|
||||||
init: function (v) {
|
|
||||||
if (mustAbort(v)) return false;
|
|
||||||
//
|
|
||||||
this.v = v;
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
//
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
const prop = chain.slice(0, pos);
|
|
||||||
const v = owner[prop];
|
|
||||||
//
|
|
||||||
chain = chain.slice(pos + 1);
|
|
||||||
if (v instanceof Object || (typeof v === "object" && v !== null)) {
|
|
||||||
trapChain(v, chain);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
trapProp(owner, prop, true, {
|
|
||||||
v: undefined,
|
|
||||||
getter: function () {
|
|
||||||
return this.v;
|
|
||||||
},
|
|
||||||
setter: function (a) {
|
|
||||||
this.v = a;
|
|
||||||
if (a instanceof Object) trapChain(a, chain);
|
|
||||||
},
|
|
||||||
init: function (v) {
|
|
||||||
this.v = v;
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
//
|
|
||||||
trapChain(window, chain);
|
|
||||||
})();
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
let cValue = "undefined";
|
|
||||||
const thisScript = document.currentScript;
|
|
||||||
const chain = "ytInitialPlayerResponse.adPlacements";
|
|
||||||
//
|
|
||||||
if (cValue === "null") cValue = null;
|
|
||||||
else if (cValue === "''") cValue = "";
|
|
||||||
else if (cValue === "true") cValue = true;
|
|
||||||
else if (cValue === "false") cValue = false;
|
|
||||||
else if (cValue === "undefined") cValue = undefined;
|
|
||||||
else if (cValue === "noopFunc") cValue = function () {};
|
|
||||||
else if (cValue === "trueFunc")
|
|
||||||
cValue = function () {
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
else if (cValue === "falseFunc")
|
|
||||||
cValue = function () {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
else if (/^\d+$/.test(cValue)) {
|
|
||||||
cValue = parseFloat(cValue);
|
|
||||||
//
|
|
||||||
if (isNaN(cValue)) return;
|
|
||||||
if (Math.abs(cValue) > 0x7fff) return;
|
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
let aborted = false;
|
|
||||||
const mustAbort = function (v) {
|
|
||||||
if (aborted) return true;
|
|
||||||
aborted =
|
|
||||||
v !== undefined &&
|
|
||||||
v !== null &&
|
|
||||||
cValue !== undefined &&
|
|
||||||
cValue !== null &&
|
|
||||||
typeof v !== typeof cValue;
|
|
||||||
return aborted;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
Support multiple trappers for the same property:
|
|
||||||
https://github.com/uBlockOrigin/uBlock-issues/issues/156
|
|
||||||
*/
|
|
||||||
|
|
||||||
const trapProp = function (owner, prop, configurable, handler) {
|
|
||||||
if (handler.init(owner[prop]) === false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
const odesc = Object.getOwnPropertyDescriptor(owner, prop);
|
|
||||||
let prevGetter, prevSetter;
|
|
||||||
if (odesc instanceof Object) {
|
|
||||||
if (odesc.configurable === false) return;
|
|
||||||
if (odesc.get instanceof Function) prevGetter = odesc.get;
|
|
||||||
if (odesc.set instanceof Function) prevSetter = odesc.set;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
Object.defineProperty(owner, prop, {
|
|
||||||
configurable,
|
|
||||||
get() {
|
|
||||||
if (prevGetter !== undefined) {
|
|
||||||
prevGetter();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
return handler.getter();
|
|
||||||
},
|
|
||||||
set(a) {
|
|
||||||
if (prevSetter !== undefined) {
|
|
||||||
prevSetter(a);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
handler.setter(a);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const trapChain = function (owner, chain) {
|
|
||||||
const pos = chain.indexOf(".");
|
|
||||||
if (pos === -1) {
|
|
||||||
trapProp(owner, chain, false, {
|
|
||||||
v: undefined,
|
|
||||||
getter: function () {
|
|
||||||
return document.currentScript === thisScript ? this.v : cValue;
|
|
||||||
},
|
|
||||||
setter: function (a) {
|
|
||||||
if (mustAbort(a) === false) return;
|
|
||||||
cValue = a;
|
|
||||||
},
|
|
||||||
init: function (v) {
|
|
||||||
if (mustAbort(v)) return false;
|
|
||||||
//
|
|
||||||
this.v = v;
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
//
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
const prop = chain.slice(0, pos);
|
|
||||||
const v = owner[prop];
|
|
||||||
//
|
|
||||||
chain = chain.slice(pos + 1);
|
|
||||||
if (v instanceof Object || (typeof v === "object" && v !== null)) {
|
|
||||||
trapChain(v, chain);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
trapProp(owner, prop, true, {
|
|
||||||
v: undefined,
|
|
||||||
getter: function () {
|
|
||||||
return this.v;
|
|
||||||
},
|
|
||||||
setter: function (a) {
|
|
||||||
this.v = a;
|
|
||||||
if (a instanceof Object) trapChain(a, chain);
|
|
||||||
},
|
|
||||||
init: function (v) {
|
|
||||||
this.v = v;
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
//
|
|
||||||
trapChain(window, chain);
|
|
||||||
})();
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = () => [
|
|
||||||
{
|
|
||||||
label: "Blocker",
|
|
||||||
submenu: Object.values(config.blockers).map((blocker) => ({
|
|
||||||
label: blocker,
|
|
||||||
type: "radio",
|
|
||||||
checked: (config.get("blocker") || config.blockers.WithBlocklists) === blocker,
|
|
||||||
click: () => {
|
|
||||||
config.set("blocker", blocker);
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = async () => {
|
|
||||||
if (await config.shouldUseBlocklists()) {
|
|
||||||
// Preload adblocker to inject scripts/styles
|
|
||||||
require("@cliqz/adblocker-electron-preload");
|
|
||||||
} else if ((await config.get("blocker")) === config.blockers.InPlayer) {
|
|
||||||
require("./inject");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
const applyCompressor = (e) => {
|
|
||||||
const audioContext = e.detail.audioContext;
|
|
||||||
|
|
||||||
const compressor = audioContext.createDynamicsCompressor();
|
|
||||||
compressor.threshold.value = -50;
|
|
||||||
compressor.ratio.value = 12;
|
|
||||||
compressor.knee.value = 40;
|
|
||||||
compressor.attack.value = 0;
|
|
||||||
compressor.release.value = 0.25;
|
|
||||||
|
|
||||||
e.detail.audioSource.connect(compressor);
|
|
||||||
compressor.connect(audioContext.destination);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = () =>
|
|
||||||
document.addEventListener("audioCanPlay", applyCompressor, {
|
|
||||||
once: true, // Only create the audio compressor once, not on each video
|
|
||||||
passive: true,
|
|
||||||
});
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
const { injectCSS } = require("../utils");
|
|
||||||
|
|
||||||
module.exports = win => {
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
|
||||||
};
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
#nav-bar-background,
|
|
||||||
#header.ytmusic-item-section-renderer,
|
|
||||||
ytmusic-tabs {
|
|
||||||
background: rgba(0, 0, 0, 0.3) !important;
|
|
||||||
backdrop-filter: blur(8px) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#nav-bar-divider {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
module.exports = () => {
|
|
||||||
// See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript
|
|
||||||
require("simple-youtube-age-restriction-bypass/dist/Simple-YouTube-Age-Restriction-Bypass.user.js");
|
|
||||||
};
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
const { ipcMain } = require("electron");
|
|
||||||
|
|
||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
const promptOptions = require("../../providers/prompt-options");
|
|
||||||
|
|
||||||
module.exports = (win) => {
|
|
||||||
ipcMain.handle("captionsSelector", async (_, captionLabels, currentIndex) => {
|
|
||||||
return await prompt(
|
|
||||||
{
|
|
||||||
title: "Choose Caption",
|
|
||||||
label: `Current Caption: ${captionLabels[currentIndex] || "None"}`,
|
|
||||||
type: "select",
|
|
||||||
value: currentIndex,
|
|
||||||
selectOptions: captionLabels,
|
|
||||||
resizable: true,
|
|
||||||
...promptOptions(),
|
|
||||||
},
|
|
||||||
win
|
|
||||||
);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
const { PluginConfig } = require("../../config/dynamic");
|
|
||||||
const config = new PluginConfig("captions-selector", { enableFront: true });
|
|
||||||
module.exports = { ...config };
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
const { ElementFromFile, templatePath } = require("../utils");
|
|
||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
const configProvider = require("./config");
|
|
||||||
let config;
|
|
||||||
|
|
||||||
function $(selector) { return document.querySelector(selector); }
|
|
||||||
|
|
||||||
const captionsSettingsButton = ElementFromFile(
|
|
||||||
templatePath(__dirname, "captions-settings-template.html")
|
|
||||||
);
|
|
||||||
|
|
||||||
module.exports = async () => {
|
|
||||||
config = await configProvider.getAll();
|
|
||||||
|
|
||||||
configProvider.subscribeAll((newConfig) => {
|
|
||||||
config = newConfig;
|
|
||||||
});
|
|
||||||
document.addEventListener('apiLoaded', (event) => setup(event.detail), { once: true, passive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
function setup(api) {
|
|
||||||
$(".right-controls-buttons").append(captionsSettingsButton);
|
|
||||||
|
|
||||||
let captionTrackList = api.getOption("captions", "tracklist");
|
|
||||||
|
|
||||||
$("video").addEventListener("srcChanged", async () => {
|
|
||||||
if (config.disableCaptions) {
|
|
||||||
setTimeout(() => api.unloadModule("captions"), 100);
|
|
||||||
captionsSettingsButton.style.display = "none";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
api.loadModule("captions");
|
|
||||||
|
|
||||||
setTimeout(async () => {
|
|
||||||
captionTrackList = api.getOption("captions", "tracklist");
|
|
||||||
|
|
||||||
if (config.autoload && config.lastCaptionsCode) {
|
|
||||||
api.setOption("captions", "track", {
|
|
||||||
languageCode: config.lastCaptionsCode,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
captionsSettingsButton.style.display = captionTrackList?.length
|
|
||||||
? "inline-block"
|
|
||||||
: "none";
|
|
||||||
}, 250);
|
|
||||||
});
|
|
||||||
|
|
||||||
captionsSettingsButton.onclick = async () => {
|
|
||||||
if (captionTrackList?.length) {
|
|
||||||
const currentCaptionTrack = api.getOption("captions", "track");
|
|
||||||
let currentIndex = !currentCaptionTrack ?
|
|
||||||
null :
|
|
||||||
captionTrackList.indexOf(captionTrackList.find(track => track.languageCode === currentCaptionTrack.languageCode));
|
|
||||||
|
|
||||||
const captionLabels = [
|
|
||||||
...captionTrackList.map(track => track.displayName),
|
|
||||||
'None'
|
|
||||||
];
|
|
||||||
|
|
||||||
currentIndex = await ipcRenderer.invoke('captionsSelector', captionLabels, currentIndex)
|
|
||||||
if (currentIndex === null) return;
|
|
||||||
|
|
||||||
const newCaptions = captionTrackList[currentIndex];
|
|
||||||
configProvider.set('lastCaptionsCode', newCaptions?.languageCode);
|
|
||||||
if (newCaptions) {
|
|
||||||
api.setOption("captions", "track", { languageCode: newCaptions.languageCode });
|
|
||||||
} else {
|
|
||||||
api.setOption("captions", "track", {});
|
|
||||||
}
|
|
||||||
|
|
||||||
setTimeout(() => api.playVideo());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = () => [
|
|
||||||
{
|
|
||||||
label: "Automatically select last used caption",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("autoload"),
|
|
||||||
click: (item) => {
|
|
||||||
config.set('autoload', item.checked);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "No captions by default",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("disabledCaptions"),
|
|
||||||
click: (item) => {
|
|
||||||
config.set('disableCaptions', item.checked);
|
|
||||||
},
|
|
||||||
}
|
|
||||||
];
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<tp-yt-paper-icon-button class="player-captions-button style-scope ytmusic-player" icon="yt-icons:subtitles"
|
|
||||||
title="Open captions selector" aria-label="Open captions selector" role="button" tabindex="0" aria-disabled="false">
|
|
||||||
<tp-yt-iron-icon id="icon" class="style-scope tp-yt-paper-icon-button"><svg viewBox="0 0 24 24"
|
|
||||||
preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%;">
|
|
||||||
<g class="style-scope yt-icon">
|
|
||||||
<path
|
|
||||||
d="M20 4H4c-1.103 0-2 .897-2 2v12c0 1.103.897 2 2 2h16c1.103 0 2-.897 2-2V6c0-1.103-.897-2-2-2zm-9 6H8v4h3v2H8c-1.103 0-2-.897-2-2v-4c0-1.103.897-2 2-2h3v2zm7 0h-3v4h3v2h-3c-1.103 0-2-.897-2-2v-4c0-1.103.897-2 2-2h3v2z"
|
|
||||||
class="style-scope tp-yt-iron-icon"></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</tp-yt-iron-icon>
|
|
||||||
</tp-yt-paper-icon-button>
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
const { ipcMain } = require("electron");
|
|
||||||
const { Innertube } = require("youtubei.js");
|
|
||||||
|
|
||||||
require("./config");
|
|
||||||
|
|
||||||
module.exports = async () => {
|
|
||||||
const yt = await Innertube.create();
|
|
||||||
|
|
||||||
ipcMain.handle("audio-url", async (_, videoID) => {
|
|
||||||
const info = await yt.getBasicInfo(videoID);
|
|
||||||
const url = info.streaming_data?.formats[0].decipher(yt.session.player);
|
|
||||||
|
|
||||||
return url;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
const { PluginConfig } = require("../../config/dynamic");
|
|
||||||
const config = new PluginConfig("crossfade", { enableFront: true });
|
|
||||||
module.exports = { ...config };
|
|
||||||
@ -1,360 +0,0 @@
|
|||||||
/**
|
|
||||||
* VolumeFader
|
|
||||||
* Sophisticated Media Volume Fading
|
|
||||||
*
|
|
||||||
* Requires browser support for:
|
|
||||||
* - HTMLMediaElement
|
|
||||||
* - requestAnimationFrame()
|
|
||||||
* - ES6
|
|
||||||
*
|
|
||||||
* Does not depend on any third-party library.
|
|
||||||
*
|
|
||||||
* License: MIT
|
|
||||||
*
|
|
||||||
* Nick Schwarzenberg
|
|
||||||
* v0.2.0, 07/2016
|
|
||||||
*/
|
|
||||||
|
|
||||||
(function (root) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
// internal utility: check if value is a valid volume level and throw if not
|
|
||||||
let validateVolumeLevel = (value) => {
|
|
||||||
// number between 0 and 1?
|
|
||||||
if (!Number.isNaN(value) && value >= 0 && value <= 1) {
|
|
||||||
// yup, that's fine
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
// abort and throw an exception
|
|
||||||
throw new TypeError("Number between 0 and 1 expected as volume!");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// main class
|
|
||||||
class VolumeFader {
|
|
||||||
/**
|
|
||||||
* VolumeFader Constructor
|
|
||||||
*
|
|
||||||
* @param media {HTMLMediaElement} - audio or video element to be controlled
|
|
||||||
* @param options {Object} - an object with optional settings
|
|
||||||
* @throws {TypeError} if options.initialVolume or options.fadeDuration are invalid
|
|
||||||
*
|
|
||||||
* options:
|
|
||||||
* .logger: {Function} logging `function(stuff, …)` for execution information (default: no logging)
|
|
||||||
* .fadeScaling: {Mixed} either 'linear', 'logarithmic' or a positive number in dB (default: logarithmic)
|
|
||||||
* .initialVolume: {Number} media volume 0…1 to apply during setup (volume not touched by default)
|
|
||||||
* .fadeDuration: {Number} time in milliseconds to complete a fade (default: 1000 ms)
|
|
||||||
*/
|
|
||||||
constructor(media, options) {
|
|
||||||
// passed media element of correct type?
|
|
||||||
if (media instanceof HTMLMediaElement) {
|
|
||||||
// save reference to media element
|
|
||||||
this.media = media;
|
|
||||||
} else {
|
|
||||||
// abort and throw an exception
|
|
||||||
throw new TypeError("Media element expected!");
|
|
||||||
}
|
|
||||||
|
|
||||||
// make sure options is an object
|
|
||||||
options = options || {};
|
|
||||||
|
|
||||||
// log function passed?
|
|
||||||
if (typeof options.logger == "function") {
|
|
||||||
// set log function to the one specified
|
|
||||||
this.logger = options.logger;
|
|
||||||
} else {
|
|
||||||
// set log function explicitly to false
|
|
||||||
this.logger = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// linear volume fading?
|
|
||||||
if (options.fadeScaling == "linear") {
|
|
||||||
// pass levels unchanged
|
|
||||||
this.scale = {
|
|
||||||
internalToVolume: (level) => level,
|
|
||||||
volumeToInternal: (level) => level,
|
|
||||||
};
|
|
||||||
|
|
||||||
// log setting
|
|
||||||
this.logger && this.logger("Using linear fading.");
|
|
||||||
}
|
|
||||||
// no linear, but logarithmic fading…
|
|
||||||
else {
|
|
||||||
let dynamicRange;
|
|
||||||
|
|
||||||
// default dynamic range?
|
|
||||||
if (
|
|
||||||
options.fadeScaling === undefined ||
|
|
||||||
options.fadeScaling == "logarithmic"
|
|
||||||
) {
|
|
||||||
// set default of 60 dB
|
|
||||||
dynamicRange = 3;
|
|
||||||
}
|
|
||||||
// custom dynamic range?
|
|
||||||
else if (
|
|
||||||
!Number.isNaN(options.fadeScaling) &&
|
|
||||||
options.fadeScaling > 0
|
|
||||||
) {
|
|
||||||
// turn amplitude dB into a multiple of 10 power dB
|
|
||||||
dynamicRange = options.fadeScaling / 2 / 10;
|
|
||||||
}
|
|
||||||
// unsupported value
|
|
||||||
else {
|
|
||||||
// abort and throw exception
|
|
||||||
throw new TypeError(
|
|
||||||
"Expected 'linear', 'logarithmic' or a positive number as fade scaling preference!"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// use exponential/logarithmic scaler for expansion/compression
|
|
||||||
this.scale = {
|
|
||||||
internalToVolume: (level) =>
|
|
||||||
this.exponentialScaler(level, dynamicRange),
|
|
||||||
volumeToInternal: (level) =>
|
|
||||||
this.logarithmicScaler(level, dynamicRange),
|
|
||||||
};
|
|
||||||
|
|
||||||
// log setting if not default
|
|
||||||
options.fadeScaling &&
|
|
||||||
this.logger &&
|
|
||||||
this.logger(
|
|
||||||
"Using logarithmic fading with " +
|
|
||||||
String(10 * dynamicRange) +
|
|
||||||
" dB dynamic range."
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set initial volume?
|
|
||||||
if (options.initialVolume !== undefined) {
|
|
||||||
// validate volume level and throw if invalid
|
|
||||||
validateVolumeLevel(options.initialVolume);
|
|
||||||
|
|
||||||
// set initial volume
|
|
||||||
this.media.volume = options.initialVolume;
|
|
||||||
|
|
||||||
// log setting
|
|
||||||
this.logger &&
|
|
||||||
this.logger(
|
|
||||||
"Set initial volume to " + String(this.media.volume) + "."
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// fade duration given?
|
|
||||||
if (options.fadeDuration !== undefined) {
|
|
||||||
// try to set given fade duration (will log if successful and throw if not)
|
|
||||||
this.setFadeDuration(options.fadeDuration);
|
|
||||||
} else {
|
|
||||||
// set default fade duration (1000 ms)
|
|
||||||
this.fadeDuration = 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
// indicate that fader is not active yet
|
|
||||||
this.active = false;
|
|
||||||
|
|
||||||
// initialization done
|
|
||||||
this.logger && this.logger("Initialized for", this.media);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Re(start) the update cycle.
|
|
||||||
* (this.active must be truthy for volume updates to take effect)
|
|
||||||
*
|
|
||||||
* @return {Object} VolumeFader instance for chaining
|
|
||||||
*/
|
|
||||||
start() {
|
|
||||||
// set fader to be active
|
|
||||||
this.active = true;
|
|
||||||
|
|
||||||
// start by running the update method
|
|
||||||
this.updateVolume();
|
|
||||||
|
|
||||||
// return instance for chaining
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stop the update cycle.
|
|
||||||
* (interrupting any fade)
|
|
||||||
*
|
|
||||||
* @return {Object} VolumeFader instance for chaining
|
|
||||||
*/
|
|
||||||
stop() {
|
|
||||||
// set fader to be inactive
|
|
||||||
this.active = false;
|
|
||||||
|
|
||||||
// return instance for chaining
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set fade duration.
|
|
||||||
* (used for future calls to fadeTo)
|
|
||||||
*
|
|
||||||
* @param {Number} fadeDuration - fading length in milliseconds
|
|
||||||
* @throws {TypeError} if fadeDuration is not a number greater than zero
|
|
||||||
* @return {Object} VolumeFader instance for chaining
|
|
||||||
*/
|
|
||||||
setFadeDuration(fadeDuration) {
|
|
||||||
// if duration is a valid number > 0…
|
|
||||||
if (!Number.isNaN(fadeDuration) && fadeDuration > 0) {
|
|
||||||
// set fade duration
|
|
||||||
this.fadeDuration = fadeDuration;
|
|
||||||
|
|
||||||
// log setting
|
|
||||||
this.logger &&
|
|
||||||
this.logger("Set fade duration to " + String(fadeDuration) + " ms.");
|
|
||||||
} else {
|
|
||||||
// abort and throw an exception
|
|
||||||
throw new TypeError("Positive number expected as fade duration!");
|
|
||||||
}
|
|
||||||
|
|
||||||
// return instance for chaining
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define a new fade and start fading.
|
|
||||||
*
|
|
||||||
* @param {Number} targetVolume - level to fade to in the range 0…1
|
|
||||||
* @param {Function} callback - (optional) function to be called when fade is complete
|
|
||||||
* @throws {TypeError} if targetVolume is not in the range 0…1
|
|
||||||
* @return {Object} VolumeFader instance for chaining
|
|
||||||
*/
|
|
||||||
fadeTo(targetVolume, callback) {
|
|
||||||
// validate volume and throw if invalid
|
|
||||||
validateVolumeLevel(targetVolume);
|
|
||||||
|
|
||||||
// define new fade
|
|
||||||
this.fade = {
|
|
||||||
// volume start and end point on internal fading scale
|
|
||||||
volume: {
|
|
||||||
start: this.scale.volumeToInternal(this.media.volume),
|
|
||||||
end: this.scale.volumeToInternal(targetVolume),
|
|
||||||
},
|
|
||||||
// time start and end point
|
|
||||||
time: {
|
|
||||||
start: Date.now(),
|
|
||||||
end: Date.now() + this.fadeDuration,
|
|
||||||
},
|
|
||||||
// optional callback function
|
|
||||||
callback: callback,
|
|
||||||
};
|
|
||||||
|
|
||||||
// start fading
|
|
||||||
this.start();
|
|
||||||
|
|
||||||
// log new fade
|
|
||||||
this.logger && this.logger("New fade started:", this.fade);
|
|
||||||
|
|
||||||
// return instance for chaining
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// convenience shorthand methods for common fades
|
|
||||||
fadeIn(callback) {
|
|
||||||
this.fadeTo(1, callback);
|
|
||||||
}
|
|
||||||
fadeOut(callback) {
|
|
||||||
this.fadeTo(0, callback);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal: Update media volume.
|
|
||||||
* (calls itself through requestAnimationFrame)
|
|
||||||
*
|
|
||||||
* @param {Number} targetVolume - linear level to fade to (0…1)
|
|
||||||
* @param {Function} callback - (optional) function to be called when fade is complete
|
|
||||||
*/
|
|
||||||
updateVolume() {
|
|
||||||
// fader active and fade available to process?
|
|
||||||
if (this.active && this.fade) {
|
|
||||||
// get current time
|
|
||||||
let now = Date.now();
|
|
||||||
|
|
||||||
// time left for fading?
|
|
||||||
if (now < this.fade.time.end) {
|
|
||||||
// compute current fade progress
|
|
||||||
let progress =
|
|
||||||
(now - this.fade.time.start) /
|
|
||||||
(this.fade.time.end - this.fade.time.start);
|
|
||||||
|
|
||||||
// compute current level on internal scale
|
|
||||||
let level =
|
|
||||||
progress * (this.fade.volume.end - this.fade.volume.start) +
|
|
||||||
this.fade.volume.start;
|
|
||||||
|
|
||||||
// map fade level to volume level and apply it to media element
|
|
||||||
this.media.volume = this.scale.internalToVolume(level);
|
|
||||||
|
|
||||||
// schedule next update
|
|
||||||
root.requestAnimationFrame(this.updateVolume.bind(this));
|
|
||||||
} else {
|
|
||||||
// log end of fade
|
|
||||||
this.logger &&
|
|
||||||
this.logger(
|
|
||||||
"Fade to " + String(this.fade.volume.end) + " complete."
|
|
||||||
);
|
|
||||||
|
|
||||||
// time is up, jump to target volume
|
|
||||||
this.media.volume = this.scale.internalToVolume(this.fade.volume.end);
|
|
||||||
|
|
||||||
// set fader to be inactive
|
|
||||||
this.active = false;
|
|
||||||
|
|
||||||
// done, call back (if callable)
|
|
||||||
typeof this.fade.callback == "function" && this.fade.callback();
|
|
||||||
|
|
||||||
// clear fade
|
|
||||||
this.fade = undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal: Exponential scaler with dynamic range limit.
|
|
||||||
*
|
|
||||||
* @param {Number} input - logarithmic input level to be expanded (float, 0…1)
|
|
||||||
* @param {Number} dynamicRange - expanded output range, in multiples of 10 dB (float, 0…∞)
|
|
||||||
* @return {Number} - expanded level (float, 0…1)
|
|
||||||
*/
|
|
||||||
exponentialScaler(input, dynamicRange) {
|
|
||||||
// special case: make zero (or any falsy input) return zero
|
|
||||||
if (input == 0) {
|
|
||||||
// since the dynamic range is limited,
|
|
||||||
// allow a zero to produce a plain zero instead of a small faction
|
|
||||||
// (audio would not be recognized as silent otherwise)
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
// scale 0…1 to minus something × 10 dB
|
|
||||||
input = (input - 1) * dynamicRange;
|
|
||||||
|
|
||||||
// compute power of 10
|
|
||||||
return Math.pow(10, input);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal: Logarithmic scaler with dynamic range limit.
|
|
||||||
*
|
|
||||||
* @param {Number} input - exponential input level to be compressed (float, 0…1)
|
|
||||||
* @param {Number} dynamicRange - coerced input range, in multiples of 10 dB (float, 0…∞)
|
|
||||||
* @return {Number} - compressed level (float, 0…1)
|
|
||||||
*/
|
|
||||||
logarithmicScaler(input, dynamicRange) {
|
|
||||||
// special case: make zero (or any falsy input) return zero
|
|
||||||
if (input == 0) {
|
|
||||||
// logarithm of zero would be -∞, which would map to zero anyway
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
// compute base-10 logarithm
|
|
||||||
input = Math.log10(input);
|
|
||||||
|
|
||||||
// scale minus something × 10 dB to 0…1 (clipping at 0)
|
|
||||||
return Math.max(1 + input / dynamicRange, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// export class to root scope
|
|
||||||
root.VolumeFader = VolumeFader;
|
|
||||||
})(window);
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
const { Howl } = require("howler");
|
|
||||||
|
|
||||||
// Extracted from https://github.com/bitfasching/VolumeFader
|
|
||||||
require("./fader");
|
|
||||||
|
|
||||||
let transitionAudio; // Howler audio used to fade out the current music
|
|
||||||
let firstVideo = true;
|
|
||||||
let waitForTransition;
|
|
||||||
|
|
||||||
const defaultConfig = require("../../config/defaults").plugins.crossfade;
|
|
||||||
|
|
||||||
const configProvider = require("./config");
|
|
||||||
let config;
|
|
||||||
|
|
||||||
const configGetNum = (key) => Number(config[key]) || defaultConfig[key];
|
|
||||||
|
|
||||||
const getStreamURL = async (videoID) => {
|
|
||||||
const url = await ipcRenderer.invoke("audio-url", videoID);
|
|
||||||
return url;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getVideoIDFromURL = (url) => {
|
|
||||||
return new URLSearchParams(url.split("?")?.at(-1)).get("v");
|
|
||||||
};
|
|
||||||
|
|
||||||
const isReadyToCrossfade = () => {
|
|
||||||
return transitionAudio && transitionAudio.state() === "loaded";
|
|
||||||
};
|
|
||||||
|
|
||||||
const watchVideoIDChanges = (cb) => {
|
|
||||||
navigation.addEventListener("navigate", (event) => {
|
|
||||||
const currentVideoID = getVideoIDFromURL(
|
|
||||||
event.currentTarget.currentEntry.url,
|
|
||||||
);
|
|
||||||
const nextVideoID = getVideoIDFromURL(event.destination.url);
|
|
||||||
|
|
||||||
if (
|
|
||||||
nextVideoID &&
|
|
||||||
currentVideoID &&
|
|
||||||
(firstVideo || nextVideoID !== currentVideoID)
|
|
||||||
) {
|
|
||||||
if (isReadyToCrossfade()) {
|
|
||||||
crossfade(() => {
|
|
||||||
cb(nextVideoID);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
cb(nextVideoID);
|
|
||||||
firstVideo = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const createAudioForCrossfade = async (url) => {
|
|
||||||
if (transitionAudio) {
|
|
||||||
transitionAudio.unload();
|
|
||||||
}
|
|
||||||
transitionAudio = new Howl({
|
|
||||||
src: url,
|
|
||||||
html5: true,
|
|
||||||
volume: 0,
|
|
||||||
});
|
|
||||||
await syncVideoWithTransitionAudio();
|
|
||||||
};
|
|
||||||
|
|
||||||
const syncVideoWithTransitionAudio = async () => {
|
|
||||||
const video = document.querySelector("video");
|
|
||||||
|
|
||||||
const videoFader = new VolumeFader(video, {
|
|
||||||
fadeScaling: configGetNum("fadeScaling"),
|
|
||||||
fadeDuration: configGetNum("fadeInDuration"),
|
|
||||||
});
|
|
||||||
|
|
||||||
await transitionAudio.play();
|
|
||||||
await transitionAudio.seek(video.currentTime);
|
|
||||||
|
|
||||||
video.onseeking = () => {
|
|
||||||
transitionAudio.seek(video.currentTime);
|
|
||||||
};
|
|
||||||
video.onpause = () => {
|
|
||||||
transitionAudio.pause();
|
|
||||||
};
|
|
||||||
video.onplay = async () => {
|
|
||||||
await transitionAudio.play();
|
|
||||||
await transitionAudio.seek(video.currentTime);
|
|
||||||
|
|
||||||
// Fade in
|
|
||||||
const videoVolume = video.volume;
|
|
||||||
video.volume = 0;
|
|
||||||
videoFader.fadeTo(videoVolume);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Exit just before the end for the transition
|
|
||||||
const transitionBeforeEnd = () => {
|
|
||||||
if (
|
|
||||||
video.currentTime >= video.duration - configGetNum("secondsBeforeEnd") &&
|
|
||||||
isReadyToCrossfade()
|
|
||||||
) {
|
|
||||||
video.removeEventListener("timeupdate", transitionBeforeEnd);
|
|
||||||
|
|
||||||
// Go to next video - XXX: does not support "repeat 1" mode
|
|
||||||
document.querySelector(".next-button").click();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
video.ontimeupdate = transitionBeforeEnd;
|
|
||||||
};
|
|
||||||
|
|
||||||
const onApiLoaded = () => {
|
|
||||||
watchVideoIDChanges(async (videoID) => {
|
|
||||||
await waitForTransition;
|
|
||||||
const url = await getStreamURL(videoID);
|
|
||||||
if (!url) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await createAudioForCrossfade(url);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const crossfade = async (cb) => {
|
|
||||||
if (!isReadyToCrossfade()) {
|
|
||||||
cb();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let resolveTransition;
|
|
||||||
waitForTransition = new Promise(function (resolve, reject) {
|
|
||||||
resolveTransition = resolve;
|
|
||||||
});
|
|
||||||
|
|
||||||
const video = document.querySelector("video");
|
|
||||||
|
|
||||||
const fader = new VolumeFader(transitionAudio._sounds[0]._node, {
|
|
||||||
initialVolume: video.volume,
|
|
||||||
fadeScaling: configGetNum("fadeScaling"),
|
|
||||||
fadeDuration: configGetNum("fadeOutDuration"),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Fade out the music
|
|
||||||
video.volume = 0;
|
|
||||||
fader.fadeOut(() => {
|
|
||||||
resolveTransition();
|
|
||||||
cb();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = async () => {
|
|
||||||
config = await configProvider.getAll();
|
|
||||||
|
|
||||||
configProvider.subscribeAll((newConfig) => {
|
|
||||||
config = newConfig;
|
|
||||||
});
|
|
||||||
|
|
||||||
document.addEventListener("apiLoaded", onApiLoaded, {
|
|
||||||
once: true,
|
|
||||||
passive: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
const config = require("./config");
|
|
||||||
const defaultOptions = require("../../config/defaults").plugins.crossfade;
|
|
||||||
|
|
||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
const promptOptions = require("../../providers/prompt-options");
|
|
||||||
|
|
||||||
module.exports = (win) => [
|
|
||||||
{
|
|
||||||
label: "Advanced",
|
|
||||||
click: async () => {
|
|
||||||
const newOptions = await promptCrossfadeValues(win, config.getAll());
|
|
||||||
if (newOptions) config.setAll(newOptions);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
async function promptCrossfadeValues(win, options) {
|
|
||||||
const res = await prompt(
|
|
||||||
{
|
|
||||||
title: "Crossfade Options",
|
|
||||||
type: "multiInput",
|
|
||||||
multiInputOptions: [
|
|
||||||
{
|
|
||||||
label: "Fade in duration (ms)",
|
|
||||||
value: options.fadeInDuration || defaultOptions.fadeInDuration,
|
|
||||||
inputAttrs: {
|
|
||||||
type: "number",
|
|
||||||
required: true,
|
|
||||||
min: 0,
|
|
||||||
step: 100,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Fade out duration (ms)",
|
|
||||||
value: options.fadeOutDuration || defaultOptions.fadeOutDuration,
|
|
||||||
inputAttrs: {
|
|
||||||
type: "number",
|
|
||||||
required: true,
|
|
||||||
min: 0,
|
|
||||||
step: 100,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Crossfade x seconds before end",
|
|
||||||
value:
|
|
||||||
options.secondsBeforeEnd || defaultOptions.secondsBeforeEnd,
|
|
||||||
inputAttrs: {
|
|
||||||
type: "number",
|
|
||||||
required: true,
|
|
||||||
min: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Fade scaling",
|
|
||||||
selectOptions: { linear: "Linear", logarithmic: "Logarithmic" },
|
|
||||||
value: options.fadeScaling || defaultOptions.fadeScaling,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
resizable: true,
|
|
||||||
height: 360,
|
|
||||||
...promptOptions(),
|
|
||||||
},
|
|
||||||
win,
|
|
||||||
).catch(console.error);
|
|
||||||
if (!res) return undefined;
|
|
||||||
return {
|
|
||||||
fadeInDuration: Number(res[0]),
|
|
||||||
fadeOutDuration: Number(res[1]),
|
|
||||||
secondsBeforeEnd: Number(res[2]),
|
|
||||||
fadeScaling: res[3],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
module.exports = () => {
|
|
||||||
document.addEventListener('apiLoaded', apiEvent => {
|
|
||||||
apiEvent.detail.addEventListener('videodatachange', name => {
|
|
||||||
if (name === 'dataloaded') {
|
|
||||||
apiEvent.detail.pauseVideo();
|
|
||||||
document.querySelector('video').ontimeupdate = e => {
|
|
||||||
e.target.pause();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
document.querySelector('video').ontimeupdate = null;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}, { once: true, passive: true })
|
|
||||||
};
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
"use strict";
|
|
||||||
const Discord = require("@xhayper/discord-rpc");
|
|
||||||
const { dev } = require("electron-is");
|
|
||||||
const { dialog, app } = require("electron");
|
|
||||||
|
|
||||||
const registerCallback = require("../../providers/song-info");
|
|
||||||
|
|
||||||
// Application ID registered by @Zo-Bro-23
|
|
||||||
const clientId = "1043858434585526382";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @typedef {Object} Info
|
|
||||||
* @property {import('@xhayper/discord-rpc').Client} rpc
|
|
||||||
* @property {boolean} ready
|
|
||||||
* @property {boolean} autoReconnect
|
|
||||||
* @property {import('../../providers/song-info').SongInfo} lastSongInfo
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* @type {Info}
|
|
||||||
*/
|
|
||||||
const info = {
|
|
||||||
rpc: new Discord.Client({
|
|
||||||
clientId
|
|
||||||
}),
|
|
||||||
ready: false,
|
|
||||||
autoReconnect: true,
|
|
||||||
lastSongInfo: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @type {(() => void)[]}
|
|
||||||
*/
|
|
||||||
const refreshCallbacks = [];
|
|
||||||
|
|
||||||
const resetInfo = () => {
|
|
||||||
info.ready = false;
|
|
||||||
clearTimeout(clearActivity);
|
|
||||||
if (dev()) console.log("discord disconnected");
|
|
||||||
refreshCallbacks.forEach(cb => cb());
|
|
||||||
};
|
|
||||||
|
|
||||||
info.rpc.on("connected", () => {
|
|
||||||
if (dev()) console.log("discord connected");
|
|
||||||
refreshCallbacks.forEach(cb => cb());
|
|
||||||
});
|
|
||||||
|
|
||||||
info.rpc.on("ready", () => {
|
|
||||||
info.ready = true;
|
|
||||||
if (info.lastSongInfo) updateActivity(info.lastSongInfo)
|
|
||||||
});
|
|
||||||
|
|
||||||
info.rpc.on("disconnected", () => {
|
|
||||||
resetInfo();
|
|
||||||
|
|
||||||
if (info.autoReconnect) {
|
|
||||||
connectTimeout();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const connectTimeout = () => new Promise((resolve, reject) => setTimeout(() => {
|
|
||||||
if (!info.autoReconnect || info.rpc.isConnected) return;
|
|
||||||
info.rpc.login().then(resolve).catch(reject);
|
|
||||||
}, 5000));
|
|
||||||
|
|
||||||
const connectRecursive = () => {
|
|
||||||
if (!info.autoReconnect || info.rpc.isConnected) return;
|
|
||||||
connectTimeout().catch(connectRecursive);
|
|
||||||
}
|
|
||||||
|
|
||||||
let window;
|
|
||||||
const connect = (showErr = false) => {
|
|
||||||
if (info.rpc.isConnected) {
|
|
||||||
if (dev())
|
|
||||||
console.log('Attempted to connect with active connection');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
info.ready = false;
|
|
||||||
|
|
||||||
// Startup the rpc client
|
|
||||||
info.rpc.login({ clientId }).catch(err => {
|
|
||||||
resetInfo();
|
|
||||||
if (dev()) console.error(err);
|
|
||||||
if (info.autoReconnect) {
|
|
||||||
connectRecursive();
|
|
||||||
}
|
|
||||||
else if (showErr) dialog.showMessageBox(window, { title: 'Connection failed', message: err.message || String(err), type: 'error' });
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
let clearActivity;
|
|
||||||
/**
|
|
||||||
* @type {import('../../providers/song-info').songInfoCallback}
|
|
||||||
*/
|
|
||||||
let updateActivity;
|
|
||||||
|
|
||||||
module.exports = (win, { autoReconnect, activityTimoutEnabled, activityTimoutTime, listenAlong, hideDurationLeft }) => {
|
|
||||||
info.autoReconnect = autoReconnect;
|
|
||||||
|
|
||||||
window = win;
|
|
||||||
// We get multiple events
|
|
||||||
// Next song: PAUSE(n), PAUSE(n+1), PLAY(n+1)
|
|
||||||
// Skip time: PAUSE(N), PLAY(N)
|
|
||||||
updateActivity = songInfo => {
|
|
||||||
if (songInfo.title.length === 0 && songInfo.artist.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
info.lastSongInfo = songInfo;
|
|
||||||
|
|
||||||
// stop the clear activity timout
|
|
||||||
clearTimeout(clearActivity);
|
|
||||||
|
|
||||||
// stop early if discord connection is not ready
|
|
||||||
// do this after clearTimeout to avoid unexpected clears
|
|
||||||
if (!info.rpc || !info.ready) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// clear directly if timeout is 0
|
|
||||||
if (songInfo.isPaused && activityTimoutEnabled && activityTimoutTime === 0) {
|
|
||||||
info.rpc.user?.clearActivity().catch(console.error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Song information changed, so lets update the rich presence
|
|
||||||
// @see https://discord.com/developers/docs/topics/gateway#activity-object
|
|
||||||
// not all options are transfered through https://github.com/discordjs/RPC/blob/6f83d8d812c87cb7ae22064acd132600407d7d05/src/client.js#L518-530
|
|
||||||
const activityInfo = {
|
|
||||||
details: songInfo.title,
|
|
||||||
state: songInfo.artist,
|
|
||||||
largeImageKey: songInfo.imageSrc,
|
|
||||||
largeImageText: songInfo.album,
|
|
||||||
buttons: listenAlong ? [
|
|
||||||
{ label: "Listen Along", url: songInfo.url },
|
|
||||||
] : undefined,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (songInfo.isPaused) {
|
|
||||||
// Add a paused icon to show that the song is paused
|
|
||||||
activityInfo.smallImageKey = "paused";
|
|
||||||
activityInfo.smallImageText = "Paused";
|
|
||||||
// Set start the timer so the activity gets cleared after a while if enabled
|
|
||||||
if (activityTimoutEnabled)
|
|
||||||
clearActivity = setTimeout(() => info.rpc.user?.clearActivity().catch(console.error), activityTimoutTime ?? 10000);
|
|
||||||
} else if (!hideDurationLeft) {
|
|
||||||
// Add the start and end time of the song
|
|
||||||
const songStartTime = Date.now() - songInfo.elapsedSeconds * 1000;
|
|
||||||
activityInfo.startTimestamp = songStartTime;
|
|
||||||
activityInfo.endTimestamp =
|
|
||||||
songStartTime + songInfo.songDuration * 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
info.rpc.user?.setActivity(activityInfo).catch(console.error);
|
|
||||||
};
|
|
||||||
|
|
||||||
// If the page is ready, register the callback
|
|
||||||
win.once("ready-to-show", () => {
|
|
||||||
registerCallback(updateActivity);
|
|
||||||
connect();
|
|
||||||
});
|
|
||||||
app.on('window-all-closed', module.exports.clear)
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.clear = () => {
|
|
||||||
if (info.rpc) info.rpc.user?.clearActivity();
|
|
||||||
clearTimeout(clearActivity);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.connect = connect;
|
|
||||||
module.exports.registerRefresh = (cb) => refreshCallbacks.push(cb);
|
|
||||||
module.exports.isConnected = () => info.rpc !== null;
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
|
|
||||||
const { setMenuOptions } = require("../../config/plugins");
|
|
||||||
const promptOptions = require("../../providers/prompt-options");
|
|
||||||
const { clear, connect, registerRefresh, isConnected } = require("./back");
|
|
||||||
|
|
||||||
const { singleton } = require("../../providers/decorators")
|
|
||||||
|
|
||||||
const registerRefreshOnce = singleton((refreshMenu) => {
|
|
||||||
registerRefresh(refreshMenu);
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports = (win, options, refreshMenu) => {
|
|
||||||
registerRefreshOnce(refreshMenu);
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
label: isConnected() ? "Connected" : "Reconnect",
|
|
||||||
enabled: !isConnected(),
|
|
||||||
click: connect,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Auto reconnect",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.autoReconnect,
|
|
||||||
click: (item) => {
|
|
||||||
options.autoReconnect = item.checked;
|
|
||||||
setMenuOptions('discord', options);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Clear activity",
|
|
||||||
click: clear,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Clear activity after timeout",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.activityTimoutEnabled,
|
|
||||||
click: (item) => {
|
|
||||||
options.activityTimoutEnabled = item.checked;
|
|
||||||
setMenuOptions('discord', options);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Listen Along",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.listenAlong,
|
|
||||||
click: (item) => {
|
|
||||||
options.listenAlong = item.checked;
|
|
||||||
setMenuOptions('discord', options);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Hide duration left",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.hideDurationLeft,
|
|
||||||
click: (item) => {
|
|
||||||
options.hideDurationLeft = item.checked;
|
|
||||||
setMenuOptions('discord', options);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Set inactivity timeout",
|
|
||||||
click: () => setInactivityTimeout(win, options),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
async function setInactivityTimeout(win, options) {
|
|
||||||
let output = await prompt({
|
|
||||||
title: 'Set Inactivity Timeout',
|
|
||||||
label: 'Enter inactivity timeout in seconds:',
|
|
||||||
value: Math.round((options.activityTimoutTime ?? 0) / 1e3),
|
|
||||||
type: "counter",
|
|
||||||
counterOptions: { minimum: 0, multiFire: true },
|
|
||||||
width: 450,
|
|
||||||
...promptOptions()
|
|
||||||
}, win)
|
|
||||||
|
|
||||||
if (output) {
|
|
||||||
options.activityTimoutTime = Math.round(output * 1e3);
|
|
||||||
setMenuOptions("discord", options);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,519 +0,0 @@
|
|||||||
const {
|
|
||||||
existsSync,
|
|
||||||
mkdirSync,
|
|
||||||
createWriteStream,
|
|
||||||
writeFileSync,
|
|
||||||
} = require('fs');
|
|
||||||
const { join } = require('path');
|
|
||||||
|
|
||||||
const { fetchFromGenius } = require('../lyrics-genius/back');
|
|
||||||
const { isEnabled } = require('../../config/plugins');
|
|
||||||
const { getImage, cleanupName } = require('../../providers/song-info');
|
|
||||||
const { injectCSS } = require('../utils');
|
|
||||||
const { cache } = require("../../providers/decorators")
|
|
||||||
const {
|
|
||||||
presets,
|
|
||||||
cropMaxWidth,
|
|
||||||
getFolder,
|
|
||||||
setBadge,
|
|
||||||
sendFeedback: sendFeedback_,
|
|
||||||
} = require('./utils');
|
|
||||||
|
|
||||||
const { ipcMain, app, dialog } = require('electron');
|
|
||||||
const is = require('electron-is');
|
|
||||||
const { Innertube, UniversalCache, Utils, ClientType } = require('youtubei.js');
|
|
||||||
const ytpl = require('ytpl'); // REPLACE with youtubei getplaylist https://github.com/LuanRT/YouTube.js#getplaylistid
|
|
||||||
|
|
||||||
const filenamify = require('filenamify');
|
|
||||||
const ID3Writer = require('browser-id3-writer');
|
|
||||||
const { randomBytes } = require('crypto');
|
|
||||||
const Mutex = require('async-mutex').Mutex;
|
|
||||||
const ffmpeg = require('@ffmpeg/ffmpeg').createFFmpeg({
|
|
||||||
log: false,
|
|
||||||
logger: () => {}, // console.log,
|
|
||||||
progress: () => {}, // console.log,
|
|
||||||
});
|
|
||||||
const ffmpegMutex = new Mutex();
|
|
||||||
|
|
||||||
const config = require('./config');
|
|
||||||
|
|
||||||
/** @type {Innertube} */
|
|
||||||
let yt;
|
|
||||||
let win;
|
|
||||||
let playingUrl = undefined;
|
|
||||||
|
|
||||||
const sendError = (error, source) => {
|
|
||||||
win.setProgressBar(-1); // close progress bar
|
|
||||||
setBadge(0); // close badge
|
|
||||||
sendFeedback_(win); // reset feedback
|
|
||||||
|
|
||||||
const songNameMessage = source ? `\nin ${source}` : '';
|
|
||||||
const cause = error.cause ? `\n\n${error.cause.toString()}` : '';
|
|
||||||
const message = `${error.toString()}${songNameMessage}${cause}`;
|
|
||||||
|
|
||||||
console.error(message);
|
|
||||||
dialog.showMessageBox({
|
|
||||||
type: 'info',
|
|
||||||
buttons: ['OK'],
|
|
||||||
title: 'Error in download!',
|
|
||||||
message: 'Argh! Apologies, download failed…',
|
|
||||||
detail: message,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = async (win_) => {
|
|
||||||
win = win_;
|
|
||||||
injectCSS(win.webContents, join(__dirname, 'style.css'));
|
|
||||||
|
|
||||||
yt = await Innertube.create({
|
|
||||||
cache: new UniversalCache(false),
|
|
||||||
generate_session_locally: true,
|
|
||||||
});
|
|
||||||
ipcMain.on('download-song', (_, url) => downloadSong(url));
|
|
||||||
ipcMain.on('video-src-changed', async (_, data) => {
|
|
||||||
playingUrl =
|
|
||||||
JSON.parse(data)?.microformat?.microformatDataRenderer?.urlCanonical;
|
|
||||||
});
|
|
||||||
ipcMain.on('download-playlist-request', async (_event, url) =>
|
|
||||||
downloadPlaylist(url),
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.downloadSong = downloadSong;
|
|
||||||
module.exports.downloadPlaylist = downloadPlaylist;
|
|
||||||
|
|
||||||
async function downloadSong(
|
|
||||||
url,
|
|
||||||
playlistFolder = undefined,
|
|
||||||
trackId = undefined,
|
|
||||||
increasePlaylistProgress = () => {},
|
|
||||||
) {
|
|
||||||
let resolvedName = undefined;
|
|
||||||
try {
|
|
||||||
await downloadSongUnsafe(
|
|
||||||
url,
|
|
||||||
name=>resolvedName=name,
|
|
||||||
playlistFolder,
|
|
||||||
trackId,
|
|
||||||
increasePlaylistProgress,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
sendError(error, resolvedName || url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function downloadSongUnsafe(
|
|
||||||
url,
|
|
||||||
setName,
|
|
||||||
playlistFolder = undefined,
|
|
||||||
trackId = undefined,
|
|
||||||
increasePlaylistProgress = () => {},
|
|
||||||
) {
|
|
||||||
const sendFeedback = (message, progress) => {
|
|
||||||
if (!playlistFolder) {
|
|
||||||
sendFeedback_(win, message);
|
|
||||||
if (!isNaN(progress)) {
|
|
||||||
win.setProgressBar(progress);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
sendFeedback('Downloading...', 2);
|
|
||||||
|
|
||||||
const id = getVideoId(url);
|
|
||||||
let info = await yt.music.getInfo(id);
|
|
||||||
|
|
||||||
if (!info) {
|
|
||||||
throw new Error('Video not found');
|
|
||||||
}
|
|
||||||
|
|
||||||
const metadata = getMetadata(info);
|
|
||||||
if (metadata.album === 'N/A') metadata.album = '';
|
|
||||||
metadata.trackId = trackId;
|
|
||||||
|
|
||||||
const dir =
|
|
||||||
playlistFolder || config.get('downloadFolder') || app.getPath('downloads');
|
|
||||||
const name = `${metadata.artist ? `${metadata.artist} - ` : ''}${
|
|
||||||
metadata.title
|
|
||||||
}`;
|
|
||||||
setName(name);
|
|
||||||
|
|
||||||
let playabilityStatus = info.playability_status;
|
|
||||||
let bypassedResult = null;
|
|
||||||
if (playabilityStatus.status === "LOGIN_REQUIRED") {
|
|
||||||
// try to bypass the age restriction
|
|
||||||
bypassedResult = await getAndroidTvInfo(id);
|
|
||||||
playabilityStatus = bypassedResult.playability_status;
|
|
||||||
|
|
||||||
if (playabilityStatus.status === "LOGIN_REQUIRED") {
|
|
||||||
throw new Error(
|
|
||||||
`[${playabilityStatus.status}] ${playabilityStatus.reason}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
info = bypassedResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (playabilityStatus.status === "UNPLAYABLE") {
|
|
||||||
/**
|
|
||||||
* @typedef {import('youtubei.js/dist/src/parser/classes/PlayerErrorMessage').default} PlayerErrorMessage
|
|
||||||
* @type {PlayerErrorMessage}
|
|
||||||
*/
|
|
||||||
const errorScreen = playabilityStatus.error_screen;
|
|
||||||
throw new Error(
|
|
||||||
`[${playabilityStatus.status}] ${errorScreen.reason.text}: ${errorScreen.subreason.text}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const extension = presets[config.get('preset')]?.extension || 'mp3';
|
|
||||||
|
|
||||||
const filename = filenamify(`${name}.${extension}`, {
|
|
||||||
replacement: '_',
|
|
||||||
maxLength: 255,
|
|
||||||
});
|
|
||||||
const filePath = join(dir, filename);
|
|
||||||
|
|
||||||
if (config.get('skipExisting') && existsSync(filePath)) {
|
|
||||||
sendFeedback(null, -1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const download_options = {
|
|
||||||
type: 'audio', // audio, video or video+audio
|
|
||||||
quality: 'best', // best, bestefficiency, 144p, 240p, 480p, 720p and so on.
|
|
||||||
format: 'any', // media container format
|
|
||||||
};
|
|
||||||
|
|
||||||
const format = info.chooseFormat(download_options);
|
|
||||||
const stream = await info.download(download_options);
|
|
||||||
|
|
||||||
console.info(
|
|
||||||
`Downloading ${metadata.artist} - ${metadata.title} [${metadata.id}]`,
|
|
||||||
);
|
|
||||||
|
|
||||||
const iterableStream = Utils.streamToIterable(stream);
|
|
||||||
|
|
||||||
if (!existsSync(dir)) {
|
|
||||||
mkdirSync(dir);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!presets[config.get('preset')]) {
|
|
||||||
const fileBuffer = await iterableStreamToMP3(
|
|
||||||
iterableStream,
|
|
||||||
metadata,
|
|
||||||
format.content_length,
|
|
||||||
sendFeedback,
|
|
||||||
increasePlaylistProgress,
|
|
||||||
);
|
|
||||||
writeFileSync(filePath, await writeID3(fileBuffer, metadata, sendFeedback));
|
|
||||||
} else {
|
|
||||||
const file = createWriteStream(filePath);
|
|
||||||
let downloaded = 0;
|
|
||||||
const total = format.content_length;
|
|
||||||
|
|
||||||
for await (const chunk of iterableStream) {
|
|
||||||
downloaded += chunk.length;
|
|
||||||
const ratio = downloaded / total;
|
|
||||||
const progress = Math.floor(ratio * 100);
|
|
||||||
sendFeedback(`Download: ${progress}%`, ratio);
|
|
||||||
increasePlaylistProgress(ratio);
|
|
||||||
file.write(chunk);
|
|
||||||
}
|
|
||||||
await ffmpegWriteTags(
|
|
||||||
filePath,
|
|
||||||
metadata,
|
|
||||||
presets[config.get('preset')]?.ffmpegArgs,
|
|
||||||
);
|
|
||||||
sendFeedback(null, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
sendFeedback(null, -1);
|
|
||||||
console.info(`Done: "${filePath}"`);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function iterableStreamToMP3(
|
|
||||||
stream,
|
|
||||||
metadata,
|
|
||||||
content_length,
|
|
||||||
sendFeedback,
|
|
||||||
increasePlaylistProgress = () => {},
|
|
||||||
) {
|
|
||||||
const chunks = [];
|
|
||||||
let downloaded = 0;
|
|
||||||
const total = content_length;
|
|
||||||
for await (const chunk of stream) {
|
|
||||||
downloaded += chunk.length;
|
|
||||||
chunks.push(chunk);
|
|
||||||
const ratio = downloaded / total;
|
|
||||||
const progress = Math.floor(ratio * 100);
|
|
||||||
sendFeedback(`Download: ${progress}%`, ratio);
|
|
||||||
// 15% for download, 85% for conversion
|
|
||||||
// This is a very rough estimate, trying to make the progress bar look nice
|
|
||||||
increasePlaylistProgress(ratio * 0.15);
|
|
||||||
}
|
|
||||||
sendFeedback('Loading…', 2); // indefinite progress bar after download
|
|
||||||
|
|
||||||
const buffer = Buffer.concat(chunks);
|
|
||||||
const safeVideoName = randomBytes(32).toString('hex');
|
|
||||||
const releaseFFmpegMutex = await ffmpegMutex.acquire();
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (!ffmpeg.isLoaded()) {
|
|
||||||
await ffmpeg.load();
|
|
||||||
}
|
|
||||||
|
|
||||||
sendFeedback('Preparing file…');
|
|
||||||
ffmpeg.FS('writeFile', safeVideoName, buffer);
|
|
||||||
|
|
||||||
sendFeedback('Converting…');
|
|
||||||
|
|
||||||
ffmpeg.setProgress(({ ratio }) => {
|
|
||||||
sendFeedback(`Converting: ${Math.floor(ratio * 100)}%`, ratio);
|
|
||||||
increasePlaylistProgress(0.15 + ratio * 0.85);
|
|
||||||
});
|
|
||||||
|
|
||||||
await ffmpeg.run(
|
|
||||||
'-i',
|
|
||||||
safeVideoName,
|
|
||||||
...getFFmpegMetadataArgs(metadata),
|
|
||||||
`${safeVideoName}.mp3`,
|
|
||||||
);
|
|
||||||
|
|
||||||
sendFeedback('Saving…');
|
|
||||||
|
|
||||||
return ffmpeg.FS('readFile', `${safeVideoName}.mp3`);
|
|
||||||
} catch (e) {
|
|
||||||
sendError(e, safeVideoName);
|
|
||||||
} finally {
|
|
||||||
releaseFFmpegMutex();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const getCoverBuffer = cache(async (url) => {
|
|
||||||
const nativeImage = cropMaxWidth(await getImage(url));
|
|
||||||
return nativeImage && !nativeImage.isEmpty() ? nativeImage.toPNG() : null;
|
|
||||||
});
|
|
||||||
|
|
||||||
async function writeID3(buffer, metadata, sendFeedback) {
|
|
||||||
try {
|
|
||||||
sendFeedback('Writing ID3 tags...');
|
|
||||||
|
|
||||||
const coverBuffer = await getCoverBuffer(metadata.image);
|
|
||||||
|
|
||||||
const writer = new ID3Writer(buffer);
|
|
||||||
|
|
||||||
// Create the metadata tags
|
|
||||||
writer.setFrame('TIT2', metadata.title).setFrame('TPE1', [metadata.artist]);
|
|
||||||
if (metadata.album) {
|
|
||||||
writer.setFrame('TALB', metadata.album);
|
|
||||||
}
|
|
||||||
if (coverBuffer) {
|
|
||||||
writer.setFrame('APIC', {
|
|
||||||
type: 3,
|
|
||||||
data: coverBuffer,
|
|
||||||
description: '',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (isEnabled('lyrics-genius')) {
|
|
||||||
const lyrics = await fetchFromGenius(metadata);
|
|
||||||
if (lyrics) {
|
|
||||||
writer.setFrame('USLT', {
|
|
||||||
description: '',
|
|
||||||
lyrics: lyrics,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (metadata.trackId) {
|
|
||||||
writer.setFrame('TRCK', metadata.trackId);
|
|
||||||
}
|
|
||||||
writer.addTag();
|
|
||||||
return Buffer.from(writer.arrayBuffer);
|
|
||||||
} catch (e) {
|
|
||||||
sendError(e, `${metadata.artist} - ${metadata.title}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function downloadPlaylist(givenUrl) {
|
|
||||||
try {
|
|
||||||
givenUrl = new URL(givenUrl);
|
|
||||||
} catch {
|
|
||||||
givenUrl = undefined;
|
|
||||||
}
|
|
||||||
const playlistId =
|
|
||||||
getPlaylistID(givenUrl) ||
|
|
||||||
getPlaylistID(new URL(win.webContents.getURL())) ||
|
|
||||||
getPlaylistID(new URL(playingUrl));
|
|
||||||
|
|
||||||
if (!playlistId) {
|
|
||||||
sendError(new Error('No playlist ID found'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const sendFeedback = (message) => sendFeedback_(win, message);
|
|
||||||
|
|
||||||
console.log(`trying to get playlist ID: '${playlistId}'`);
|
|
||||||
sendFeedback('Getting playlist info…');
|
|
||||||
let playlist;
|
|
||||||
try {
|
|
||||||
playlist = await ytpl(playlistId, {
|
|
||||||
limit: config.get('playlistMaxItems') || Infinity,
|
|
||||||
});
|
|
||||||
} catch (e) {
|
|
||||||
sendError(
|
|
||||||
`Error getting playlist info: make sure it isn\'t a private or "Mixed for you" playlist\n\n${e}`,
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (playlist.items.length === 0) sendError(new Error('Playlist is empty'));
|
|
||||||
if (playlist.items.length === 1) {
|
|
||||||
sendFeedback('Playlist has only one item, downloading it directly');
|
|
||||||
await downloadSong(playlist.items[0].url);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const isAlbum = playlist.title.startsWith('Album - ');
|
|
||||||
if (isAlbum) {
|
|
||||||
playlist.title = playlist.title.slice(8);
|
|
||||||
}
|
|
||||||
const safePlaylistTitle = filenamify(playlist.title, { replacement: ' ' });
|
|
||||||
|
|
||||||
const folder = getFolder(config.get('downloadFolder'));
|
|
||||||
const playlistFolder = join(folder, safePlaylistTitle);
|
|
||||||
if (existsSync(playlistFolder)) {
|
|
||||||
if (!config.get('skipExisting')) {
|
|
||||||
sendError(new Error(`The folder ${playlistFolder} already exists`));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mkdirSync(playlistFolder, { recursive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
dialog.showMessageBox({
|
|
||||||
type: 'info',
|
|
||||||
buttons: ['OK'],
|
|
||||||
title: 'Started Download',
|
|
||||||
message: `Downloading Playlist "${playlist.title}"`,
|
|
||||||
detail: `(${playlist.items.length} songs)`,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log(
|
|
||||||
`Downloading playlist "${playlist.title}" - ${playlist.items.length} songs (${playlistId})`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
win.setProgressBar(2); // starts with indefinite bar
|
|
||||||
|
|
||||||
setBadge(playlist.items.length);
|
|
||||||
|
|
||||||
let counter = 1;
|
|
||||||
|
|
||||||
const progressStep = 1 / playlist.items.length;
|
|
||||||
|
|
||||||
const increaseProgress = (itemPercentage) => {
|
|
||||||
const currentProgress = (counter - 1) / playlist.items.length;
|
|
||||||
const newProgress = currentProgress + progressStep * itemPercentage;
|
|
||||||
win.setProgressBar(newProgress);
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
for (const song of playlist.items) {
|
|
||||||
sendFeedback(`Downloading ${counter}/${playlist.items.length}...`);
|
|
||||||
const trackId = isAlbum ? counter : undefined;
|
|
||||||
await downloadSong(
|
|
||||||
song.url,
|
|
||||||
playlistFolder,
|
|
||||||
trackId,
|
|
||||||
increaseProgress,
|
|
||||||
).catch((e) =>
|
|
||||||
sendError(
|
|
||||||
`Error downloading "${song.author.name} - ${song.title}":\n ${e}`,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
win.setProgressBar(counter / playlist.items.length);
|
|
||||||
setBadge(playlist.items.length - counter);
|
|
||||||
counter++;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
sendError(e);
|
|
||||||
} finally {
|
|
||||||
win.setProgressBar(-1); // close progress bar
|
|
||||||
setBadge(0); // close badge counter
|
|
||||||
sendFeedback(); // clear feedback
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function ffmpegWriteTags(filePath, metadata, ffmpegArgs = []) {
|
|
||||||
const releaseFFmpegMutex = await ffmpegMutex.acquire();
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (!ffmpeg.isLoaded()) {
|
|
||||||
await ffmpeg.load();
|
|
||||||
}
|
|
||||||
|
|
||||||
await ffmpeg.run(
|
|
||||||
'-i',
|
|
||||||
filePath,
|
|
||||||
...getFFmpegMetadataArgs(metadata),
|
|
||||||
...ffmpegArgs,
|
|
||||||
filePath,
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
sendError(e);
|
|
||||||
} finally {
|
|
||||||
releaseFFmpegMutex();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getFFmpegMetadataArgs(metadata) {
|
|
||||||
if (!metadata) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
|
||||||
...(metadata.title ? ['-metadata', `title=${metadata.title}`] : []),
|
|
||||||
...(metadata.artist ? ['-metadata', `artist=${metadata.artist}`] : []),
|
|
||||||
...(metadata.album ? ['-metadata', `album=${metadata.album}`] : []),
|
|
||||||
...(metadata.trackId ? ['-metadata', `track=${metadata.trackId}`] : []),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Playlist radio modifier needs to be cut from playlist ID
|
|
||||||
const INVALID_PLAYLIST_MODIFIER = 'RDAMPL';
|
|
||||||
|
|
||||||
const getPlaylistID = (aURL) => {
|
|
||||||
const result =
|
|
||||||
aURL?.searchParams.get('list') || aURL?.searchParams.get('playlist');
|
|
||||||
if (result?.startsWith(INVALID_PLAYLIST_MODIFIER)) {
|
|
||||||
return result.slice(INVALID_PLAYLIST_MODIFIER.length);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getVideoId = (url) => {
|
|
||||||
if (typeof url === 'string') {
|
|
||||||
url = new URL(url);
|
|
||||||
}
|
|
||||||
return url.searchParams.get('v');
|
|
||||||
};
|
|
||||||
|
|
||||||
const getMetadata = (info) => ({
|
|
||||||
id: info.basic_info.id,
|
|
||||||
title: cleanupName(info.basic_info.title),
|
|
||||||
artist: cleanupName(info.basic_info.author),
|
|
||||||
album: info.player_overlays?.browser_media_session?.album?.text,
|
|
||||||
image: info.basic_info.thumbnail?.find((t) => !t.url.endsWith('.webp'))?.url,
|
|
||||||
});
|
|
||||||
|
|
||||||
// This is used to bypass age restrictions
|
|
||||||
const getAndroidTvInfo = async (id) => {
|
|
||||||
const innertube = await Innertube.create({
|
|
||||||
clientType: ClientType.TV_EMBEDDED,
|
|
||||||
generate_session_locally: true,
|
|
||||||
retrieve_player: true,
|
|
||||||
});
|
|
||||||
const info = await innertube.getBasicInfo(id, 'TV_EMBEDDED');
|
|
||||||
// getInfo 404s with the bypass, so we use getBasicInfo instead
|
|
||||||
// that's fine as we only need the streaming data
|
|
||||||
return info;
|
|
||||||
}
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
const { PluginConfig } = require('../../config/dynamic');
|
|
||||||
const config = new PluginConfig('downloader');
|
|
||||||
module.exports = { ...config };
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
const { defaultConfig } = require("../../config");
|
|
||||||
const { getSongMenu } = require("../../providers/dom-elements");
|
|
||||||
const { ElementFromFile, templatePath } = require("../utils");
|
|
||||||
|
|
||||||
let menu = null;
|
|
||||||
let progress = null;
|
|
||||||
const downloadButton = ElementFromFile(
|
|
||||||
templatePath(__dirname, "download.html")
|
|
||||||
);
|
|
||||||
|
|
||||||
let doneFirstLoad = false;
|
|
||||||
|
|
||||||
const menuObserver = new MutationObserver(() => {
|
|
||||||
if (!menu) {
|
|
||||||
menu = getSongMenu();
|
|
||||||
if (!menu) return;
|
|
||||||
}
|
|
||||||
if (menu.contains(downloadButton)) return;
|
|
||||||
const menuUrl = document.querySelector('tp-yt-paper-listbox [tabindex="0"] #navigation-endpoint')?.href;
|
|
||||||
if (!menuUrl?.includes('watch?') && doneFirstLoad) return;
|
|
||||||
|
|
||||||
menu.prepend(downloadButton);
|
|
||||||
progress = document.querySelector("#ytmcustom-download");
|
|
||||||
|
|
||||||
if (doneFirstLoad) return;
|
|
||||||
setTimeout(() => doneFirstLoad ||= true, 500);
|
|
||||||
});
|
|
||||||
|
|
||||||
// TODO: re-enable once contextIsolation is set to true
|
|
||||||
// contextBridge.exposeInMainWorld("downloader", {
|
|
||||||
// download: () => {
|
|
||||||
global.download = () => {
|
|
||||||
let videoUrl = getSongMenu()
|
|
||||||
// selector of first button which is always "Start Radio"
|
|
||||||
?.querySelector('ytmusic-menu-navigation-item-renderer[tabindex="0"] #navigation-endpoint')
|
|
||||||
?.getAttribute("href");
|
|
||||||
if (videoUrl) {
|
|
||||||
if (videoUrl.startsWith('watch?')) {
|
|
||||||
videoUrl = defaultConfig.url + "/" + videoUrl;
|
|
||||||
}
|
|
||||||
if (videoUrl.includes('?playlist=')) {
|
|
||||||
ipcRenderer.send('download-playlist-request', videoUrl);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
videoUrl = global.songInfo.url || window.location.href;
|
|
||||||
}
|
|
||||||
|
|
||||||
ipcRenderer.send('download-song', videoUrl);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = () => {
|
|
||||||
document.addEventListener('apiLoaded', () => {
|
|
||||||
menuObserver.observe(document.querySelector('ytmusic-popup-container'), {
|
|
||||||
childList: true,
|
|
||||||
subtree: true,
|
|
||||||
});
|
|
||||||
}, { once: true, passive: true })
|
|
||||||
|
|
||||||
ipcRenderer.on('downloader-feedback', (_, feedback) => {
|
|
||||||
if (!progress) {
|
|
||||||
console.warn("Cannot update progress");
|
|
||||||
} else {
|
|
||||||
progress.innerHTML = feedback || "Download";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
const { dialog } = require("electron");
|
|
||||||
|
|
||||||
const { downloadPlaylist } = require("./back");
|
|
||||||
const { defaultMenuDownloadLabel, getFolder, presets } = require("./utils");
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = () => {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
label: defaultMenuDownloadLabel,
|
|
||||||
click: () => downloadPlaylist(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Choose download folder",
|
|
||||||
click: () => {
|
|
||||||
const result = dialog.showOpenDialogSync({
|
|
||||||
properties: ["openDirectory", "createDirectory"],
|
|
||||||
defaultPath: getFolder(config.get("downloadFolder")),
|
|
||||||
});
|
|
||||||
if (result) {
|
|
||||||
config.set("downloadFolder", result[0]);
|
|
||||||
} // else = user pressed cancel
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Presets",
|
|
||||||
submenu: Object.keys(presets).map((preset) => ({
|
|
||||||
label: preset,
|
|
||||||
type: "radio",
|
|
||||||
checked: config.get("preset") === preset,
|
|
||||||
click: () => {
|
|
||||||
config.set("preset", preset);
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Skip existing files",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: config.get("skipExisting"),
|
|
||||||
click: (item) => {
|
|
||||||
config.set("skipExisting", item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
};
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
.menu-item {
|
|
||||||
display: var(--ytmusic-menu-item_-_display);
|
|
||||||
height: var(--ytmusic-menu-item_-_height);
|
|
||||||
align-items: var(--ytmusic-menu-item_-_align-items);
|
|
||||||
padding: var(--ytmusic-menu-item_-_padding);
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-item > .yt-simple-endpoint:hover {
|
|
||||||
background-color: var(--ytmusic-menu-item-hover-background-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-icon {
|
|
||||||
flex: var(--ytmusic-menu-item-icon_-_flex);
|
|
||||||
margin: var(--ytmusic-menu-item-icon_-_margin);
|
|
||||||
fill: var(--ytmusic-menu-item-icon_-_fill);
|
|
||||||
stroke: var(--iron-icon-stroke-color, none);
|
|
||||||
width: var(--iron-icon-width, 24px);
|
|
||||||
height: var(--iron-icon-height, 24px);
|
|
||||||
animation: var(--iron-icon_-_animation);
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
<div
|
|
||||||
class="style-scope menu-item ytmusic-menu-popup-renderer"
|
|
||||||
role="option"
|
|
||||||
tabindex="-1"
|
|
||||||
aria-disabled="false"
|
|
||||||
aria-selected="false"
|
|
||||||
onclick="download()"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="navigation-endpoint"
|
|
||||||
class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
tabindex="-1"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="icon menu-icon style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
focusable="false"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%"
|
|
||||||
>
|
|
||||||
<g class="style-scope yt-icon">
|
|
||||||
<path
|
|
||||||
d="M25.462,19.105v6.848H4.515v-6.848H0.489v8.861c0,1.111,0.9,2.012,2.016,2.012h24.967c1.115,0,2.016-0.9,2.016-2.012v-8.861H25.462z"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
fill="#aaaaaa"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
d="M14.62,18.426l-5.764-6.965c0,0-0.877-0.828,0.074-0.828s3.248,0,3.248,0s0-0.557,0-1.416c0-2.449,0-6.906,0-8.723c0,0-0.129-0.494,0.615-0.494c0.75,0,4.035,0,4.572,0c0.536,0,0.524,0.416,0.524,0.416c0,1.762,0,6.373,0,8.742c0,0.768,0,1.266,0,1.266s1.842,0,2.998,0c1.154,0,0.285,0.867,0.285,0.867s-4.904,6.51-5.588,7.193C15.092,18.979,14.62,18.426,14.62,18.426z"
|
|
||||||
class="style-scope yt-icon"
|
|
||||||
fill="#aaaaaa"
|
|
||||||
/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="text style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
id="ytmcustom-download"
|
|
||||||
>
|
|
||||||
Download
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
const { app } = require("electron");
|
|
||||||
const is = require('electron-is');
|
|
||||||
|
|
||||||
module.exports.getFolder = customFolder => customFolder || app.getPath("downloads");
|
|
||||||
module.exports.defaultMenuDownloadLabel = "Download playlist";
|
|
||||||
|
|
||||||
module.exports.sendFeedback = (win, message) => {
|
|
||||||
win.webContents.send("downloader-feedback", message);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.cropMaxWidth = (image) => {
|
|
||||||
const imageSize = image.getSize();
|
|
||||||
// standart youtube artwork width with margins from both sides is 280 + 720 + 280
|
|
||||||
if (imageSize.width === 1280 && imageSize.height === 720) {
|
|
||||||
return image.crop({
|
|
||||||
x: 280,
|
|
||||||
y: 0,
|
|
||||||
width: 720,
|
|
||||||
height: 720
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return image;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Presets for FFmpeg
|
|
||||||
module.exports.presets = {
|
|
||||||
"None (defaults to mp3)": undefined,
|
|
||||||
opus: {
|
|
||||||
extension: "opus",
|
|
||||||
ffmpegArgs: ["-acodec", "libopus"],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.setBadge = n => {
|
|
||||||
if (is.linux() || is.macOS()) {
|
|
||||||
app.setBadgeCount(n);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
// "Youtube Music fix volume ratio 0.4" by Marco Pfeiffer
|
|
||||||
// https://greasyfork.org/en/scripts/397686-youtube-music-fix-volume-ratio/
|
|
||||||
|
|
||||||
const exponentialVolume = () => {
|
|
||||||
// manipulation exponent, higher value = lower volume
|
|
||||||
// 3 is the value used by pulseaudio, which Barteks2x figured out this gist here: https://gist.github.com/Barteks2x/a4e189a36a10c159bb1644ffca21c02a
|
|
||||||
// 0.05 (or 5%) is the lowest you can select in the UI which with an exponent of 3 becomes 0.000125 or 0.0125%
|
|
||||||
const EXPONENT = 3;
|
|
||||||
|
|
||||||
const storedOriginalVolumes = new WeakMap();
|
|
||||||
const { get, set } = Object.getOwnPropertyDescriptor(
|
|
||||||
HTMLMediaElement.prototype,
|
|
||||||
"volume"
|
|
||||||
);
|
|
||||||
Object.defineProperty(HTMLMediaElement.prototype, "volume", {
|
|
||||||
get() {
|
|
||||||
const lowVolume = get.call(this);
|
|
||||||
const calculatedOriginalVolume = lowVolume ** (1 / EXPONENT);
|
|
||||||
|
|
||||||
// The calculated value has some accuracy issues which can lead to problems for implementations that expect exact values.
|
|
||||||
// To avoid this, I'll store the unmodified volume to return it when read here.
|
|
||||||
// This mostly solves the issue, but the initial read has no stored value and the volume can also change though external influences.
|
|
||||||
// To avoid ill effects, I check if the stored volume is somewhere in the same range as the calculated volume.
|
|
||||||
const storedOriginalVolume = storedOriginalVolumes.get(this);
|
|
||||||
const storedDeviation = Math.abs(
|
|
||||||
storedOriginalVolume - calculatedOriginalVolume
|
|
||||||
);
|
|
||||||
|
|
||||||
const originalVolume =
|
|
||||||
storedDeviation < 0.01
|
|
||||||
? storedOriginalVolume
|
|
||||||
: calculatedOriginalVolume;
|
|
||||||
return originalVolume;
|
|
||||||
},
|
|
||||||
set(originalVolume) {
|
|
||||||
const lowVolume = originalVolume ** EXPONENT;
|
|
||||||
storedOriginalVolumes.set(this, originalVolume);
|
|
||||||
set.call(this, lowVolume);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = () =>
|
|
||||||
document.addEventListener("apiLoaded", exponentialVolume, {
|
|
||||||
once: true,
|
|
||||||
passive: true,
|
|
||||||
});
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
|
|
||||||
const electronLocalshortcut = require("electron-localshortcut");
|
|
||||||
|
|
||||||
const { injectCSS } = require("../utils");
|
|
||||||
|
|
||||||
const { setupTitlebar, attachTitlebarToWindow } = require('custom-electron-titlebar/main');
|
|
||||||
setupTitlebar();
|
|
||||||
|
|
||||||
//tracks menu visibility
|
|
||||||
|
|
||||||
module.exports = (win) => {
|
|
||||||
// css for custom scrollbar + disable drag area(was causing bugs)
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
|
||||||
|
|
||||||
win.once("ready-to-show", () => {
|
|
||||||
attachTitlebarToWindow(win);
|
|
||||||
|
|
||||||
electronLocalshortcut.register(win, "`", () => {
|
|
||||||
win.webContents.send("toggleMenu");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
const config = require("../../config");
|
|
||||||
const { Titlebar, Color } = require("custom-electron-titlebar");
|
|
||||||
const { isEnabled } = require("../../config/plugins");
|
|
||||||
function $(selector) { return document.querySelector(selector); }
|
|
||||||
|
|
||||||
module.exports = (options) => {
|
|
||||||
let visible = () => !!$('.cet-menubar').firstChild;
|
|
||||||
const bar = new Titlebar({
|
|
||||||
icon: "https://cdn-icons-png.flaticon.com/512/5358/5358672.png",
|
|
||||||
backgroundColor: Color.fromHex("#050505"),
|
|
||||||
itemBackgroundColor: Color.fromHex("#1d1d1d"),
|
|
||||||
svgColor: Color.WHITE,
|
|
||||||
menu: config.get("options.hideMenu") ? null : undefined
|
|
||||||
});
|
|
||||||
bar.updateTitle(" ");
|
|
||||||
document.title = "Youtube Music";
|
|
||||||
|
|
||||||
const toggleMenu = () => {
|
|
||||||
if (visible()) {
|
|
||||||
bar.updateMenu(null);
|
|
||||||
} else {
|
|
||||||
bar.refreshMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
$('.cet-window-icon').addEventListener('click', toggleMenu);
|
|
||||||
ipcRenderer.on("toggleMenu", toggleMenu);
|
|
||||||
|
|
||||||
ipcRenderer.on("refreshMenu", () => {
|
|
||||||
if (visible()) {
|
|
||||||
bar.refreshMenu();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (isEnabled("picture-in-picture")) {
|
|
||||||
ipcRenderer.on("pip-toggle", (_, pipEnabled) => {
|
|
||||||
bar.refreshMenu();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Increases the right margin of Navbar background when the scrollbar is visible to avoid blocking it (z-index doesn't affect it)
|
|
||||||
document.addEventListener('apiLoaded', () => {
|
|
||||||
setNavbarMargin();
|
|
||||||
const playPageObserver = new MutationObserver(setNavbarMargin);
|
|
||||||
playPageObserver.observe($('ytmusic-app-layout'), { attributeFilter: ['player-page-open_', 'playerPageOpen_'] })
|
|
||||||
setupSearchOpenObserver();
|
|
||||||
setupMenuOpenObserver();
|
|
||||||
}, { once: true, passive: true })
|
|
||||||
};
|
|
||||||
|
|
||||||
function setupSearchOpenObserver() {
|
|
||||||
const searchOpenObserver = new MutationObserver(mutations => {
|
|
||||||
$('#nav-bar-background').style.webkitAppRegion =
|
|
||||||
mutations[0].target.opened ? 'no-drag' : 'drag';
|
|
||||||
});
|
|
||||||
searchOpenObserver.observe($('ytmusic-search-box'), { attributeFilter: ["opened"] })
|
|
||||||
}
|
|
||||||
|
|
||||||
function setupMenuOpenObserver() {
|
|
||||||
const menuOpenObserver = new MutationObserver(mutations => {
|
|
||||||
$('#nav-bar-background').style.webkitAppRegion =
|
|
||||||
Array.from($('.cet-menubar').childNodes).some(c => c.classList.contains('open')) ?
|
|
||||||
'no-drag' : 'drag';
|
|
||||||
});
|
|
||||||
menuOpenObserver.observe($('.cet-menubar'), { subtree: true, attributeFilter: ["class"] })
|
|
||||||
}
|
|
||||||
|
|
||||||
function setNavbarMargin() {
|
|
||||||
$('#nav-bar-background').style.right =
|
|
||||||
$('ytmusic-app-layout').playerPageOpen_ ?
|
|
||||||
'0px' :
|
|
||||||
'12px';
|
|
||||||
}
|
|
||||||
@ -1,111 +0,0 @@
|
|||||||
/* increase font size for menu and menuItems */
|
|
||||||
.titlebar,
|
|
||||||
.menubar-menu-container .action-label {
|
|
||||||
font-size: 14px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fixes nav-bar-background opacity bug, reposition it, and allows clicking scrollbar through it */
|
|
||||||
#nav-bar-background {
|
|
||||||
opacity: 1 !important;
|
|
||||||
pointer-events: none !important;
|
|
||||||
top: 30px !important;
|
|
||||||
height: 75px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fix top gap between nav-bar and browse-page */
|
|
||||||
#browse-page {
|
|
||||||
padding-top: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fix navbar hiding library items */
|
|
||||||
ytmusic-section-list-renderer[page-type="MUSIC_PAGE_TYPE_LIBRARY_CONTENT_LANDING_PAGE"],
|
|
||||||
ytmusic-section-list-renderer[page-type="MUSIC_PAGE_TYPE_PRIVATELY_OWNED_CONTENT_LANDING_PAGE"] {
|
|
||||||
top: 50px;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* remove window dragging for nav bar (conflict with titlebar drag) */
|
|
||||||
ytmusic-nav-bar,
|
|
||||||
.tab-titleiron-icon,
|
|
||||||
ytmusic-pivot-bar-item-renderer {
|
|
||||||
-webkit-app-region: unset !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* move up item selection renderers */
|
|
||||||
ytmusic-item-section-renderer.stuck #header.ytmusic-item-section-renderer,
|
|
||||||
ytmusic-tabs.stuck {
|
|
||||||
top: calc(var(--ytmusic-nav-bar-height) - 15px) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fix weird positioning in search screen*/
|
|
||||||
ytmusic-header-renderer.ytmusic-search-page {
|
|
||||||
position: unset !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Move navBar downwards */
|
|
||||||
ytmusic-nav-bar[slot="nav-bar"] {
|
|
||||||
top: 17px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fix page progress bar position*/
|
|
||||||
yt-page-navigation-progress,
|
|
||||||
#progress.yt-page-navigation-progress {
|
|
||||||
top: 30px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* custom scrollbar */
|
|
||||||
::-webkit-scrollbar {
|
|
||||||
width: 12px;
|
|
||||||
background-color: #030303;
|
|
||||||
border-radius: 100px;
|
|
||||||
-moz-border-radius: 100px;
|
|
||||||
-webkit-border-radius: 100px;
|
|
||||||
}
|
|
||||||
/* hover effect for both scrollbar area, and scrollbar 'thumb' */
|
|
||||||
::-webkit-scrollbar:hover {
|
|
||||||
background-color: rgba(15, 15, 15, 0.699);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* the scrollbar 'thumb' ...that marque oval shape in a scrollbar */
|
|
||||||
::-webkit-scrollbar-thumb:vertical {
|
|
||||||
border: 2px solid rgba(0, 0, 0, 0);
|
|
||||||
|
|
||||||
background: #3a3a3a;
|
|
||||||
background-clip: padding-box;
|
|
||||||
border-radius: 100px;
|
|
||||||
-moz-border-radius: 100px;
|
|
||||||
-webkit-border-radius: 100px;
|
|
||||||
}
|
|
||||||
::-webkit-scrollbar-thumb:vertical:active {
|
|
||||||
background: #4d4c4c; /* some darker color when you click it */
|
|
||||||
border-radius: 100px;
|
|
||||||
-moz-border-radius: 100px;
|
|
||||||
-webkit-border-radius: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cet-menubar-menu-container .cet-action-item {
|
|
||||||
background-color: inherit
|
|
||||||
}
|
|
||||||
|
|
||||||
/** hideMenu toggler **/
|
|
||||||
.cet-window-icon {
|
|
||||||
-webkit-app-region: no-drag;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cet-window-icon img {
|
|
||||||
-webkit-user-drag: none;
|
|
||||||
filter: invert(50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** make navbar draggable **/
|
|
||||||
#nav-bar-background {
|
|
||||||
-webkit-app-region: drag;
|
|
||||||
}
|
|
||||||
|
|
||||||
ytmusic-nav-bar input,
|
|
||||||
ytmusic-nav-bar span,
|
|
||||||
ytmusic-nav-bar [role="button"],
|
|
||||||
ytmusic-nav-bar yt-icon,
|
|
||||||
tp-yt-iron-dropdown {
|
|
||||||
-webkit-app-region: no-drag;
|
|
||||||
}
|
|
||||||
@ -1,161 +0,0 @@
|
|||||||
const fetch = require('node-fetch');
|
|
||||||
const md5 = require('md5');
|
|
||||||
const { shell } = require('electron');
|
|
||||||
const { setOptions } = require('../../config/plugins');
|
|
||||||
const registerCallback = require('../../providers/song-info');
|
|
||||||
const defaultConfig = require('../../config/defaults');
|
|
||||||
|
|
||||||
const createFormData = params => {
|
|
||||||
// creates the body for in the post request
|
|
||||||
const formData = new URLSearchParams();
|
|
||||||
for (const key in params) {
|
|
||||||
formData.append(key, params[key]);
|
|
||||||
}
|
|
||||||
return formData;
|
|
||||||
}
|
|
||||||
const createQueryString = (params, api_sig) => {
|
|
||||||
// creates a querystring
|
|
||||||
const queryData = [];
|
|
||||||
params.api_sig = api_sig;
|
|
||||||
for (const key in params) {
|
|
||||||
queryData.push(`${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`);
|
|
||||||
}
|
|
||||||
return '?'+queryData.join('&');
|
|
||||||
}
|
|
||||||
|
|
||||||
const createApiSig = (params, secret) => {
|
|
||||||
// this function creates the api signature, see: https://www.last.fm/api/authspec
|
|
||||||
const keys = [];
|
|
||||||
for (const key in params) {
|
|
||||||
keys.push(key);
|
|
||||||
}
|
|
||||||
keys.sort();
|
|
||||||
let sig = '';
|
|
||||||
for (const key of keys) {
|
|
||||||
if (String(key) === 'format')
|
|
||||||
continue
|
|
||||||
sig += `${key}${params[key]}`;
|
|
||||||
}
|
|
||||||
sig += secret;
|
|
||||||
sig = md5(sig);
|
|
||||||
return sig;
|
|
||||||
}
|
|
||||||
|
|
||||||
const createToken = async ({ api_key, api_root, secret }) => {
|
|
||||||
// creates and stores the auth token
|
|
||||||
const data = {
|
|
||||||
method: 'auth.gettoken',
|
|
||||||
api_key: api_key,
|
|
||||||
format: 'json'
|
|
||||||
};
|
|
||||||
const api_sig = createApiSig(data, secret);
|
|
||||||
let response = await fetch(`${api_root}${createQueryString(data, api_sig)}`);
|
|
||||||
response = await response.json();
|
|
||||||
return response?.token;
|
|
||||||
}
|
|
||||||
|
|
||||||
const authenticate = async config => {
|
|
||||||
// asks the user for authentication
|
|
||||||
config.token = await createToken(config);
|
|
||||||
setOptions('last-fm', config);
|
|
||||||
shell.openExternal(`https://www.last.fm/api/auth/?api_key=${config.api_key}&token=${config.token}`);
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
const getAndSetSessionKey = async config => {
|
|
||||||
// get and store the session key
|
|
||||||
const data = {
|
|
||||||
api_key: config.api_key,
|
|
||||||
format: 'json',
|
|
||||||
method: 'auth.getsession',
|
|
||||||
token: config.token,
|
|
||||||
};
|
|
||||||
const api_sig = createApiSig(data, config.secret);
|
|
||||||
let res = await fetch(`${config.api_root}${createQueryString(data, api_sig)}`);
|
|
||||||
res = await res.json();
|
|
||||||
if (res.error)
|
|
||||||
await authenticate(config);
|
|
||||||
config.session_key = res?.session?.key;
|
|
||||||
setOptions('last-fm', config);
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
const postSongDataToAPI = async (songInfo, config, data) => {
|
|
||||||
// this sends a post request to the api, and adds the common data
|
|
||||||
if (!config.session_key)
|
|
||||||
await getAndSetSessionKey(config);
|
|
||||||
|
|
||||||
const postData = {
|
|
||||||
track: songInfo.title,
|
|
||||||
duration: songInfo.songDuration,
|
|
||||||
artist: songInfo.artist,
|
|
||||||
...(songInfo.album ? { album: songInfo.album } : undefined), // will be undefined if current song is a video
|
|
||||||
api_key: config.api_key,
|
|
||||||
sk: config.session_key,
|
|
||||||
format: 'json',
|
|
||||||
...data,
|
|
||||||
};
|
|
||||||
|
|
||||||
postData.api_sig = createApiSig(postData, config.secret);
|
|
||||||
fetch('https://ws.audioscrobbler.com/2.0/', {method: 'POST', body: createFormData(postData)})
|
|
||||||
.catch(res => {
|
|
||||||
if (res.response.data.error == 9) {
|
|
||||||
// session key is invalid, so remove it from the config and reauthenticate
|
|
||||||
config.session_key = undefined;
|
|
||||||
setOptions('last-fm', config);
|
|
||||||
authenticate(config);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const addScrobble = (songInfo, config) => {
|
|
||||||
// this adds one scrobbled song to last.fm
|
|
||||||
const data = {
|
|
||||||
method: 'track.scrobble',
|
|
||||||
timestamp: ~~((Date.now() - songInfo.elapsedSeconds) / 1000),
|
|
||||||
};
|
|
||||||
postSongDataToAPI(songInfo, config, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
const setNowPlaying = (songInfo, config) => {
|
|
||||||
// this sets the now playing status in last.fm
|
|
||||||
const data = {
|
|
||||||
method: 'track.updateNowPlaying',
|
|
||||||
};
|
|
||||||
postSongDataToAPI(songInfo, config, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// this will store the timeout that will trigger addScrobble
|
|
||||||
let scrobbleTimer = undefined;
|
|
||||||
|
|
||||||
const lastfm = async (_win, config) => {
|
|
||||||
if (!config.api_root) {
|
|
||||||
// settings are not present, creating them with the default values
|
|
||||||
config = defaultConfig.plugins['last-fm'];
|
|
||||||
config.enabled = true;
|
|
||||||
setOptions('last-fm', config);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!config.session_key) {
|
|
||||||
// not authenticated
|
|
||||||
config = await getAndSetSessionKey(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
registerCallback( songInfo => {
|
|
||||||
// set remove the old scrobble timer
|
|
||||||
clearTimeout(scrobbleTimer);
|
|
||||||
if (!songInfo.isPaused) {
|
|
||||||
setNowPlaying(songInfo, config);
|
|
||||||
// scrobble when the song is half way through, or has passed the 4 minute mark
|
|
||||||
const scrobbleTime = Math.min(Math.ceil(songInfo.songDuration / 2), 4 * 60);
|
|
||||||
if (scrobbleTime > songInfo.elapsedSeconds) {
|
|
||||||
// scrobble still needs to happen
|
|
||||||
const timeToWait = (scrobbleTime - songInfo.elapsedSeconds) * 1000;
|
|
||||||
scrobbleTimer = setTimeout(addScrobble, timeToWait, songInfo, config);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = lastfm;
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
const { join } = require("path");
|
|
||||||
|
|
||||||
const { ipcMain } = require("electron");
|
|
||||||
const is = require("electron-is");
|
|
||||||
const { convert } = require("html-to-text");
|
|
||||||
const fetch = require("node-fetch");
|
|
||||||
|
|
||||||
const { cleanupName } = require("../../providers/song-info");
|
|
||||||
const { injectCSS } = require("../utils");
|
|
||||||
let eastAsianChars = /\p{Script=Han}|\p{Script=Katakana}|\p{Script=Hiragana}|\p{Script=Hangul}|\p{Script=Han}/u;
|
|
||||||
let revRomanized = false;
|
|
||||||
|
|
||||||
module.exports = async (win, options) => {
|
|
||||||
if(options.romanizedLyrics) {
|
|
||||||
revRomanized = true;
|
|
||||||
}
|
|
||||||
injectCSS(win.webContents, join(__dirname, "style.css"));
|
|
||||||
|
|
||||||
ipcMain.on("search-genius-lyrics", async (event, extractedSongInfo) => {
|
|
||||||
const metadata = JSON.parse(extractedSongInfo);
|
|
||||||
event.returnValue = await fetchFromGenius(metadata);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleRomanized = () => {
|
|
||||||
revRomanized = !revRomanized;
|
|
||||||
};
|
|
||||||
|
|
||||||
const fetchFromGenius = async (metadata) => {
|
|
||||||
const songTitle = `${cleanupName(metadata.title)}`;
|
|
||||||
const songArtist = `${cleanupName(metadata.artist)}`;
|
|
||||||
let lyrics;
|
|
||||||
|
|
||||||
/* Uses Regex to test the title and artist first for said characters if romanization is enabled. Otherwise normal
|
|
||||||
Genius Lyrics behavior is observed.
|
|
||||||
*/
|
|
||||||
let hasAsianChars = false;
|
|
||||||
if (revRomanized && (eastAsianChars.test(songTitle) || eastAsianChars.test(songArtist))) {
|
|
||||||
lyrics = await getLyricsList(`${songArtist} ${songTitle} Romanized`);
|
|
||||||
hasAsianChars = true;
|
|
||||||
} else {
|
|
||||||
lyrics = await getLyricsList(`${songArtist} ${songTitle}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If the romanization toggle is on, and we did not detect any characters in the title or artist, we do a check
|
|
||||||
for characters in the lyrics themselves. If this check proves true, we search for Romanized lyrics.
|
|
||||||
*/
|
|
||||||
if(revRomanized && !hasAsianChars && eastAsianChars.test(lyrics)) {
|
|
||||||
lyrics = await getLyricsList(`${songArtist} ${songTitle} Romanized`);
|
|
||||||
}
|
|
||||||
return lyrics;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches a JSON of songs which is then parsed and passed into getLyrics to get the lyrical content of the first song
|
|
||||||
* @param {*} queryString
|
|
||||||
* @returns The lyrics of the first song found using the Genius-Lyrics API
|
|
||||||
*/
|
|
||||||
const getLyricsList = async (queryString) => {
|
|
||||||
let response = await fetch(
|
|
||||||
`https://genius.com/api/search/multi?per_page=5&q=${encodeURIComponent(queryString)}`
|
|
||||||
);
|
|
||||||
if (!response.ok) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fetch the first URL with the api, giving a collection of song results.
|
|
||||||
Pick the first song, parsing the json given by the API.
|
|
||||||
*/
|
|
||||||
const info = await response.json();
|
|
||||||
let url = "";
|
|
||||||
try {
|
|
||||||
url = info.response.sections.filter((section) => section.type === "song")[0]
|
|
||||||
.hits[0].result.url;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
let lyrics = await getLyrics(url);
|
|
||||||
return lyrics;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param {*} url
|
|
||||||
* @returns The lyrics of the song URL provided, null if none
|
|
||||||
*/
|
|
||||||
const getLyrics = async (url) => {
|
|
||||||
response = await fetch(url);
|
|
||||||
if (!response.ok) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log("Fetching lyrics from Genius:", url);
|
|
||||||
}
|
|
||||||
const html = await response.text();
|
|
||||||
const lyrics = convert(html, {
|
|
||||||
baseElements: {
|
|
||||||
selectors: ['[class^="Lyrics__Container"]', ".lyrics"],
|
|
||||||
},
|
|
||||||
selectors: [
|
|
||||||
{
|
|
||||||
selector: "a",
|
|
||||||
format: "linkFormatter",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
formatters: {
|
|
||||||
// Remove links by keeping only the content
|
|
||||||
linkFormatter: (elem, walk, builder) => {
|
|
||||||
walk(elem.children, builder);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return lyrics;
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.toggleRomanized = toggleRomanized;
|
|
||||||
module.exports.fetchFromGenius = fetchFromGenius;
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
const is = require("electron-is");
|
|
||||||
|
|
||||||
module.exports = () => {
|
|
||||||
ipcRenderer.on("update-song-info", (_, extractedSongInfo) => setTimeout(() => {
|
|
||||||
const tabList = document.querySelectorAll("tp-yt-paper-tab");
|
|
||||||
const tabs = {
|
|
||||||
upNext: tabList[0],
|
|
||||||
lyrics: tabList[1],
|
|
||||||
discover: tabList[2],
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if disabled
|
|
||||||
if (!tabs.lyrics?.hasAttribute("disabled")) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let hasLyrics = true;
|
|
||||||
|
|
||||||
const lyrics = ipcRenderer.sendSync(
|
|
||||||
"search-genius-lyrics",
|
|
||||||
extractedSongInfo
|
|
||||||
);
|
|
||||||
if (!lyrics) {
|
|
||||||
// Delete previous lyrics if tab is open and couldn't get new lyrics
|
|
||||||
checkLyricsContainer(() => {
|
|
||||||
hasLyrics = false;
|
|
||||||
setTabsOnclick(undefined);
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is.dev()) {
|
|
||||||
console.log("Fetched lyrics from Genius");
|
|
||||||
}
|
|
||||||
|
|
||||||
enableLyricsTab();
|
|
||||||
|
|
||||||
setTabsOnclick(enableLyricsTab);
|
|
||||||
|
|
||||||
checkLyricsContainer();
|
|
||||||
|
|
||||||
tabs.lyrics.onclick = () => {
|
|
||||||
const tabContainer = document.querySelector("ytmusic-tab-renderer");
|
|
||||||
const observer = new MutationObserver((_, observer) => {
|
|
||||||
checkLyricsContainer(() => observer.disconnect());
|
|
||||||
});
|
|
||||||
observer.observe(tabContainer, {
|
|
||||||
attributes: true,
|
|
||||||
childList: true,
|
|
||||||
subtree: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
function checkLyricsContainer(callback = () => {}) {
|
|
||||||
const lyricsContainer = document.querySelector(
|
|
||||||
'[page-type="MUSIC_PAGE_TYPE_TRACK_LYRICS"] > ytmusic-message-renderer'
|
|
||||||
);
|
|
||||||
if (lyricsContainer) {
|
|
||||||
callback();
|
|
||||||
setLyrics(lyricsContainer)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setLyrics(lyricsContainer) {
|
|
||||||
lyricsContainer.innerHTML = `<div id="contents" class="style-scope ytmusic-section-list-renderer description ytmusic-description-shelf-renderer genius-lyrics">
|
|
||||||
${
|
|
||||||
hasLyrics
|
|
||||||
? lyrics.replace(/(?:\r\n|\r|\n)/g, "<br/>")
|
|
||||||
: "Could not retrieve lyrics from genius"
|
|
||||||
}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<yt-formatted-string class="footer style-scope ytmusic-description-shelf-renderer" style="align-self: baseline"></yt-formatted-string>`;
|
|
||||||
if (hasLyrics) {
|
|
||||||
lyricsContainer.querySelector('.footer').textContent = 'Source: Genius';
|
|
||||||
enableLyricsTab();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setTabsOnclick(callback) {
|
|
||||||
for (const tab of [tabs.upNext, tabs.discover]) {
|
|
||||||
if (tab) {
|
|
||||||
tab.onclick = callback;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function enableLyricsTab() {
|
|
||||||
tabs.lyrics.removeAttribute("disabled");
|
|
||||||
tabs.lyrics.removeAttribute("aria-disabled");
|
|
||||||
}
|
|
||||||
}, 500));
|
|
||||||
};
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
const { setOptions } = require("../../config/plugins");
|
|
||||||
const { toggleRomanized } = require("./back");
|
|
||||||
|
|
||||||
module.exports = (win, options, refreshMenu) => {
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
label: "Romanized Lyrics",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.romanizedLyrics,
|
|
||||||
click: (item) => {
|
|
||||||
options.romanizedLyrics = item.checked;
|
|
||||||
setOptions('lyrics-genius', options);
|
|
||||||
toggleRomanized();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
};
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
/* Disable links in Genius lyrics */
|
|
||||||
.genius-lyrics a {
|
|
||||||
color: var(--ytmusic-text-primary);
|
|
||||||
display: inline-block;
|
|
||||||
pointer-events: none;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.description {
|
|
||||||
font-size: clamp(1.4rem, 1.1vmax, 3rem) !important;
|
|
||||||
text-align: center !important;
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
const { triggerAction } = require("../utils");
|
|
||||||
|
|
||||||
const CHANNEL = "navigation";
|
|
||||||
const ACTIONS = {
|
|
||||||
NEXT: "next",
|
|
||||||
BACK: "back",
|
|
||||||
};
|
|
||||||
|
|
||||||
function goToNextPage() {
|
|
||||||
triggerAction(CHANNEL, ACTIONS.NEXT);
|
|
||||||
}
|
|
||||||
|
|
||||||
function goToPreviousPage() {
|
|
||||||
triggerAction(CHANNEL, ACTIONS.BACK);
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
CHANNEL: CHANNEL,
|
|
||||||
ACTIONS: ACTIONS,
|
|
||||||
actions: {
|
|
||||||
goToNextPage: goToNextPage,
|
|
||||||
goToPreviousPage: goToPreviousPage,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
|
|
||||||
const { injectCSS, listenAction } = require("../utils");
|
|
||||||
const { ACTIONS, CHANNEL } = require("./actions.js");
|
|
||||||
|
|
||||||
function handle(win) {
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"), () => {
|
|
||||||
win.webContents.send("navigation-css-ready");
|
|
||||||
});
|
|
||||||
|
|
||||||
listenAction(CHANNEL, (event, action) => {
|
|
||||||
switch (action) {
|
|
||||||
case ACTIONS.NEXT:
|
|
||||||
if (win.webContents.canGoForward()) {
|
|
||||||
win.webContents.goForward();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ACTIONS.BACK:
|
|
||||||
if (win.webContents.canGoBack()) {
|
|
||||||
win.webContents.goBack();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
console.log("Unknown action: " + action);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = handle;
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
const { ElementFromFile, templatePath } = require("../utils");
|
|
||||||
|
|
||||||
function run() {
|
|
||||||
ipcRenderer.on("navigation-css-ready", () => {
|
|
||||||
const forwardButton = ElementFromFile(
|
|
||||||
templatePath(__dirname, "forward.html")
|
|
||||||
);
|
|
||||||
const backButton = ElementFromFile(templatePath(__dirname, "back.html"));
|
|
||||||
const menu = document.querySelector("ytmusic-pivot-bar-renderer");
|
|
||||||
|
|
||||||
if (menu) {
|
|
||||||
menu.prepend(backButton, forwardButton);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = run;
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
.navigation-item {
|
|
||||||
font-family: Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
|
|
||||||
font-size: 20px;
|
|
||||||
line-height: var(--ytmusic-title-1_-_line-height);
|
|
||||||
font-weight: 500;
|
|
||||||
--yt-endpoint-color: #fff;
|
|
||||||
--yt-endpoint-hover-color: #fff;
|
|
||||||
--yt-endpoint-visited-color: #fff;
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
color: rgba(255, 255, 255, 0.5);
|
|
||||||
cursor: pointer;
|
|
||||||
margin: 0 var(--ytmusic-pivot-bar-tab-margin);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navigation-item:hover {
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navigation-icon {
|
|
||||||
display: inline-flex;
|
|
||||||
-ms-flex-align: center;
|
|
||||||
-webkit-align-items: center;
|
|
||||||
align-items: center;
|
|
||||||
-ms-flex-pack: center;
|
|
||||||
-webkit-justify-content: center;
|
|
||||||
justify-content: center;
|
|
||||||
position: relative;
|
|
||||||
vertical-align: middle;
|
|
||||||
fill: var(--iron-icon-fill-color, currentcolor);
|
|
||||||
stroke: none;
|
|
||||||
width: var(--iron-icon-width, 24px);
|
|
||||||
height: var(--iron-icon-height, 24px);
|
|
||||||
animation: var(--iron-icon_-_animation);
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
<div
|
|
||||||
class="style-scope ytmusic-pivot-bar-renderer navigation-item"
|
|
||||||
tab-id="FEmusic_back"
|
|
||||||
role="tab"
|
|
||||||
onclick="goToPreviousPage()"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="search-icon style-scope ytmusic-search-box"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
aria-disabled="false"
|
|
||||||
title="Go to previous page"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="icon"
|
|
||||||
class="tab-icon style-scope paper-icon-button navigation-icon"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 492 492"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
focusable="false"
|
|
||||||
class="style-scope iron-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%"
|
|
||||||
>
|
|
||||||
<g class="style-scope iron-icon">
|
|
||||||
<path
|
|
||||||
d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
|
|
||||||
></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
<div
|
|
||||||
class="style-scope ytmusic-pivot-bar-renderer navigation-item"
|
|
||||||
tab-id="FEmusic_next"
|
|
||||||
role="tab"
|
|
||||||
onclick="goToNextPage()"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="search-icon style-scope ytmusic-search-box"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
aria-disabled="false"
|
|
||||||
title="Go to next page"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="icon"
|
|
||||||
class="tab-icon style-scope paper-icon-button navigation-icon"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
viewBox="0 0 492 492"
|
|
||||||
preserveAspectRatio="xMidYMid meet"
|
|
||||||
focusable="false"
|
|
||||||
class="style-scope iron-icon"
|
|
||||||
style="pointer-events: none; display: block; width: 100%; height: 100%;"
|
|
||||||
>
|
|
||||||
<g class="style-scope iron-icon">
|
|
||||||
<path
|
|
||||||
d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
|
|
||||||
l183.9,183.9L109.3,430c-5.1,5.1-7.9,11.8-7.9,19c0,7.2,2.8,14,7.9,19l16.1,16.1c5.1,5.1,11.8,7.9,19,7.9s14-2.8,19-7.9L382.7,265
|
|
||||||
c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z"
|
|
||||||
></path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
const { injectCSS } = require("../utils");
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
module.exports = win => {
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
|
||||||
};
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
function removeLoginElements() {
|
|
||||||
const elementsToRemove = [
|
|
||||||
".sign-in-link.ytmusic-nav-bar",
|
|
||||||
'.ytmusic-pivot-bar-renderer[tab-id="FEmusic_liked"]'
|
|
||||||
];
|
|
||||||
|
|
||||||
elementsToRemove.forEach(selector => {
|
|
||||||
const node = document.querySelector(selector);
|
|
||||||
if (node) {
|
|
||||||
node.remove();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = removeLoginElements;
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
.ytmusic-pivot-bar-renderer[tab-id="FEmusic_liked"],
|
|
||||||
.sign-in-link {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
const { Notification } = require("electron");
|
|
||||||
const is = require("electron-is");
|
|
||||||
const registerCallback = require("../../providers/song-info");
|
|
||||||
const { notificationImage } = require("./utils");
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
const notify = (info) => {
|
|
||||||
|
|
||||||
// Fill the notification with content
|
|
||||||
const notification = {
|
|
||||||
title: info.title || "Playing",
|
|
||||||
body: info.artist,
|
|
||||||
icon: notificationImage(info),
|
|
||||||
silent: true,
|
|
||||||
urgency: config.get('urgency'),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Send the notification
|
|
||||||
const currentNotification = new Notification(notification);
|
|
||||||
currentNotification.show()
|
|
||||||
|
|
||||||
return currentNotification;
|
|
||||||
};
|
|
||||||
|
|
||||||
const setup = () => {
|
|
||||||
let oldNotification;
|
|
||||||
let currentUrl;
|
|
||||||
|
|
||||||
registerCallback(songInfo => {
|
|
||||||
if (!songInfo.isPaused && (songInfo.url !== currentUrl || config.get('unpauseNotification'))) {
|
|
||||||
// Close the old notification
|
|
||||||
oldNotification?.close();
|
|
||||||
currentUrl = songInfo.url;
|
|
||||||
// This fixes a weird bug that would cause the notification to be updated instead of showing
|
|
||||||
setTimeout(() => { oldNotification = notify(songInfo) }, 10);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @param {Electron.BrowserWindow} win */
|
|
||||||
module.exports = (win, options) => {
|
|
||||||
// Register the callback for new song information
|
|
||||||
is.windows() && options.interactive ?
|
|
||||||
require("./interactive")(win) :
|
|
||||||
setup();
|
|
||||||
};
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
const { PluginConfig } = require("../../config/dynamic");
|
|
||||||
|
|
||||||
const config = new PluginConfig("notifications");
|
|
||||||
|
|
||||||
module.exports = { ...config };
|
|
||||||
@ -1,235 +0,0 @@
|
|||||||
const { notificationImage, icons, save_temp_icons, secondsToMinutes, ToastStyles } = require("./utils");
|
|
||||||
const getSongControls = require('../../providers/song-controls');
|
|
||||||
const registerCallback = require("../../providers/song-info");
|
|
||||||
const { changeProtocolHandler } = require("../../providers/protocol-handler");
|
|
||||||
const { setTrayOnClick, setTrayOnDoubleClick } = require("../../tray");
|
|
||||||
|
|
||||||
const { Notification, app, ipcMain } = require("electron");
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
let songControls;
|
|
||||||
let savedNotification;
|
|
||||||
|
|
||||||
/** @param {Electron.BrowserWindow} win */
|
|
||||||
module.exports = (win) => {
|
|
||||||
songControls = getSongControls(win);
|
|
||||||
|
|
||||||
let currentSeconds = 0;
|
|
||||||
ipcMain.on('apiLoaded', () => win.webContents.send('setupTimeChangedListener'));
|
|
||||||
|
|
||||||
ipcMain.on('timeChanged', (_, t) => currentSeconds = t);
|
|
||||||
|
|
||||||
if (app.isPackaged) save_temp_icons();
|
|
||||||
|
|
||||||
let savedSongInfo;
|
|
||||||
let lastUrl;
|
|
||||||
|
|
||||||
// Register songInfoCallback
|
|
||||||
registerCallback(songInfo => {
|
|
||||||
if (!songInfo.artist && !songInfo.title) return;
|
|
||||||
savedSongInfo = { ...songInfo };
|
|
||||||
if (!songInfo.isPaused &&
|
|
||||||
(songInfo.url !== lastUrl || config.get("unpauseNotification"))
|
|
||||||
) {
|
|
||||||
lastUrl = songInfo.url
|
|
||||||
sendNotification(songInfo);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (config.get("trayControls")) {
|
|
||||||
setTrayOnClick(() => {
|
|
||||||
if (savedNotification) {
|
|
||||||
savedNotification.close();
|
|
||||||
savedNotification = undefined;
|
|
||||||
} else if (savedSongInfo) {
|
|
||||||
sendNotification({
|
|
||||||
...savedSongInfo,
|
|
||||||
elapsedSeconds: currentSeconds
|
|
||||||
})
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
setTrayOnDoubleClick(() => {
|
|
||||||
if (win.isVisible()) {
|
|
||||||
win.hide();
|
|
||||||
} else win.show();
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
app.once("before-quit", () => {
|
|
||||||
savedNotification?.close();
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
changeProtocolHandler(
|
|
||||||
(cmd) => {
|
|
||||||
if (Object.keys(songControls).includes(cmd)) {
|
|
||||||
songControls[cmd]();
|
|
||||||
if (config.get("refreshOnPlayPause") && (
|
|
||||||
cmd === 'pause' ||
|
|
||||||
(cmd === 'play' && !config.get("unpauseNotification"))
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
setImmediate(() =>
|
|
||||||
sendNotification({
|
|
||||||
...savedSongInfo,
|
|
||||||
isPaused: cmd === 'pause',
|
|
||||||
elapsedSeconds: currentSeconds
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function sendNotification(songInfo) {
|
|
||||||
const iconSrc = notificationImage(songInfo);
|
|
||||||
|
|
||||||
savedNotification?.close();
|
|
||||||
|
|
||||||
savedNotification = new Notification({
|
|
||||||
title: songInfo.title || "Playing",
|
|
||||||
body: songInfo.artist,
|
|
||||||
icon: iconSrc,
|
|
||||||
silent: true,
|
|
||||||
// https://learn.microsoft.com/en-us/uwp/schemas/tiles/toastschema/schema-root
|
|
||||||
// https://learn.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/toast-schema
|
|
||||||
// https://learn.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/adaptive-interactive-toasts?tabs=xml
|
|
||||||
// https://learn.microsoft.com/en-us/uwp/api/windows.ui.notifications.toasttemplatetype
|
|
||||||
toastXml: get_xml(songInfo, iconSrc),
|
|
||||||
});
|
|
||||||
|
|
||||||
savedNotification.on("close", (_) => {
|
|
||||||
savedNotification = undefined;
|
|
||||||
});
|
|
||||||
|
|
||||||
savedNotification.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
const get_xml = (songInfo, iconSrc) => {
|
|
||||||
switch (config.get("toastStyle")) {
|
|
||||||
default:
|
|
||||||
case ToastStyles.logo:
|
|
||||||
case ToastStyles.legacy:
|
|
||||||
return xml_logo(songInfo, iconSrc);
|
|
||||||
case ToastStyles.banner_top_custom:
|
|
||||||
return xml_banner_top_custom(songInfo, iconSrc);
|
|
||||||
case ToastStyles.hero:
|
|
||||||
return xml_hero(songInfo, iconSrc);
|
|
||||||
case ToastStyles.banner_bottom:
|
|
||||||
return xml_banner_bottom(songInfo, iconSrc);
|
|
||||||
case ToastStyles.banner_centered_bottom:
|
|
||||||
return xml_banner_centered_bottom(songInfo, iconSrc);
|
|
||||||
case ToastStyles.banner_centered_top:
|
|
||||||
return xml_banner_centered_top(songInfo, iconSrc);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const iconLocation = app.isPackaged ?
|
|
||||||
path.resolve(app.getPath("userData"), 'icons') :
|
|
||||||
path.resolve(__dirname, '..', '..', 'assets/media-icons-black');
|
|
||||||
|
|
||||||
const display = (kind) => {
|
|
||||||
if (config.get("toastStyle") === ToastStyles.legacy) {
|
|
||||||
return `content="${icons[kind]}"`;
|
|
||||||
} else {
|
|
||||||
return `\
|
|
||||||
content="${config.get("hideButtonText") ? "" : kind.charAt(0).toUpperCase() + kind.slice(1)}"\
|
|
||||||
imageUri="file:///${path.resolve(__dirname, iconLocation, `${kind}.png`)}"
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const getButton = (kind) =>
|
|
||||||
`<action ${display(kind)} activationType="protocol" arguments="youtubemusic://${kind}"/>`;
|
|
||||||
|
|
||||||
const getButtons = (isPaused) => `\
|
|
||||||
<actions>
|
|
||||||
${getButton('previous')}
|
|
||||||
${isPaused ? getButton('play') : getButton('pause')}
|
|
||||||
${getButton('next')}
|
|
||||||
</actions>\
|
|
||||||
`;
|
|
||||||
|
|
||||||
const toast = (content, isPaused) => `\
|
|
||||||
<toast>
|
|
||||||
<audio silent="true" />
|
|
||||||
<visual>
|
|
||||||
<binding template="ToastGeneric">
|
|
||||||
${content}
|
|
||||||
</binding>
|
|
||||||
</visual>
|
|
||||||
|
|
||||||
${getButtons(isPaused)}
|
|
||||||
</toast>`;
|
|
||||||
|
|
||||||
const xml_image = ({ title, artist, isPaused }, imgSrc, placement) => toast(`\
|
|
||||||
<image id="1" src="${imgSrc}" name="Image" ${placement}/>
|
|
||||||
<text id="1">${title}</text>
|
|
||||||
<text id="2">${artist}</text>\
|
|
||||||
`, isPaused);
|
|
||||||
|
|
||||||
|
|
||||||
const xml_logo = (songInfo, imgSrc) => xml_image(songInfo, imgSrc, 'placement="appLogoOverride"');
|
|
||||||
|
|
||||||
const xml_hero = (songInfo, imgSrc) => xml_image(songInfo, imgSrc, 'placement="hero"');
|
|
||||||
|
|
||||||
const xml_banner_bottom = (songInfo, imgSrc) => xml_image(songInfo, imgSrc, '');
|
|
||||||
|
|
||||||
const xml_banner_top_custom = (songInfo, imgSrc) => toast(`\
|
|
||||||
<image id="1" src="${imgSrc}" name="Image" />
|
|
||||||
<text>ㅤ</text>
|
|
||||||
<group>
|
|
||||||
<subgroup>
|
|
||||||
<text hint-style="body">${songInfo.title}</text>
|
|
||||||
<text hint-style="captionSubtle">${songInfo.artist}</text>
|
|
||||||
</subgroup>
|
|
||||||
${xml_more_data(songInfo)}
|
|
||||||
</group>\
|
|
||||||
`, songInfo.isPaused);
|
|
||||||
|
|
||||||
const xml_more_data = ({ album, elapsedSeconds, songDuration }) => `\
|
|
||||||
<subgroup hint-textStacking="bottom">
|
|
||||||
${album ?
|
|
||||||
`<text hint-style="captionSubtle" hint-wrap="true" hint-align="right">${album}</text>` : ''}
|
|
||||||
<text hint-style="captionSubtle" hint-wrap="true" hint-align="right">${secondsToMinutes(elapsedSeconds)} / ${secondsToMinutes(songDuration)}</text>
|
|
||||||
</subgroup>\
|
|
||||||
`;
|
|
||||||
|
|
||||||
const xml_banner_centered_bottom = ({ title, artist, isPaused }, imgSrc) => toast(`\
|
|
||||||
<text>ㅤ</text>
|
|
||||||
<group>
|
|
||||||
<subgroup hint-weight="1" hint-textStacking="center">
|
|
||||||
<text hint-align="center" hint-style="${titleFontPicker(title)}">${title}</text>
|
|
||||||
<text hint-align="center" hint-style="SubtitleSubtle">${artist}</text>
|
|
||||||
</subgroup>
|
|
||||||
</group>
|
|
||||||
<image id="1" src="${imgSrc}" name="Image" hint-removeMargin="true" />\
|
|
||||||
`, isPaused);
|
|
||||||
|
|
||||||
const xml_banner_centered_top = ({ title, artist, isPaused }, imgSrc) => toast(`\
|
|
||||||
<image id="1" src="${imgSrc}" name="Image" />
|
|
||||||
<text>ㅤ</text>
|
|
||||||
<group>
|
|
||||||
<subgroup hint-weight="1" hint-textStacking="center">
|
|
||||||
<text hint-align="center" hint-style="${titleFontPicker(title)}">${title}</text>
|
|
||||||
<text hint-align="center" hint-style="SubtitleSubtle">${artist}</text>
|
|
||||||
</subgroup>
|
|
||||||
</group>\
|
|
||||||
`, isPaused);
|
|
||||||
|
|
||||||
const titleFontPicker = (title) => {
|
|
||||||
if (title.length <= 13) {
|
|
||||||
return 'Header';
|
|
||||||
} else if (title.length <= 22) {
|
|
||||||
return 'Subheader';
|
|
||||||
} else if (title.length <= 26) {
|
|
||||||
return 'Title';
|
|
||||||
} else {
|
|
||||||
return 'Subtitle';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
const { urgencyLevels, ToastStyles, snakeToCamel } = require("./utils");
|
|
||||||
const is = require("electron-is");
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
module.exports = (_win, options) => [
|
|
||||||
...(is.linux()
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
label: "Notification Priority",
|
|
||||||
submenu: urgencyLevels.map((level) => ({
|
|
||||||
label: level.name,
|
|
||||||
type: "radio",
|
|
||||||
checked: options.urgency === level.value,
|
|
||||||
click: () => config.set("urgency", level.value),
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
...(is.windows()
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
label: "Interactive Notifications",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.interactive,
|
|
||||||
// doesn't update until restart
|
|
||||||
click: (item) => config.setAndMaybeRestart("interactive", item.checked),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
// submenu with settings for interactive notifications (name shouldn't be too long)
|
|
||||||
label: "Interactive Settings",
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Open/Close on tray click",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.trayControls,
|
|
||||||
click: (item) => config.set("trayControls", item.checked),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Hide Button Text",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.hideButtonText,
|
|
||||||
click: (item) => config.set("hideButtonText", item.checked),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Refresh on Play/Pause",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.refreshOnPlayPause,
|
|
||||||
click: (item) => config.set("refreshOnPlayPause", item.checked),
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Style",
|
|
||||||
submenu: getToastStyleMenuItems(options)
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
{
|
|
||||||
label: "Show notification on unpause",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.unpauseNotification,
|
|
||||||
click: (item) => config.set("unpauseNotification", item.checked),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
function getToastStyleMenuItems(options) {
|
|
||||||
const arr = new Array(Object.keys(ToastStyles).length);
|
|
||||||
|
|
||||||
// ToastStyles index starts from 1
|
|
||||||
for (const [name, index] of Object.entries(ToastStyles)) {
|
|
||||||
arr[index - 1] = {
|
|
||||||
label: snakeToCamel(name),
|
|
||||||
type: "radio",
|
|
||||||
checked: options.toastStyle === index,
|
|
||||||
click: () => config.set("toastStyle", index),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return arr;
|
|
||||||
}
|
|
||||||
@ -1,93 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
const { app } = require("electron");
|
|
||||||
const fs = require("fs");
|
|
||||||
const config = require("./config");
|
|
||||||
|
|
||||||
const icon = "assets/youtube-music.png";
|
|
||||||
const userData = app.getPath("userData");
|
|
||||||
const tempIcon = path.join(userData, "tempIcon.png");
|
|
||||||
const tempBanner = path.join(userData, "tempBanner.png");
|
|
||||||
|
|
||||||
const { cache } = require("../../providers/decorators")
|
|
||||||
|
|
||||||
module.exports.ToastStyles = {
|
|
||||||
logo: 1,
|
|
||||||
banner_centered_top: 2,
|
|
||||||
hero: 3,
|
|
||||||
banner_top_custom: 4,
|
|
||||||
banner_centered_bottom: 5,
|
|
||||||
banner_bottom: 6,
|
|
||||||
legacy: 7
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports.icons = {
|
|
||||||
play: "\u{1405}", // ᐅ
|
|
||||||
pause: "\u{2016}", // ‖
|
|
||||||
next: "\u{1433}", // ᐳ
|
|
||||||
previous: "\u{1438}" // ᐸ
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports.urgencyLevels = [
|
|
||||||
{ name: "Low", value: "low" },
|
|
||||||
{ name: "Normal", value: "normal" },
|
|
||||||
{ name: "High", value: "critical" },
|
|
||||||
];
|
|
||||||
|
|
||||||
const nativeImageToLogo = cache((nativeImage) => {
|
|
||||||
const tempImage = nativeImage.resize({ height: 256 });
|
|
||||||
const margin = Math.max(tempImage.getSize().width - 256, 0);
|
|
||||||
|
|
||||||
return tempImage.crop({
|
|
||||||
x: Math.round(margin / 2),
|
|
||||||
y: 0,
|
|
||||||
width: 256,
|
|
||||||
height: 256,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports.notificationImage = (songInfo) => {
|
|
||||||
if (!songInfo.image) return icon;
|
|
||||||
if (!config.get("interactive")) return nativeImageToLogo(songInfo.image);
|
|
||||||
|
|
||||||
switch (config.get("toastStyle")) {
|
|
||||||
case module.exports.ToastStyles.logo:
|
|
||||||
case module.exports.ToastStyles.legacy:
|
|
||||||
return this.saveImage(nativeImageToLogo(songInfo.image), tempIcon);
|
|
||||||
default:
|
|
||||||
return this.saveImage(songInfo.image, tempBanner);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.saveImage = cache((img, save_path) => {
|
|
||||||
try {
|
|
||||||
fs.writeFileSync(save_path, img.toPNG());
|
|
||||||
} catch (err) {
|
|
||||||
console.log(`Error writing song icon to disk:\n${err.toString()}`)
|
|
||||||
return icon;
|
|
||||||
}
|
|
||||||
return save_path;
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports.save_temp_icons = () => {
|
|
||||||
for (const kind of Object.keys(module.exports.icons)) {
|
|
||||||
const destinationPath = path.join(userData, 'icons', `${kind}.png`);
|
|
||||||
if (fs.existsSync(destinationPath)) continue;
|
|
||||||
const iconPath = path.resolve(__dirname, "../../assets/media-icons-black", `${kind}.png`);
|
|
||||||
fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
|
|
||||||
fs.copyFile(iconPath, destinationPath, () => { });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.snakeToCamel = (str) => {
|
|
||||||
return str.replace(/([-_][a-z]|^[a-z])/g, (group) =>
|
|
||||||
group.toUpperCase()
|
|
||||||
.replace('-', ' ')
|
|
||||||
.replace('_', ' ')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports.secondsToMinutes = (seconds) => {
|
|
||||||
const minutes = Math.floor(seconds / 60);
|
|
||||||
const secondsLeft = seconds % 60;
|
|
||||||
return `${minutes}:${secondsLeft < 10 ? '0' : ''}${secondsLeft}`;
|
|
||||||
}
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
const path = require("path");
|
|
||||||
|
|
||||||
const { app, ipcMain } = require("electron");
|
|
||||||
const electronLocalshortcut = require("electron-localshortcut");
|
|
||||||
|
|
||||||
const { setOptions } = require("../../config/plugins");
|
|
||||||
const { injectCSS } = require("../utils");
|
|
||||||
|
|
||||||
let isInPiP = false;
|
|
||||||
let originalPosition;
|
|
||||||
let originalSize;
|
|
||||||
let originalFullScreen;
|
|
||||||
let originalMaximized;
|
|
||||||
|
|
||||||
let win;
|
|
||||||
let options;
|
|
||||||
|
|
||||||
const pipPosition = () => (options.savePosition && options["pip-position"]) || [10, 10];
|
|
||||||
const pipSize = () => (options.saveSize && options["pip-size"]) || [450, 275];
|
|
||||||
|
|
||||||
const setLocalOptions = (_options) => {
|
|
||||||
options = { ...options, ..._options };
|
|
||||||
setOptions("picture-in-picture", _options);
|
|
||||||
}
|
|
||||||
|
|
||||||
const togglePiP = async () => {
|
|
||||||
isInPiP = !isInPiP;
|
|
||||||
setLocalOptions({ isInPiP });
|
|
||||||
|
|
||||||
if (isInPiP) {
|
|
||||||
originalFullScreen = win.isFullScreen();
|
|
||||||
if (originalFullScreen) win.setFullScreen(false);
|
|
||||||
originalMaximized = win.isMaximized();
|
|
||||||
if (originalMaximized) win.unmaximize();
|
|
||||||
|
|
||||||
originalPosition = win.getPosition();
|
|
||||||
originalSize = win.getSize();
|
|
||||||
|
|
||||||
win.webContents.on("before-input-event", blockShortcutsInPiP);
|
|
||||||
|
|
||||||
win.setMaximizable(false);
|
|
||||||
win.setFullScreenable(false);
|
|
||||||
|
|
||||||
win.webContents.send("pip-toggle", true);
|
|
||||||
|
|
||||||
app.dock?.hide();
|
|
||||||
win.setVisibleOnAllWorkspaces(true, {
|
|
||||||
visibleOnFullScreen: true,
|
|
||||||
});
|
|
||||||
app.dock?.show();
|
|
||||||
if (options.alwaysOnTop) {
|
|
||||||
win.setAlwaysOnTop(true, "screen-saver", 1);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
win.webContents.removeListener("before-input-event", blockShortcutsInPiP);
|
|
||||||
win.setMaximizable(true);
|
|
||||||
win.setFullScreenable(true);
|
|
||||||
|
|
||||||
win.webContents.send("pip-toggle", false);
|
|
||||||
|
|
||||||
win.setVisibleOnAllWorkspaces(false);
|
|
||||||
win.setAlwaysOnTop(false);
|
|
||||||
|
|
||||||
if (originalFullScreen) win.setFullScreen(true);
|
|
||||||
if (originalMaximized) win.maximize();
|
|
||||||
}
|
|
||||||
|
|
||||||
const [x, y] = isInPiP ? pipPosition() : originalPosition;
|
|
||||||
const [w, h] = isInPiP ? pipSize() : originalSize;
|
|
||||||
win.setPosition(x, y);
|
|
||||||
win.setSize(w, h);
|
|
||||||
|
|
||||||
win.setWindowButtonVisibility?.(!isInPiP);
|
|
||||||
};
|
|
||||||
|
|
||||||
const blockShortcutsInPiP = (event, input) => {
|
|
||||||
const key = input.key.toLowerCase();
|
|
||||||
|
|
||||||
if (key === "f") {
|
|
||||||
event.preventDefault();
|
|
||||||
} else if (key === 'escape') {
|
|
||||||
togglePiP();
|
|
||||||
event.preventDefault();
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = (_win, _options) => {
|
|
||||||
options ??= _options;
|
|
||||||
win ??= _win;
|
|
||||||
setLocalOptions({ isInPiP });
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "style.css"));
|
|
||||||
ipcMain.on("picture-in-picture", async () => {
|
|
||||||
await togglePiP();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.setOptions = setLocalOptions;
|
|
||||||
@ -1,140 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
const { toKeyEvent } = require("keyboardevent-from-electron-accelerator");
|
|
||||||
const keyEventAreEqual = require("keyboardevents-areequal");
|
|
||||||
|
|
||||||
const { getSongMenu } = require("../../providers/dom-elements");
|
|
||||||
const { ElementFromFile, templatePath } = require("../utils");
|
|
||||||
|
|
||||||
function $(selector) { return document.querySelector(selector); }
|
|
||||||
|
|
||||||
let useNativePiP = false;
|
|
||||||
let menu = null;
|
|
||||||
const pipButton = ElementFromFile(
|
|
||||||
templatePath(__dirname, "picture-in-picture.html")
|
|
||||||
);
|
|
||||||
|
|
||||||
// will also clone
|
|
||||||
function replaceButton(query, button) {
|
|
||||||
const svg = button.querySelector("#icon svg").cloneNode(true);
|
|
||||||
button.replaceWith(button.cloneNode(true));
|
|
||||||
button.remove();
|
|
||||||
const newButton = $(query);
|
|
||||||
newButton.querySelector("#icon").appendChild(svg);
|
|
||||||
return newButton;
|
|
||||||
}
|
|
||||||
|
|
||||||
function cloneButton(query) {
|
|
||||||
replaceButton(query, $(query));
|
|
||||||
return $(query);
|
|
||||||
}
|
|
||||||
|
|
||||||
const observer = new MutationObserver(() => {
|
|
||||||
if (!menu) {
|
|
||||||
menu = getSongMenu();
|
|
||||||
if (!menu) return;
|
|
||||||
}
|
|
||||||
if (menu.contains(pipButton) || !menu.parentElement.eventSink_?.matches('ytmusic-menu-renderer.ytmusic-player-bar')) return;
|
|
||||||
const menuUrl = $(
|
|
||||||
'tp-yt-paper-listbox [tabindex="0"] #navigation-endpoint'
|
|
||||||
)?.href;
|
|
||||||
if (menuUrl && !menuUrl.includes("watch?")) return;
|
|
||||||
|
|
||||||
menu.prepend(pipButton);
|
|
||||||
});
|
|
||||||
|
|
||||||
global.togglePictureInPicture = async () => {
|
|
||||||
if (useNativePiP) {
|
|
||||||
const isInPiP = document.pictureInPictureElement !== null;
|
|
||||||
const video = $("video");
|
|
||||||
const togglePiP = () =>
|
|
||||||
isInPiP
|
|
||||||
? document.exitPictureInPicture.call(document)
|
|
||||||
: video.requestPictureInPicture.call(video);
|
|
||||||
|
|
||||||
try {
|
|
||||||
await togglePiP();
|
|
||||||
$("#icon").click(); // Close the menu
|
|
||||||
return true;
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
ipcRenderer.send("picture-in-picture");
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const listenForToggle = () => {
|
|
||||||
const originalExitButton = $(".exit-fullscreen-button");
|
|
||||||
const appLayout = $("ytmusic-app-layout");
|
|
||||||
const expandMenu = $('#expanding-menu');
|
|
||||||
const middleControls = $('.middle-controls');
|
|
||||||
const playerPage = $("ytmusic-player-page");
|
|
||||||
const togglePlayerPageButton = $(".toggle-player-page-button");
|
|
||||||
const fullScreenButton = $(".fullscreen-button");
|
|
||||||
const player = $('#player');
|
|
||||||
const onPlayerDblClick = player.onDoubleClick_;
|
|
||||||
|
|
||||||
const titlebar = $(".cet-titlebar");
|
|
||||||
|
|
||||||
ipcRenderer.on("pip-toggle", (_, isPip) => {
|
|
||||||
if (isPip) {
|
|
||||||
replaceButton(".exit-fullscreen-button", originalExitButton).onclick =
|
|
||||||
() => togglePictureInPicture();
|
|
||||||
player.onDoubleClick_ = () => {};
|
|
||||||
expandMenu.onmouseleave = () => middleControls.click();
|
|
||||||
if (!playerPage.playerPageOpen_) {
|
|
||||||
togglePlayerPageButton.click();
|
|
||||||
}
|
|
||||||
fullScreenButton.click();
|
|
||||||
appLayout.classList.add("pip");
|
|
||||||
if (titlebar) titlebar.style.display = "none";
|
|
||||||
} else {
|
|
||||||
$(".exit-fullscreen-button").replaceWith(originalExitButton);
|
|
||||||
player.onDoubleClick_ = onPlayerDblClick;
|
|
||||||
expandMenu.onmouseleave = undefined;
|
|
||||||
originalExitButton.click();
|
|
||||||
appLayout.classList.remove("pip");
|
|
||||||
if (titlebar) titlebar.style.display = "flex";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function observeMenu(options) {
|
|
||||||
useNativePiP = options.useNativePiP;
|
|
||||||
document.addEventListener(
|
|
||||||
"apiLoaded",
|
|
||||||
() => {
|
|
||||||
listenForToggle();
|
|
||||||
|
|
||||||
cloneButton(".player-minimize-button").onclick = async () => {
|
|
||||||
await global.togglePictureInPicture();
|
|
||||||
setTimeout(() => $("#player").click());
|
|
||||||
};
|
|
||||||
|
|
||||||
// allows easily closing the menu by programmatically clicking outside of it
|
|
||||||
$("#expanding-menu").removeAttribute("no-cancel-on-outside-click");
|
|
||||||
// TODO: think about wether an additional button in songMenu is needed
|
|
||||||
observer.observe($("ytmusic-popup-container"), {
|
|
||||||
childList: true,
|
|
||||||
subtree: true,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{ once: true, passive: true }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = (options) => {
|
|
||||||
observeMenu(options);
|
|
||||||
|
|
||||||
if (options.hotkey) {
|
|
||||||
const hotkeyEvent = toKeyEvent(options.hotkey);
|
|
||||||
window.addEventListener("keydown", (event) => {
|
|
||||||
if (
|
|
||||||
keyEventAreEqual(event, hotkeyEvent) &&
|
|
||||||
!$("ytmusic-search-box").opened
|
|
||||||
) {
|
|
||||||
togglePictureInPicture();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
|
|
||||||
const promptOptions = require("../../providers/prompt-options");
|
|
||||||
const { setOptions } = require("./back.js");
|
|
||||||
|
|
||||||
module.exports = (win, options) => [
|
|
||||||
{
|
|
||||||
label: "Always on top",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.alwaysOnTop,
|
|
||||||
click: (item) => {
|
|
||||||
setOptions({ alwaysOnTop: item.checked });
|
|
||||||
win.setAlwaysOnTop(item.checked);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Save window position",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.savePosition,
|
|
||||||
click: (item) => {
|
|
||||||
setOptions({ savePosition: item.checked });
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Save window size",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.saveSize,
|
|
||||||
click: (item) => {
|
|
||||||
setOptions({ saveSize: item.checked });
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Hotkey",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.hotkey,
|
|
||||||
click: async (item) => {
|
|
||||||
const output = await prompt({
|
|
||||||
title: "Picture in Picture Hotkey",
|
|
||||||
label: "Choose a hotkey for toggling Picture in Picture",
|
|
||||||
type: "keybind",
|
|
||||||
keybindOptions: [{
|
|
||||||
value: "hotkey",
|
|
||||||
label: "Hotkey",
|
|
||||||
default: options.hotkey
|
|
||||||
}],
|
|
||||||
...promptOptions()
|
|
||||||
}, win)
|
|
||||||
|
|
||||||
if (output) {
|
|
||||||
const { value, accelerator } = output[0];
|
|
||||||
setOptions({ [value]: accelerator });
|
|
||||||
|
|
||||||
item.checked = !!accelerator;
|
|
||||||
} else {
|
|
||||||
// Reset checkbox if prompt was canceled
|
|
||||||
item.checked = !item.checked;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Use native PiP",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: options.useNativePiP,
|
|
||||||
click: (item) => {
|
|
||||||
setOptions({ useNativePiP: item.checked });
|
|
||||||
},
|
|
||||||
}
|
|
||||||
];
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
<div
|
|
||||||
class="style-scope menu-item ytmusic-menu-popup-renderer"
|
|
||||||
role="option"
|
|
||||||
tabindex="-1"
|
|
||||||
aria-disabled="false"
|
|
||||||
aria-selected="false"
|
|
||||||
onclick="togglePictureInPicture()"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="navigation-endpoint"
|
|
||||||
class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
tabindex="-1"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="icon menu-icon style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
version="1.1"
|
|
||||||
id="Layer_1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
x="0px"
|
|
||||||
y="0px"
|
|
||||||
viewBox="0 0 512 512"
|
|
||||||
style="enable-background: new 0 0 512 512"
|
|
||||||
xml:space="preserve"
|
|
||||||
>
|
|
||||||
<style type="text/css">
|
|
||||||
.st0 {
|
|
||||||
fill: #aaaaaa;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<g id="XMLID_6_">
|
|
||||||
<path
|
|
||||||
id="XMLID_11_"
|
|
||||||
class="st0"
|
|
||||||
d="M418.5,139.4H232.4v139.8h186.1V139.4z M464.8,46.7H46.3C20.5,46.7,0,68.1,0,93.1v325.9
|
|
||||||
c0,25.8,21.4,46.3,46.3,46.3h419.4c25.8,0,46.3-20.5,46.3-46.3V93.1C512,67.2,490.6,46.7,464.8,46.7z M464.8,418.9H46.3V92.2h419.4
|
|
||||||
v326.8H464.8z"
|
|
||||||
/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="text style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
id="ytmcustom-pip"
|
|
||||||
>
|
|
||||||
Picture in picture
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
const { getSongMenu } = require("../../providers/dom-elements");
|
|
||||||
const { ElementFromFile, templatePath } = require("../utils");
|
|
||||||
const { singleton } = require("../../providers/decorators")
|
|
||||||
|
|
||||||
function $(selector) { return document.querySelector(selector); }
|
|
||||||
|
|
||||||
const slider = ElementFromFile(templatePath(__dirname, "slider.html"));
|
|
||||||
|
|
||||||
const roundToTwo = n => Math.round(n * 1e2) / 1e2;
|
|
||||||
|
|
||||||
const MIN_PLAYBACK_SPEED = 0.07;
|
|
||||||
const MAX_PLAYBACK_SPEED = 16;
|
|
||||||
|
|
||||||
let playbackSpeed = 1;
|
|
||||||
|
|
||||||
const updatePlayBackSpeed = () => {
|
|
||||||
$('video').playbackRate = playbackSpeed;
|
|
||||||
|
|
||||||
const playbackSpeedElement = $("#playback-speed-value");
|
|
||||||
if (playbackSpeedElement) {
|
|
||||||
playbackSpeedElement.innerHTML = playbackSpeed;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let menu;
|
|
||||||
|
|
||||||
const setupSliderListener = singleton(() => {
|
|
||||||
$('#playback-speed-slider').addEventListener('immediate-value-changed', e => {
|
|
||||||
playbackSpeed = e.detail.value || MIN_PLAYBACK_SPEED;
|
|
||||||
if (isNaN(playbackSpeed)) {
|
|
||||||
playbackSpeed = 1;
|
|
||||||
}
|
|
||||||
updatePlayBackSpeed();
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
const observePopupContainer = () => {
|
|
||||||
const observer = new MutationObserver(() => {
|
|
||||||
if (!menu) {
|
|
||||||
menu = getSongMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (menu && menu.parentElement.eventSink_?.matches('ytmusic-menu-renderer.ytmusic-player-bar') && !menu.contains(slider)) {
|
|
||||||
menu.prepend(slider);
|
|
||||||
setupSliderListener();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
observer.observe($('ytmusic-popup-container'), {
|
|
||||||
childList: true,
|
|
||||||
subtree: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const observeVideo = () => {
|
|
||||||
$('video').addEventListener('ratechange', forcePlaybackRate)
|
|
||||||
$('video').addEventListener('srcChanged', forcePlaybackRate)
|
|
||||||
}
|
|
||||||
|
|
||||||
const setupWheelListener = () => {
|
|
||||||
slider.addEventListener('wheel', e => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (isNaN(playbackSpeed)) {
|
|
||||||
playbackSpeed = 1;
|
|
||||||
}
|
|
||||||
// e.deltaY < 0 means wheel-up
|
|
||||||
playbackSpeed = roundToTwo(e.deltaY < 0 ?
|
|
||||||
Math.min(playbackSpeed + 0.01, MAX_PLAYBACK_SPEED) :
|
|
||||||
Math.max(playbackSpeed - 0.01, MIN_PLAYBACK_SPEED)
|
|
||||||
);
|
|
||||||
|
|
||||||
updatePlayBackSpeed();
|
|
||||||
// update slider position
|
|
||||||
$('#playback-speed-slider').value = playbackSpeed;
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function forcePlaybackRate(e) {
|
|
||||||
if (e.target.playbackRate !== playbackSpeed) {
|
|
||||||
e.target.playbackRate = playbackSpeed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = () => {
|
|
||||||
document.addEventListener('apiLoaded', () => {
|
|
||||||
observePopupContainer();
|
|
||||||
observeVideo();
|
|
||||||
setupWheelListener();
|
|
||||||
}, { once: true, passive: true })
|
|
||||||
};
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
<div
|
|
||||||
class="style-scope menu-item ytmusic-menu-popup-renderer"
|
|
||||||
role="option"
|
|
||||||
tabindex="-1"
|
|
||||||
aria-disabled="false"
|
|
||||||
aria-selected="false"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="navigation-endpoint"
|
|
||||||
class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
tabindex="-1"
|
|
||||||
>
|
|
||||||
<tp-yt-paper-slider
|
|
||||||
id="playback-speed-slider"
|
|
||||||
class="volume-slider style-scope ytmusic-player-bar on-hover"
|
|
||||||
style="display: inherit !important"
|
|
||||||
max="2"
|
|
||||||
min="0"
|
|
||||||
step="0.125"
|
|
||||||
dir="ltr"
|
|
||||||
title="Playback speed"
|
|
||||||
aria-label="Playback speed"
|
|
||||||
role="slider"
|
|
||||||
tabindex="0"
|
|
||||||
aria-valuemin="0"
|
|
||||||
aria-valuemax="2"
|
|
||||||
aria-valuenow="1"
|
|
||||||
aria-disabled="false"
|
|
||||||
value="1"
|
|
||||||
><!--css-build:shady-->
|
|
||||||
<div id="sliderContainer" class="style-scope tp-yt-paper-slider">
|
|
||||||
<div class="bar-container style-scope tp-yt-paper-slider">
|
|
||||||
<tp-yt-paper-progress
|
|
||||||
id="sliderBar"
|
|
||||||
aria-hidden="true"
|
|
||||||
class="style-scope tp-yt-paper-slider"
|
|
||||||
role="progressbar"
|
|
||||||
value="1"
|
|
||||||
aria-valuenow="1"
|
|
||||||
aria-valuemin="0"
|
|
||||||
aria-valuemax="2"
|
|
||||||
aria-disabled="false"
|
|
||||||
style="touch-action: none"
|
|
||||||
><!--css-build:shady-->
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="progressContainer"
|
|
||||||
class="style-scope tp-yt-paper-progress"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="secondaryProgress"
|
|
||||||
class="style-scope tp-yt-paper-progress"
|
|
||||||
hidden="true"
|
|
||||||
style="transform: scaleX(0)"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
id="primaryProgress"
|
|
||||||
class="style-scope tp-yt-paper-progress"
|
|
||||||
style="transform: scaleX(0.5)"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</tp-yt-paper-progress>
|
|
||||||
</div>
|
|
||||||
<dom-if class="style-scope tp-yt-paper-slider"
|
|
||||||
><template is="dom-if"></template
|
|
||||||
></dom-if>
|
|
||||||
<div
|
|
||||||
id="sliderKnob"
|
|
||||||
class="slider-knob style-scope tp-yt-paper-slider"
|
|
||||||
style="left: 50%; touch-action: none"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="slider-knob-inner style-scope tp-yt-paper-slider"
|
|
||||||
value="1"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<dom-if class="style-scope tp-yt-paper-slider"
|
|
||||||
><template is="dom-if"></template></dom-if
|
|
||||||
></tp-yt-paper-slider>
|
|
||||||
<div
|
|
||||||
class="text style-scope ytmusic-menu-navigation-item-renderer"
|
|
||||||
id="ytmcustom-playback-speed"
|
|
||||||
>
|
|
||||||
Speed (<span id="playback-speed-value">1</span>)
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
const { injectCSS } = require("../utils");
|
|
||||||
const path = require("path");
|
|
||||||
|
|
||||||
/*
|
|
||||||
This is used to determine if plugin is actually active
|
|
||||||
(not if its only enabled in options)
|
|
||||||
*/
|
|
||||||
let enabled = false;
|
|
||||||
|
|
||||||
const { globalShortcut } = require('electron');
|
|
||||||
|
|
||||||
module.exports = (win, options) => {
|
|
||||||
enabled = true;
|
|
||||||
injectCSS(win.webContents, path.join(__dirname, "volume-hud.css"));
|
|
||||||
|
|
||||||
if (options.globalShortcuts?.volumeUp) {
|
|
||||||
globalShortcut.register((options.globalShortcuts.volumeUp), () => win.webContents.send('changeVolume', true));
|
|
||||||
}
|
|
||||||
if (options.globalShortcuts?.volumeDown) {
|
|
||||||
globalShortcut.register((options.globalShortcuts.volumeDown), () => win.webContents.send('changeVolume', false));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports.enabled = () => enabled;
|
|
||||||
@ -1,232 +0,0 @@
|
|||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
const { setOptions, setMenuOptions, isEnabled } = require("../../config/plugins");
|
|
||||||
|
|
||||||
function $(selector) { return document.querySelector(selector); }
|
|
||||||
|
|
||||||
const { debounce } = require("../../providers/decorators");
|
|
||||||
|
|
||||||
let api, options;
|
|
||||||
|
|
||||||
module.exports = (_options) => {
|
|
||||||
options = _options;
|
|
||||||
document.addEventListener('apiLoaded', e => {
|
|
||||||
api = e.detail;
|
|
||||||
ipcRenderer.on('changeVolume', (_, toIncrease) => changeVolume(toIncrease));
|
|
||||||
ipcRenderer.on('setVolume', (_, value) => setVolume(value));
|
|
||||||
firstRun();
|
|
||||||
}, { once: true, passive: true })
|
|
||||||
};
|
|
||||||
|
|
||||||
//without this function it would rewrite config 20 time when volume change by 20
|
|
||||||
const writeOptions = debounce(() => {
|
|
||||||
setOptions("precise-volume", options);
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
module.exports.moveVolumeHud = debounce((showVideo) => {
|
|
||||||
const volumeHud = $("#volumeHud");
|
|
||||||
if (!volumeHud) return;
|
|
||||||
volumeHud.style.top = showVideo
|
|
||||||
? `${($("ytmusic-player").clientHeight - $("video").clientHeight) / 2}px`
|
|
||||||
: 0;
|
|
||||||
}, 250);
|
|
||||||
|
|
||||||
const hideVolumeHud = debounce((volumeHud) => {
|
|
||||||
volumeHud.style.opacity = 0;
|
|
||||||
}, 2000);
|
|
||||||
|
|
||||||
const hideVolumeSlider = debounce((slider) => {
|
|
||||||
slider.classList.remove("on-hover");
|
|
||||||
}, 2500);
|
|
||||||
|
|
||||||
|
|
||||||
/** Restore saved volume and setup tooltip */
|
|
||||||
function firstRun() {
|
|
||||||
if (typeof options.savedVolume === "number") {
|
|
||||||
// Set saved volume as tooltip
|
|
||||||
setTooltip(options.savedVolume);
|
|
||||||
|
|
||||||
if (api.getVolume() !== options.savedVolume) {
|
|
||||||
api.setVolume(options.savedVolume);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setupPlaybar();
|
|
||||||
|
|
||||||
setupLocalArrowShortcuts();
|
|
||||||
|
|
||||||
const noVid = $("#main-panel")?.computedStyleMap().get("display").value === "none";
|
|
||||||
injectVolumeHud(noVid);
|
|
||||||
if (!noVid) {
|
|
||||||
setupVideoPlayerOnwheel();
|
|
||||||
if (!isEnabled('video-toggle')) {
|
|
||||||
//video-toggle handles hud positioning on its own
|
|
||||||
const videoMode = () => api.getPlayerResponse().videoDetails?.musicVideoType !== 'MUSIC_VIDEO_TYPE_ATV';
|
|
||||||
$("video").addEventListener("srcChanged", () => moveVolumeHud(videoMode()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Change options from renderer to keep sync
|
|
||||||
ipcRenderer.on("setOptions", (_event, newOptions = {}) => {
|
|
||||||
Object.assign(options, newOptions)
|
|
||||||
setMenuOptions("precise-volume", options);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function injectVolumeHud(noVid) {
|
|
||||||
if (noVid) {
|
|
||||||
const position = "top: 18px; right: 60px;";
|
|
||||||
const mainStyle = "font-size: xx-large;";
|
|
||||||
|
|
||||||
$(".center-content.ytmusic-nav-bar").insertAdjacentHTML("beforeend",
|
|
||||||
`<span id="volumeHud" style="${position + mainStyle}"></span>`)
|
|
||||||
} else {
|
|
||||||
const position = `top: 10px; left: 10px;`;
|
|
||||||
const mainStyle = "font-size: xxx-large; webkit-text-stroke: 1px black; font-weight: 600;";
|
|
||||||
|
|
||||||
$("#song-video").insertAdjacentHTML('afterend',
|
|
||||||
`<span id="volumeHud" style="${position + mainStyle}"></span>`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function showVolumeHud(volume) {
|
|
||||||
const volumeHud = $("#volumeHud");
|
|
||||||
if (!volumeHud) return;
|
|
||||||
|
|
||||||
volumeHud.textContent = `${volume}%`;
|
|
||||||
volumeHud.style.opacity = 1;
|
|
||||||
|
|
||||||
hideVolumeHud(volumeHud);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Add onwheel event to video player */
|
|
||||||
function setupVideoPlayerOnwheel() {
|
|
||||||
$("#main-panel").addEventListener("wheel", event => {
|
|
||||||
event.preventDefault();
|
|
||||||
// Event.deltaY < 0 means wheel-up
|
|
||||||
changeVolume(event.deltaY < 0);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function saveVolume(volume) {
|
|
||||||
options.savedVolume = volume;
|
|
||||||
writeOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Add onwheel event to play bar and also track if play bar is hovered*/
|
|
||||||
function setupPlaybar() {
|
|
||||||
const playerbar = $("ytmusic-player-bar");
|
|
||||||
|
|
||||||
playerbar.addEventListener("wheel", event => {
|
|
||||||
event.preventDefault();
|
|
||||||
// Event.deltaY < 0 means wheel-up
|
|
||||||
changeVolume(event.deltaY < 0);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Keep track of mouse position for showVolumeSlider()
|
|
||||||
playerbar.addEventListener("mouseenter", () => {
|
|
||||||
playerbar.classList.add("on-hover");
|
|
||||||
});
|
|
||||||
|
|
||||||
playerbar.addEventListener("mouseleave", () => {
|
|
||||||
playerbar.classList.remove("on-hover");
|
|
||||||
});
|
|
||||||
|
|
||||||
setupSliderObserver();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Save volume + Update the volume tooltip when volume-slider is manually changed */
|
|
||||||
function setupSliderObserver() {
|
|
||||||
const sliderObserver = new MutationObserver(mutations => {
|
|
||||||
for (const mutation of mutations) {
|
|
||||||
// This checks that volume-slider was manually set
|
|
||||||
if (mutation.oldValue !== mutation.target.value &&
|
|
||||||
(typeof options.savedVolume !== "number" || Math.abs(options.savedVolume - mutation.target.value) > 4)) {
|
|
||||||
// Diff>4 means it was manually set
|
|
||||||
setTooltip(mutation.target.value);
|
|
||||||
saveVolume(mutation.target.value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Observing only changes in 'value' of volume-slider
|
|
||||||
sliderObserver.observe($("#volume-slider"), {
|
|
||||||
attributeFilter: ["value"],
|
|
||||||
attributeOldValue: true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function setVolume(value) {
|
|
||||||
api.setVolume(value);
|
|
||||||
// Save the new volume
|
|
||||||
saveVolume(value);
|
|
||||||
|
|
||||||
// change slider position (important)
|
|
||||||
updateVolumeSlider();
|
|
||||||
|
|
||||||
// Change tooltips to new value
|
|
||||||
setTooltip(value);
|
|
||||||
// Show volume slider
|
|
||||||
showVolumeSlider();
|
|
||||||
// Show volume HUD
|
|
||||||
showVolumeHud(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** if (toIncrease = false) then volume decrease */
|
|
||||||
function changeVolume(toIncrease) {
|
|
||||||
// Apply volume change if valid
|
|
||||||
const steps = Number(options.steps || 1);
|
|
||||||
setVolume(toIncrease ?
|
|
||||||
Math.min(api.getVolume() + steps, 100) :
|
|
||||||
Math.max(api.getVolume() - steps, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateVolumeSlider() {
|
|
||||||
// Slider value automatically rounds to multiples of 5
|
|
||||||
for (const slider of ["#volume-slider", "#expand-volume-slider"]) {
|
|
||||||
$(slider).value =
|
|
||||||
options.savedVolume > 0 && options.savedVolume < 5
|
|
||||||
? 5
|
|
||||||
: options.savedVolume;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function showVolumeSlider() {
|
|
||||||
const slider = $("#volume-slider");
|
|
||||||
// This class display the volume slider if not in minimized mode
|
|
||||||
slider.classList.add("on-hover");
|
|
||||||
|
|
||||||
hideVolumeSlider(slider);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set new volume as tooltip for volume slider and icon + expanding slider (appears when window size is small)
|
|
||||||
const tooltipTargets = [
|
|
||||||
"#volume-slider",
|
|
||||||
"tp-yt-paper-icon-button.volume",
|
|
||||||
"#expand-volume-slider",
|
|
||||||
"#expand-volume"
|
|
||||||
];
|
|
||||||
|
|
||||||
function setTooltip(volume) {
|
|
||||||
for (target of tooltipTargets) {
|
|
||||||
$(target).title = `${volume}%`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setupLocalArrowShortcuts() {
|
|
||||||
if (options.arrowsShortcut) {
|
|
||||||
window.addEventListener('keydown', (event) => {
|
|
||||||
if ($('ytmusic-search-box').opened) return;
|
|
||||||
switch (event.code) {
|
|
||||||
case "ArrowUp":
|
|
||||||
event.preventDefault();
|
|
||||||
changeVolume(true);
|
|
||||||
break;
|
|
||||||
case "ArrowDown":
|
|
||||||
event.preventDefault();
|
|
||||||
changeVolume(false);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
const { enabled } = require("./back");
|
|
||||||
const { setMenuOptions } = require("../../config/plugins");
|
|
||||||
const prompt = require("custom-electron-prompt");
|
|
||||||
const promptOptions = require("../../providers/prompt-options");
|
|
||||||
|
|
||||||
function changeOptions(changedOptions, options, win) {
|
|
||||||
for (option in changedOptions) {
|
|
||||||
options[option] = changedOptions[option];
|
|
||||||
}
|
|
||||||
// Dynamically change setting if plugin is enabled
|
|
||||||
if (enabled()) {
|
|
||||||
win.webContents.send("setOptions", changedOptions);
|
|
||||||
} else { // Fallback to usual method if disabled
|
|
||||||
setMenuOptions("precise-volume", options);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = (win, options) => [
|
|
||||||
{
|
|
||||||
label: "Local Arrowkeys Controls",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: !!options.arrowsShortcut,
|
|
||||||
click: item => {
|
|
||||||
changeOptions({ arrowsShortcut: item.checked }, options, win);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Global Hotkeys",
|
|
||||||
type: "checkbox",
|
|
||||||
checked: !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown,
|
|
||||||
click: item => promptGlobalShortcuts(win, options, item)
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Set Custom Volume Steps",
|
|
||||||
click: () => promptVolumeSteps(win, options)
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
// Helper function for globalShortcuts prompt
|
|
||||||
const kb = (label_, value_, default_) => { return { value: value_, label: label_, default: default_ || undefined }; };
|
|
||||||
|
|
||||||
async function promptVolumeSteps(win, options) {
|
|
||||||
const output = await prompt({
|
|
||||||
title: "Volume Steps",
|
|
||||||
label: "Choose Volume Increase/Decrease Steps",
|
|
||||||
value: options.steps || 1,
|
|
||||||
type: "counter",
|
|
||||||
counterOptions: { minimum: 0, maximum: 100, multiFire: true },
|
|
||||||
width: 380,
|
|
||||||
...promptOptions()
|
|
||||||
}, win)
|
|
||||||
|
|
||||||
if (output || output === 0) { // 0 is somewhat valid
|
|
||||||
changeOptions({ steps: output}, options, win);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function promptGlobalShortcuts(win, options, item) {
|
|
||||||
const output = await prompt({
|
|
||||||
title: "Global Volume Keybinds",
|
|
||||||
label: "Choose Global Volume Keybinds:",
|
|
||||||
type: "keybind",
|
|
||||||
keybindOptions: [
|
|
||||||
kb("Increase Volume", "volumeUp", options.globalShortcuts?.volumeUp),
|
|
||||||
kb("Decrease Volume", "volumeDown", options.globalShortcuts?.volumeDown)
|
|
||||||
],
|
|
||||||
...promptOptions()
|
|
||||||
}, win)
|
|
||||||
|
|
||||||
if (output) {
|
|
||||||
let newGlobalShortcuts = {};
|
|
||||||
for (const { value, accelerator } of output) {
|
|
||||||
newGlobalShortcuts[value] = accelerator;
|
|
||||||
}
|
|
||||||
changeOptions({ globalShortcuts: newGlobalShortcuts }, options, win);
|
|
||||||
|
|
||||||
item.checked = !!options.globalShortcuts.volumeUp || !!options.globalShortcuts.volumeDown;
|
|
||||||
} else {
|
|
||||||
// Reset checkbox if prompt was canceled
|
|
||||||
item.checked = !item.checked;
|
|
||||||
}
|
|
||||||
}
|
|
||||||