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

update dependencies that require api migrations (#2063) 

* migrate system.commandline to 2.0.0-beta5 api

* bump sixlabors.imagesharp

* migrate skiasharp to 3.x api
pull/1898/merge
Jason Dove 13 hours ago committed by GitHub
parent
9267edbcc9
commit
3805b9e48c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 98 additions and 97 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. 4
      ErsatzTV.Core/ErsatzTV.Core.csproj
  2. 22
      ErsatzTV.Core/Images/ChannelLogoGenerator.cs
  3. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  4. 2
      ErsatzTV.Scanner/ErsatzTV.Scanner.csproj
  5. 155
      ErsatzTV.Scanner/Worker.cs
  6. 10
      ErsatzTV/Shared/MainLayout.razor

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

@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
<PackageReference Include="SkiaSharp" Version="3.119.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.0" />
<PackageReference Include="TimeSpanParserUtil" Version="1.2.0" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
</ItemGroup>

22
ErsatzTV.Core/Images/ChannelLogoGenerator.cs
Unescape View File

@ -41,32 +41,34 @@ public class ChannelLogoGenerator : IChannelLogoGenerator @@ -41,32 +41,34 @@ public class ChannelLogoGenerator : IChannelLogoGenerator
//Custom Font
string fontPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "Sen.ttf");
using SKTypeface fontTypeface = SKTypeface.FromFile(fontPath);
int fontSize = 30;
SKPaint paint = new SKPaint
var fontSize = 30;
var font = new SKFont
{
Typeface = fontTypeface,
TextSize = fontSize,
Size = fontSize
};
var paint = new SKPaint
{
IsAntialias = true,
Color = SKColors.White,
Style = SKPaintStyle.Fill,
TextAlign = SKTextAlign.Center
Style = SKPaintStyle.Fill
};
SKRect textBounds = new SKRect();
paint.MeasureText(text, ref textBounds);
font.MeasureText(text, out SKRect textBounds, paint);
// Ajuster la taille de la police si nécessaire
while (textBounds.Width > logoWidth - 10 && fontSize > 16)
{
fontSize -= 2;
paint.TextSize = fontSize;
paint.MeasureText(text, ref textBounds);
font.Size = fontSize;
font.MeasureText(text, out textBounds, paint);
}
// Dessiner le texte
float x = logoWidth / 2f;
float y = logoHeight / 2f - textBounds.MidY;
canvas.DrawText(text, x, y, paint);
canvas.DrawText(text, x, y, SKTextAlign.Center, font, paint);
using SKImage image = surface.Snapshot();
using MemoryStream ms = new MemoryStream();

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

@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
<!-- transitive; upgrading for vuln -->
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
</ItemGroup>
<ItemGroup>

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

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
</ItemGroup>
<ItemGroup>

155
ErsatzTV.Scanner/Worker.cs
Unescape View File

@ -33,202 +33,207 @@ public class Worker : BackgroundService @@ -33,202 +33,207 @@ public class Worker : BackgroundService
// need to strip program name (head) from command line args
string[] arguments = Environment.GetCommandLineArgs().Skip(1).ToArray();
await rootCommand.InvokeAsync(arguments);
ParseResult parseResult = rootCommand.Parse(arguments);
await parseResult.InvokeAsync(stoppingToken);
_appLifetime.StopApplication();
}
private RootCommand ConfigureCommandLine()
{
var forceOption = new System.CommandLine.Option<bool>(
"--force",
description: "Force scanning",
parseArgument: _ => true)
var forceOption = new System.CommandLine.Option<bool>("--force")
{
AllowMultipleArgumentsPerToken = true,
Arity = ArgumentArity.Zero
Arity = ArgumentArity.Zero,
Description = "Force scanning",
DefaultValueFactory = _ => false
};
var deepOption = new System.CommandLine.Option<bool>(
"--deep",
description: "Deep scan",
parseArgument: _ => true)
var deepOption = new System.CommandLine.Option<bool>("--deep")
{
AllowMultipleArgumentsPerToken = true,
Arity = ArgumentArity.Zero
Arity = ArgumentArity.Zero,
Description = "Deep scan",
DefaultValueFactory = _ => false
};
var libraryIdArgument = new Argument<int>("library-id", "The library id to scan");
var mediaSourceIdArgument = new Argument<int>("media-source-id", "The media source id to scan");
var libraryIdArgument = new Argument<int>("library-id")
{
Description = "The library id to scan"
};
var mediaSourceIdArgument = new Argument<int>("media-source-id")
{
Description = "The media source id to scan"
};
var scanLocalCommand = new Command("scan-local", "Scan a local library");
scanLocalCommand.AddArgument(libraryIdArgument);
scanLocalCommand.AddOption(forceOption);
scanLocalCommand.Arguments.Add(libraryIdArgument);
scanLocalCommand.Options.Add(forceOption);
var scanPlexCommand = new Command("scan-plex", "Scan a Plex library");
scanPlexCommand.AddArgument(libraryIdArgument);
scanPlexCommand.AddOption(forceOption);
scanPlexCommand.AddOption(deepOption);
scanPlexCommand.Arguments.Add(libraryIdArgument);
scanPlexCommand.Options.Add(forceOption);
scanPlexCommand.Options.Add(deepOption);
var scanPlexCollectionsCommand = new Command("scan-plex-collections", "Scan Plex collections");
scanPlexCollectionsCommand.AddArgument(mediaSourceIdArgument);
scanPlexCollectionsCommand.AddOption(forceOption);
scanPlexCollectionsCommand.Arguments.Add(mediaSourceIdArgument);
scanPlexCollectionsCommand.Options.Add(forceOption);
var scanEmbyCommand = new Command("scan-emby", "Scan an Emby library");
scanEmbyCommand.AddArgument(libraryIdArgument);
scanEmbyCommand.AddOption(forceOption);
scanEmbyCommand.AddOption(deepOption);
scanEmbyCommand.Arguments.Add(libraryIdArgument);
scanEmbyCommand.Options.Add(forceOption);
scanEmbyCommand.Options.Add(deepOption);
var scanEmbyCollectionsCommand = new Command("scan-emby-collections", "Scan Emby collections");
scanEmbyCollectionsCommand.AddArgument(mediaSourceIdArgument);
scanEmbyCollectionsCommand.AddOption(forceOption);
scanEmbyCollectionsCommand.Arguments.Add(mediaSourceIdArgument);
scanEmbyCollectionsCommand.Options.Add(forceOption);
var scanJellyfinCommand = new Command("scan-jellyfin", "Scan a Jellyfin library");
scanJellyfinCommand.AddArgument(libraryIdArgument);
scanJellyfinCommand.AddOption(forceOption);
scanJellyfinCommand.AddOption(deepOption);
scanJellyfinCommand.Arguments.Add(libraryIdArgument);
scanJellyfinCommand.Options.Add(forceOption);
scanJellyfinCommand.Options.Add(deepOption);
var scanJellyfinCollectionsCommand = new Command("scan-jellyfin-collections", "Scan Jellyfin collections");
scanJellyfinCollectionsCommand.AddArgument(mediaSourceIdArgument);
scanJellyfinCollectionsCommand.AddOption(forceOption);
scanJellyfinCollectionsCommand.Arguments.Add(mediaSourceIdArgument);
scanJellyfinCollectionsCommand.Options.Add(forceOption);
scanLocalCommand.SetHandler(
async context =>
scanLocalCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
int libraryId = context.ParseResult.GetValueForArgument(libraryIdArgument);
int libraryId = parseResult.GetValue(libraryIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new ScanLocalLibrary(libraryId, force);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanPlexCommand.SetHandler(
async context =>
scanPlexCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
bool deep = context.ParseResult.GetValueForOption(deepOption);
int libraryId = context.ParseResult.GetValueForArgument(libraryIdArgument);
bool deep = parseResult.GetValue(deepOption);
int libraryId = parseResult.GetValue(libraryIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizePlexLibraryById(libraryId, force, deep);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanPlexCollectionsCommand.SetHandler(
async context =>
scanPlexCollectionsCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
int mediaSourceId = context.ParseResult.GetValueForArgument(mediaSourceIdArgument);
int mediaSourceId = parseResult.GetValue(mediaSourceIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizePlexCollections(mediaSourceId, force);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanEmbyCommand.SetHandler(
async context =>
scanEmbyCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
bool deep = context.ParseResult.GetValueForOption(deepOption);
int libraryId = context.ParseResult.GetValueForArgument(libraryIdArgument);
bool deep = parseResult.GetValue(deepOption);
int libraryId = parseResult.GetValue(libraryIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizeEmbyLibraryById(libraryId, force, deep);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanEmbyCollectionsCommand.SetHandler(
async context =>
scanEmbyCollectionsCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
int mediaSourceId = context.ParseResult.GetValueForArgument(mediaSourceIdArgument);
int mediaSourceId = parseResult.GetValue(mediaSourceIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizeEmbyCollections(mediaSourceId, force);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanJellyfinCommand.SetHandler(
async context =>
scanJellyfinCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
bool deep = context.ParseResult.GetValueForOption(deepOption);
int libraryId = context.ParseResult.GetValueForArgument(libraryIdArgument);
bool deep = parseResult.GetValue(deepOption);
int libraryId = parseResult.GetValue(libraryIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizeJellyfinLibraryById(libraryId, force, deep);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
scanJellyfinCollectionsCommand.SetHandler(
async context =>
scanJellyfinCollectionsCommand.SetAction(
async (parseResult, token) =>
{
if (IsScanningEnabled())
{
bool force = context.ParseResult.GetValueForOption(forceOption);
bool force = parseResult.GetValue(forceOption);
SetProcessPriority(force);
int mediaSourceId = context.ParseResult.GetValueForArgument(mediaSourceIdArgument);
int mediaSourceId = parseResult.GetValue(mediaSourceIdArgument);
using IServiceScope scope = _serviceScopeFactory.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
var scan = new SynchronizeJellyfinCollections(mediaSourceId, force);
await mediator.Send(scan, context.GetCancellationToken());
await mediator.Send(scan, token);
}
});
var rootCommand = new RootCommand();
rootCommand.AddCommand(scanLocalCommand);
rootCommand.AddCommand(scanPlexCommand);
rootCommand.AddCommand(scanPlexCollectionsCommand);
rootCommand.AddCommand(scanEmbyCommand);
rootCommand.AddCommand(scanEmbyCollectionsCommand);
rootCommand.AddCommand(scanJellyfinCommand);
rootCommand.AddCommand(scanJellyfinCollectionsCommand);
rootCommand.Subcommands.Add(scanLocalCommand);
rootCommand.Subcommands.Add(scanPlexCommand);
rootCommand.Subcommands.Add(scanPlexCollectionsCommand);
rootCommand.Subcommands.Add(scanEmbyCommand);
rootCommand.Subcommands.Add(scanEmbyCollectionsCommand);
rootCommand.Subcommands.Add(scanJellyfinCommand);
rootCommand.Subcommands.Add(scanJellyfinCollectionsCommand);
return rootCommand;
}

10
ErsatzTV/Shared/MainLayout.razor
Unescape View File

@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
<div style="align-items: center; display: flex;" class="d-none d-md-flex">
@if (SystemStartup.IsDatabaseReady && SystemStartup.IsSearchIndexReady)
{
<MudLink Color="Color.Info" Href="@IptvUrl("channels.m3u")" Target="_blank" Underline="Underline.None">M3U</MudLink>
<MudLink Color="Color.Info" Href="@IptvUrl("xmltv.xml")" Target="_blank" Class="mx-4" Underline="Underline.None">XMLTV</MudLink>
<MudLink Color="Color.Info" Href="iptv/channels.m3u" Target="_blank" Underline="Underline.None">M3U</MudLink>
<MudLink Color="Color.Info" Href="iptv/xmltv.xml" Target="_blank" Class="mx-4" Underline="Underline.None">XMLTV</MudLink>
}
@* <MudLink Color="Color.Info" Href="/swagger" Target="_blank" Class="mr-4" Underline="Underline.None">API</MudLink> *@
<MudTooltip Text="Documentation">
@ -291,12 +291,6 @@ @@ -291,12 +291,6 @@
_ => null
};
private string IptvUrl(string path)
{
var uri = new Uri(NavigationManager.Uri);
return $"{uri.Scheme}://{uri.Host}:{Settings.StreamingPort}/iptv/{path}";
}
private void ToggleDrawer()
{
_drawerIsOpen = !_drawerIsOpen;

Write Preview
Loading…
Cancel
Save