pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix jellyfin library scan (#1501) 

* update dependencies

* fix jellyfin library scan
pull/1502/head
Jason Dove 2 years ago committed by GitHub
parent
b287c0d6ec
commit
5ecf271773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 37 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 2
      ErsatzTV.Application/ErsatzTV.Application.csproj
  3. 6
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  4. 4
      ErsatzTV.Core/ErsatzTV.Core.csproj
  5. 4
      ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
  6. 4
      ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
  7. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  8. 28
      ErsatzTV.Infrastructure/Jellyfin/JellyfinApiClient.cs
  9. 4
      ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
  10. 6
      ErsatzTV.Scanner/ErsatzTV.Scanner.csproj
  11. 2
      ErsatzTV/ErsatzTV.csproj

1
CHANGELOG.md
Unescape View File

@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- This behavior caused extremely slow QSV stream starts
- Fix displaying multiple languages in UI for movies, artists, shows
- Fix MySQL queries that could fail during media server library scans
- Fix scanning Jellyfin libraries when library options and/or path infos are not returned from Jellyfin API
### Changed
- Upgrade ffmpeg to 6.1, which is now *required* for all installs

2
ErsatzTV.Application/ErsatzTV.Application.csproj
Unescape View File

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="2.0.0" />
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="3.0.0" />
<PackageReference Include="Winista.MimeDetect" Version="1.1.0" />
</ItemGroup>

6
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
Unescape View File

@ -16,15 +16,15 @@ @@ -16,15 +16,15 @@
<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.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
</ItemGroup>

4
ErsatzTV.Core/ErsatzTV.Core.csproj
Unescape View File

@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

4
ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
Unescape View File

@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />

4
ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
Unescape View File

@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.9.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
Unescape View File

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
<PackageReference Include="CliWrap" Version="3.6.4" />
<PackageReference Include="Dapper" Version="2.1.15" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.10.0" />
<PackageReference Include="Jint" Version="3.0.0-beta-2053" />
<PackageReference Include="Jint" Version="3.0.0-beta-2054" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />

28
ErsatzTV.Infrastructure/Jellyfin/JellyfinApiClient.cs
Unescape View File

@ -371,15 +371,25 @@ public class JellyfinApiClient : IJellyfinApiClient @@ -371,15 +371,25 @@ public class JellyfinApiClient : IJellyfinApiClient
_ => None
};
private static List<JellyfinPathInfo> GetPathInfos(JellyfinLibraryResponse response) =>
response.LibraryOptions.PathInfos
.Filter(pi => !string.IsNullOrWhiteSpace(pi.NetworkPath))
.Map(
pi => new JellyfinPathInfo
{
Path = pi.Path,
NetworkPath = pi.NetworkPath
}).ToList();
private static List<JellyfinPathInfo> GetPathInfos(JellyfinLibraryResponse response)
{
var result = new List<JellyfinPathInfo>();
if (response.LibraryOptions?.PathInfos is not null)
{
result.AddRange(
response.LibraryOptions.PathInfos
.Filter(pi => !string.IsNullOrWhiteSpace(pi.NetworkPath))
.Map(
pi => new JellyfinPathInfo
{
Path = pi.Path,
NetworkPath = pi.NetworkPath
}));
}
return result;
}
private Option<JellyfinLibrary> CacheCollectionLibraryId(string itemId)
{

4
ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
Unescape View File

@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="LanguageExt.Core" Version="4.4.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.9.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

6
ErsatzTV.Scanner/ErsatzTV.Scanner.csproj
Unescape View File

@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

2
ErsatzTV/ErsatzTV.csproj
Unescape View File

@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
<PackageReference Include="MudBlazor" Version="6.11.0" />
<PackageReference Include="NaturalSort.Extension" Version="4.1.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

Write Preview
Loading…
Cancel
Save