diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index ddeeffb..2dc00ea 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -23,11 +23,11 @@ jobs: Send tracks and albums from Tidal directly to Tidarr for download. ### Installation - 1. Open **TidalLuna** - 2. Go to **Settings → Plugins** - 3. Click **"Install from URL"** - 4. Paste this URL: - ``` - https://github.com/DevonCasey/tidal-luna-plugins/releases/download/latest-dev/store.json - ``` - latest_tag: latest-dev + 1. Open **TidaLuna** + 2. Go to **Settings → Plugins** + 3. Click **"Install from URL"** + 4. Paste this URL: + ``` + https://github.com/DevonCasey/tidaluna-plugins/releases/download/latest-dev/store.json + ``` + latest_tag: latest-dev diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml index f12890f..b252868 100644 --- a/.github/workflows/prod-release.yml +++ b/.github/workflows/prod-release.yml @@ -45,12 +45,12 @@ jobs: Send tracks and albums from Tidal directly to Tidarr for download. ### Installation - 1. Open **TidalLuna** - 2. Go to **Settings → Plugins** - 3. Click **"Install from URL"** - 4. Paste this URL: - ``` - https://github.com/DevonCasey/tidal-luna-plugins/releases/download/latest/store.json - ``` - latest_tag: latest + 1. Open **TidaLuna** + 2. Go to **Settings → Plugins** + 3. Click **"Install from URL"** + 4. Paste this URL: + ``` + https://github.com/DevonCasey/tidaluna-plugins/releases/download/latest/store.json + ``` + latest_tag: latest diff --git a/README.md b/README.md index 76f5ef5..92d0eee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# TidalLuna Plugins +# TidaLuna Plugins -A collection of TidalLuna plugins. Well, the one plugin. +A collection of TidaLuna plugins. Well, the one plugin. ## Tidarr Integration @@ -12,7 +12,7 @@ Right-click on any track or album in Tidal and send it to Tidarr for download. S ### Requirements -- [TidalLuna](https://github.com/Inrixia/TidaLuna) installed +- [TidaLuna](https://github.com/Inrixia/TidaLuna) installed - [Tidarr](https://github.com/cstaelen/tidarr) is accessible somewhere on your network - An active Tidal subscription @@ -20,10 +20,10 @@ Right-click on any track or album in Tidal and send it to Tidarr for download. S This will add this repo as a source for plugins that will appear in the store to download. -1. Open Tidal with TidalLuna +1. Open Tidal with TidaLuna 2. Go to **Settings** > **Plugins** 3. Click **Install from URL** -4. Paste: `https://github.com/DevonCasey/tidal-luna-plugins/releases/download/latest/store.json` +4. Paste: `https://github.com/DevonCasey/tidaluna-plugins/releases/download/latest/store.json` Navigate to the **Plugin Store** and download away! @@ -72,8 +72,8 @@ curl -X GET "$TIDARR_URL/api/is_auth_active" For local development: ```bash -git clone https://github.com/DevonCasey/tidal-luna-plugins.git -cd tidal-luna-plugins +git clone https://github.com/DevonCasey/tidaluna-plugins.git +cd tidaluna-plugins corepack enable corepack prepare pnpm@latest --activate pnpm install @@ -85,5 +85,3 @@ The local repo will then appear in the **Plugin Store**, select what you want to ## Credits - Lovingly inspired by the SongDownloader plugin written by [Inrixia](https://github.com/Inrixia/luna-plugins/tree/master/plugins/SongDownloader) - -Built for [TidalLuna](https://github.com/Inrixia/TidaLuna) and [Tidarr](https://github.com/cstaelen/tidarr). \ No newline at end of file diff --git a/package.json b/package.json index 4dfd9e9..7d26dfe 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { - "name": "@devoncasey/tidalluna-plugins", - "description": "A collection of plugins for TidalLuna.", + "name": "@devoncasey/tidaluna-plugins", + "description": "A collection of plugins for TidaLuna.", "author": { - "name": "Devon Casey", - "url": "https://github.com/DevonCasey", - "avatarUrl": "https://0.gravatar.com/avatar/4f20153247cc8c6c0868d779e8a8ae0593bb9641880886280281f7de135edc9f" - }, - "repository": { + "name": "Devon Casey", + "url": "https://github.com/DevonCasey", + "avatarUrl": "https://0.gravatar.com/avatar/4f20153247cc8c6c0868d779e8a8ae0593bb9641880886280281f7de135edc9f" + }, + "repository": { "type": "git", - "url": "https://github.com/DevonCasey/TidalLuna-Plugins.git" + "url": "https://github.com/DevonCasey/tidaluna-plugins.git" }, "type": "module", "scripts": { @@ -22,10 +22,12 @@ "@types/react-dom": "^19.1.5", "concurrently": "^9.1.2", "http-server": "^14.1.1", - "luna": "github:Inrixia/TidaLuna#81369c7", "oby": "^15.1.2", "rimraf": "^6.0.1", "tsx": "^4.19.4", "typescript": "^5.8.3" + }, + "dependencies": { + "luna": "github:Inrixia/TidaLuna#81369c7" } } diff --git a/plugins/tidarr-integration/package.json b/plugins/tidarr-integration/package.json index b04e9a9..52fe1ae 100644 --- a/plugins/tidarr-integration/package.json +++ b/plugins/tidarr-integration/package.json @@ -1,9 +1,9 @@ { "name": "tidarr-integration", - "description": "Sends tracks and albums to Tidarr for download right from TidalLuna.", - "version": "1.0.5", + "description": "Sends tracks and albums to Tidarr for download right from TidaLuna.", + "version": "1.0.6", "license": "MIT", - "homepage": "https://github.com/DevonCasey/tidal-luna-plugins#tidarr-integration", + "homepage": "https://github.com/DevonCasey/tidaluna-plugins#tidarr-integration", "author": { "name": "Devon Casey", "url": "https://github.com/DevonCasey", diff --git a/plugins/tidarr-integration/src/Settings.tsx b/plugins/tidarr-integration/src/Settings.tsx index 2c9c583..115ba4e 100644 --- a/plugins/tidarr-integration/src/Settings.tsx +++ b/plugins/tidarr-integration/src/Settings.tsx @@ -54,11 +54,11 @@ export const Settings = () => { setTestResult(null); try { - const isAuthActiveRes = await ftch.json(`${tidarrUrl}/api/is_auth_active`) as IsAuthActiveResponse; + const isAuthActiveRes = await ftch.json<{ isAuthActive: boolean }>(`${tidarrUrl}/api/is_auth_active`); const isAuthActive = isAuthActiveRes?.isAuthActive ?? false; if (isAuthActive) { - const authResponse = await ftch.json(`${tidarrUrl}/api/auth`, { + const authResponse = await ftch.json<{ token?: string }>(`${tidarrUrl}/api/auth`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ password: adminPassword || "" }), @@ -92,6 +92,7 @@ export const Settings = () => { setTidarrUrl(newValue); settings.tidarrUrl = newValue; }} + style={{ maxWidth: "500px", marginLeft: "auto" }} /> { setAdminPassword(newValue); settings.adminPassword = newValue; }} + style={{ maxWidth: "200px", marginLeft: "auto" }} /> { setDownloadQuality(newValue); settings.downloadQuality = newValue; }} + style={{ maxWidth: "100px", marginLeft: "auto" }} > Low Normal @@ -125,10 +128,12 @@ export const Settings = () => { { - setDebugMode(checked); - settings.debugMode = checked; + // currently commented out due to typing issues in TidaLuna + // checked={debugMode} + {...({ checked: debugMode } as any)} + onChange={(_event: React.ChangeEvent, nextChecked: boolean) => { + setDebugMode(nextChecked); + settings.debugMode = nextChecked; }} /> diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ae95b06..b018958 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,10 @@ settings: importers: .: + dependencies: + luna: + specifier: github:Inrixia/TidaLuna#81369c7 + version: https://codeload.github.com/Inrixia/TidaLuna/tar.gz/81369c7 devDependencies: '@types/node': specifier: ^22.15.29 @@ -23,9 +27,6 @@ importers: http-server: specifier: ^14.1.1 version: 14.1.1 - luna: - specifier: github:Inrixia/TidaLuna#81369c7 - version: https://codeload.github.com/Inrixia/TidaLuna/tar.gz/81369c7 oby: specifier: ^15.1.2 version: 15.1.2 @@ -193,33 +194,28 @@ packages: cpu: [x64] os: [win32] - '@inrixia/helpers@3.20.0': - resolution: {integrity: sha512-RkWZ8ZIdB3cpQvTcLsY3A8ux+4Q8PNZU0uDKJT2xVMAP0FvCsLNSJemRz9vlDalWBDkBhI9v0O/br3cF9vPnWw==} + '@inrixia/helpers@3.20.3': + resolution: {integrity: sha512-VG0rW2AHZUhkBVX+utGl83b0gAtMy5b6DOc/+R3+9unzrUqdXbPWpMWsCQbF6xHPAVrR4sZ+S8N+fiS67XWicg==} '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} - '@jridgewell/gen-mapping@0.3.8': - resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} - engines: {node: '>=6.0.0'} + '@jridgewell/gen-mapping@0.3.13': + resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} '@jridgewell/resolve-uri@3.1.2': resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - '@jridgewell/set-array@1.2.1': - resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} - engines: {node: '>=6.0.0'} + '@jridgewell/source-map@0.3.11': + resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==} - '@jridgewell/source-map@0.3.6': - resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} + '@jridgewell/sourcemap-codec@1.5.5': + resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} - '@jridgewell/sourcemap-codec@1.5.0': - resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@jridgewell/trace-mapping@0.3.31': + resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} '@types/clean-css@4.2.11': resolution: {integrity: sha512-Y8n81lQVTAfP2TOdtJJEsCoYl1AnOkqDqMvXb9/7pfgZZ7r8YrEyurrAvAoAjHOGXKRybay+5CsExqIH6liccw==} @@ -238,8 +234,8 @@ packages: '@types/react@19.1.6': resolution: {integrity: sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==} - acorn@8.14.1: - resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} + acorn@8.15.0: + resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} engines: {node: '>=0.4.0'} hasBin: true @@ -649,8 +645,8 @@ packages: resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} engines: {node: '>=10'} - terser@5.40.0: - resolution: {integrity: sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==} + terser@5.44.1: + resolution: {integrity: sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==} engines: {node: '>=10'} hasBin: true @@ -787,7 +783,7 @@ snapshots: '@esbuild/win32-x64@0.25.5': optional: true - '@inrixia/helpers@3.20.0': + '@inrixia/helpers@3.20.3': dependencies: dequal: 2.0.3 @@ -800,27 +796,24 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 - '@jridgewell/gen-mapping@0.3.8': + '@jridgewell/gen-mapping@0.3.13': dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/resolve-uri@3.1.2': {} - '@jridgewell/set-array@1.2.1': {} - - '@jridgewell/source-map@0.3.6': + '@jridgewell/source-map@0.3.11': dependencies: - '@jridgewell/gen-mapping': 0.3.8 - '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 - '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/sourcemap-codec@1.5.5': {} - '@jridgewell/trace-mapping@0.3.25': + '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/sourcemap-codec': 1.5.5 '@types/clean-css@4.2.11': dependencies: @@ -841,7 +834,7 @@ snapshots: dependencies: csstype: 3.1.3 - acorn@8.14.1: {} + acorn@8.15.0: {} ansi-regex@5.0.1: {} @@ -1061,7 +1054,7 @@ snapshots: entities: 4.5.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.40.0 + terser: 5.44.1 http-proxy@1.18.1: dependencies: @@ -1112,7 +1105,7 @@ snapshots: luna@https://codeload.github.com/Inrixia/TidaLuna/tar.gz/81369c7: dependencies: - '@inrixia/helpers': 3.20.0 + '@inrixia/helpers': 3.20.3 '@types/clean-css': 4.2.11 '@types/html-minifier-terser': 7.0.2 '@types/node': 22.15.29 @@ -1271,10 +1264,10 @@ snapshots: dependencies: has-flag: 4.0.0 - terser@5.40.0: + terser@5.44.1: dependencies: - '@jridgewell/source-map': 0.3.6 - acorn: 8.14.1 + '@jridgewell/source-map': 0.3.11 + acorn: 8.15.0 commander: 2.20.3 source-map-support: 0.5.21