allow shared plex servers (#1391)

* allow shared plex servers

* update dependencies

CHANGELOG.md

@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - This can be configured using the following env vars (note the double underscore separator `__`)
     - `PROVIDER` - set to `MySql`
     - `MYSQL__CONNECTIONSTRING` - (e.g. `Server=localhost;Database=ErsatzTV;Uid=root;Pwd=ersatztv;`)
+- Add option to use shared Plex servers, not just owned servers
+  - This can be enabled by setting the env var `ETV_ALLOW_SHARED_PLEX_SERVERS` to any non-empty value
 
 ### Fixed
 - Fix subtitle scaling when using QSV hardware acceleration

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -16,7 +16,7 @@
       <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
       <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
       <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj

@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj

@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Dapper" Version="2.0.143" />
+      <PackageReference Include="Dapper" Version="2.0.151" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
     </ItemGroup>

ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj

@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@@ -10,8 +10,8 @@
     <ItemGroup>
       <PackageReference Include="Blurhash.ImageSharp" Version="3.0.0" />
       <PackageReference Include="CliWrap" Version="3.6.4" />
-      <PackageReference Include="Dapper" Version="2.0.143" />
+      <PackageReference Include="Dapper" Version="2.0.151" />
-      <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.9.1" />
+      <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.9.2" />
       <PackageReference Include="Jint" Version="3.0.0-beta-2050" />
       <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
       <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />

ErsatzTV.Infrastructure/Plex/PlexTvApiClient.cs

@@ -41,17 +41,20 @@ public class PlexTvApiClient : IPlexTvApiClient
                     clientIdentifier,
                     token.AuthToken);
 
-
+                var allServers = httpResources.Filter(resource => resource.HttpsRequired == false)
-                var allResources = httpResources.Filter(resource => resource.HttpsRequired == false)
                     .Append(httpsResources.Filter(resource => resource.HttpsRequired))
+                    .Filter(r => r.Provides.Split(",").Any(p => p == "server"))
                     .ToList();
 
-                IEnumerable<PlexResource> ownedResources = allResources
+                IEnumerable<PlexResource> ownedServers = allServers;
-                    .Filter(r => r.Provides.Split(",").Any(p => p == "server"))
-                    .Filter(r => r.Owned); // TODO: maybe support non-owned servers in the future
 
+                string allowSharedServers = Environment.GetEnvironmentVariable("ETV_ALLOW_SHARED_PLEX_SERVERS");
+                if (string.IsNullOrWhiteSpace(allowSharedServers))
+                {
+                    ownedServers = ownedServers.Filter(r => r.Owned);
+                }
 
-                foreach (PlexResource resource in ownedResources)
+                foreach (PlexResource resource in ownedServers)
                 {
                     var serverAuthToken = new PlexServerAuthToken(
                         resource.ClientIdentifier,

ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj

@@ -11,7 +11,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
         <PackageReference Include="LanguageExt.Core" Version="4.4.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV/ErsatzTV.csproj

@@ -55,7 +55,7 @@
     <ItemGroup>
       <PackageReference Include="Blazored.FluentValidation" Version="2.1.0" />
       <PackageReference Include="Bugsnag.AspNet.Core" Version="3.1.0" />
-      <PackageReference Include="FluentValidation" Version="11.6.0" />
+      <PackageReference Include="FluentValidation" Version="11.7.1" />
       <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
       <PackageReference Include="HtmlSanitizer" Version="8.0.692" />
       <PackageReference Include="LanguageExt.Core" Version="4.4.3" />
@@ -73,7 +73,7 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="MudBlazor" Version="6.8.0" />
+      <PackageReference Include="MudBlazor" Version="6.9.0" />
       <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
       <PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
       <PackageReference Include="Serilog" Version="3.0.1" />