timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

fix file not found music videos (#1502)

Browse Source 
* fix indexing music videos in file not found state

* update dependencies
This commit is contained in:
Jason Dove
2023-11-14 05:50:51 -06:00
committed by GitHub
parent 5ecf271773
commit 948b3735bd
9 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- 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
- Fix error indexing music videos in `File Not Found` state
### Changed
- Upgrade ffmpeg to 6.1, which is now *required* for all installs
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
</ItemGroup>
ErsatzTV.Core/ErsatzTV.Core.csproj
+1 -1
View File
@@ -25,7 +25,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="3.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
</ItemGroup>
ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj
+1 -1
View File
@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.15" />
<PackageReference Include="Dapper" Version="2.1.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
</ItemGroup>
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
+2 -2
View File
@@ -12,9 +12,9 @@
<ItemGroup>
<PackageReference Include="Blurhash.ImageSharp" Version="3.0.0" />
<PackageReference Include="CliWrap" Version="3.6.4" />
<PackageReference Include="Dapper" Version="2.1.15" />
<PackageReference Include="Dapper" Version="2.1.21" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.10.0" />
<PackageReference Include="Jint" Version="3.0.0-beta-2054" />
<PackageReference Include="Jint" Version="3.0.0-beta-2055" />
<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" />
ErsatzTV.Infrastructure/Search/ElasticSearchIndex.cs
+1 -1
View File
@@ -480,7 +480,7 @@ public class ElasticSearchIndex : ISearchIndex
Id = musicVideo.Id,
Type = LuceneSearchIndex.MusicVideoType,
Title = metadata.Title,
SortTitle = metadata.SortTitle.ToLowerInvariant(),
SortTitle = (metadata.SortTitle ?? string.Empty).ToLowerInvariant(),
LibraryName = musicVideo.LibraryPath.Library.Name,
LibraryId = musicVideo.LibraryPath.Library.Id,
TitleAndYear = LuceneSearchIndex.GetTitleAndYear(metadata),
ErsatzTV.Infrastructure/Search/LuceneSearchIndex.cs
+8 -4
View File
@@ -808,8 +808,8 @@ public sealed class LuceneSearchIndex : ISearchIndex
{
new StringField(IdField, musicVideo.Id.ToString(CultureInfo.InvariantCulture), Field.Store.YES),
new StringField(TypeField, MusicVideoType, Field.Store.YES),
new TextField(TitleField, metadata.Title, Field.Store.NO),
new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
new TextField(TitleField, metadata.Title ?? string.Empty, Field.Store.NO),
new StringField(SortTitleField, (metadata.SortTitle ?? string.Empty).ToLowerInvariant(), Field.Store.NO),
new TextField(LibraryNameField, musicVideo.LibraryPath.Library.Name, Field.Store.NO),
new StringField(
LibraryIdField,
@@ -1317,14 +1317,18 @@ public sealed class LuceneSearchIndex : ISearchIndex
internal static string GetJumpLetter(Metadata metadata)
{
char c = (metadata.SortTitle ?? " ").ToLowerInvariant().Head();
foreach (char c in (metadata.SortTitle ?? " ").ToLowerInvariant().HeadOrNone())
{
return c switch
{
(>= 'a' and <= 'z') => c.ToString(),
>= 'a' and <= 'z' => c.ToString(),
_ => "#"
};
}
return "#";
}
private static string OtherVideoTitle(OtherVideoMetadata ovm) =>
string.IsNullOrWhiteSpace(ovm.OriginalTitle) ? ovm.Title : ovm.OriginalTitle;
}
ErsatzTV.Scanner/ErsatzTV.Scanner.csproj
+1 -1
View File
@@ -27,7 +27,7 @@
<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.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
ErsatzTV/ErsatzTV.csproj
+1 -1
View File
@@ -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.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<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" />