diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8867573..732dfb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ env: DOTNET_CLI_TELEMETRY_OPTOUT: true PLUGIN_NAME: Lidarr.Plugin.Deemix PLUGIN_VERSION: 1.0.0.${{ github.run_number }} - MINIMUM_LIDARR_VERSION: 1.2.0.3183 + MINIMUM_LIDARR_VERSION: 1.3.5.3499 DOTNET_VERSION: 6.0.408 jobs: @@ -39,11 +39,14 @@ jobs: - name: Create global.json run: | echo '{"sdk":{"version": "${{ env.DOTNET_VERSION }}"}}' > ./global.json + - name: Generate metadata + id: gen_meta + run: | + echo "branch=${GITHUB_REF#refs/heads/}" | tr '/' '-' >> $GITHUB_OUTPUT - name: Update Version Info run: | - echo $PLUGIN_VERSION sed -i'' -e "s/[0-9.*]\+<\/AssemblyVersion>/$PLUGIN_VERSION<\/AssemblyVersion>/g" src/Directory.Build.props - sed -i'' -e "s/[\$()A-Za-z-]\+<\/AssemblyConfiguration>/${GITHUB_REF#refs/heads/}<\/AssemblyConfiguration>/g" src/Directory.Build.props + sed -i'' -e "s/[\$()A-Za-z-]\+<\/AssemblyConfiguration>/${{ steps.gen_meta.outputs.branch }}<\/AssemblyConfiguration>/g" src/Directory.Build.props sed -i'' -e "s/[0-9.*]\+<\/AssemblyVersion>/$MINIMUM_LIDARR_VERSION<\/AssemblyVersion>/g" src/Lidarr/src/Directory.Build.props - name: Build run: dotnet publish src/*.sln -c Release -f ${{ matrix.framework }} diff --git a/src/Lidarr b/src/Lidarr index 41ae98c..09b65f7 160000 --- a/src/Lidarr +++ b/src/Lidarr @@ -1 +1 @@ -Subproject commit 41ae98c46be8f62f47f1542f93711dba424f9912 +Subproject commit 09b65f7d037f0a89f8be1d25a57df5c113b0ffe0 diff --git a/src/Lidarr.Plugin.Deemix/Download/Clients/Deemix/Deemix.cs b/src/Lidarr.Plugin.Deemix/Download/Clients/Deemix/Deemix.cs index 0df1c13..19f2af5 100644 --- a/src/Lidarr.Plugin.Deemix/Download/Clients/Deemix/Deemix.cs +++ b/src/Lidarr.Plugin.Deemix/Download/Clients/Deemix/Deemix.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using FluentValidation.Results; using NLog; using NzbDrone.Common.Disk; @@ -54,7 +55,7 @@ public override void RemoveItem(DownloadClientItem item, bool deleteData) _proxy.RemoveFromQueue(item.DownloadId, Settings); } - public override string Download(RemoteAlbum remoteAlbum, IIndexer indexer) + public override Task Download(RemoteAlbum remoteAlbum, IIndexer indexer) { var release = remoteAlbum.Release; @@ -73,7 +74,7 @@ public override string Download(RemoteAlbum remoteAlbum, IIndexer indexer) bitrate = 1; } - return _proxy.Download(release.DownloadUrl, bitrate, Settings); + return Task.FromResult(_proxy.Download(release.DownloadUrl, bitrate, Settings)); } public override DownloadClientInfo GetStatus()