Update dependencies

Add linkdotnet/BuildInformation
This commit is contained in:
2025-10-02 18:09:27 +02:00
parent 06555614f1
commit 0b44abf4c7
5 changed files with 42 additions and 32 deletions

View File

@@ -15,24 +15,25 @@
<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.2" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.3" />
<PackageReference Include="JikanDotNet" Version="2.9.1" />
<PackageReference Include="LinkDotNet.BuildInformation" Version="1.3.0" />
<PackageReference Include="log4net" Version="3.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Npgsql" Version="9.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="Soenneker.Utils.String.NeedlemanWunsch" Version="3.0.978" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="9.0.4" />
<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
<PackageReference Include="Soenneker.Utils.String.NeedlemanWunsch" Version="3.0.979" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="9.0.6" />
<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
</ItemGroup>
<ItemGroup>
@@ -43,4 +44,11 @@
<None Include="Log4Net.config.xml" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" />
</ItemGroup>
<PropertyGroup>
<IncludeGitInformation>true</IncludeGitInformation>
</PropertyGroup>
<ItemGroup>
<CompilerVisibleProperty Include="IncludeGitInformation" />
</ItemGroup>
</Project>

View File

@@ -4,14 +4,6 @@ namespace API;
public struct Constants
{
public const string TRANGA =
"\n\n" +
" _______ v2\n" +
"|_ _|.----..---.-..-----..-----..---.-.\n" +
" | | | _|| _ || || _ || _ |\n" +
" |___| |__| |___._||__|__||___ ||___._|\n" +
" |_____| \n\n";
public static readonly Size ImageSmSize = new (225, 320);
public static readonly Size ImageMdSize = new (450, 640);
public static readonly Size ImageLgSize = new (900, 1280);

View File

@@ -14,11 +14,21 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Npgsql;
XmlConfigurator.ConfigureAndWatch(new FileInfo("Log4Net.config.xml"));
ILog Log = LogManager.GetLogger("Startup");
Log.Info("Logger Configured.");
string tranga =
"\n\n" +
" _______ v2\n" +
"|_ _|.----..---.-..-----..-----..---.-.\n" +
" | | | _|| _ || || _ || _ |\n" +
" |___| |__| |___._||__|__||___ ||___._|\n" +
" |_____| \n" +
$"{GitInformation.Branch}-{GitInformation.ShortCommit}-{BuildInformation.BuildAt} for {BuildInformation.Platform}\n\n";
Log.Info("Starting up");
XmlConfigurator.ConfigureAndWatch(new FileInfo("Log4Net.config.xml"));
ILog log = LogManager.GetLogger("Startup");
log.Info(tranga);
log.Info("Logger Configured.");
log.Info("Starting up");
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
builder.Services.AddCors(options =>
@@ -33,7 +43,7 @@ builder.Services.AddCors(options =>
});
});
Log.Debug("Adding API-Explorer-helpers...");
log.Debug("Adding API-Explorer-helpers...");
builder.Services.AddApiVersioning(option =>
{
option.AssumeDefaultVersionWhenUnspecified = true;
@@ -62,7 +72,7 @@ builder.Services.AddSwaggerGenNewtonsoftSupport().AddSwaggerGen(opt =>
opt.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFilename));
});
Log.Debug("Adding Database-Connection...");
log.Debug("Adding Database-Connection...");
NpgsqlConnectionStringBuilder connectionStringBuilder = new()
{
Host = Environment.GetEnvironmentVariable("POSTGRES_HOST") ?? "tranga-pg:5432",
@@ -97,7 +107,7 @@ builder.Services.AddScoped<ILog>(_ => LogManager.GetLogger("API"));
builder.WebHost.UseUrls("http://*:6531");
Log.Info("Starting app...");
log.Info("Starting app...");
WebApplication app = builder.Build();
app.UseCors("AllowAll");
@@ -109,12 +119,12 @@ ApiVersionSet apiVersionSet = app.NewApiVersionSet()
app.UseCors("AllowAll");
Log.Debug("Mapping Controllers...");
log.Debug("Mapping Controllers...");
app.MapControllers()
.WithApiVersionSet(apiVersionSet)
.MapToApiVersion(2);
Log.Debug("Adding Swagger...");
log.Debug("Adding Swagger...");
app.UseSwagger(opts =>
{
opts.OpenApiVersion = OpenApiSpecVersion.OpenApi3_0;
@@ -129,7 +139,7 @@ app.UseHttpsRedirection();
try //Connect to DB and apply migrations
{
Log.Debug("Applying Migrations...");
log.Debug("Applying Migrations...");
using (IServiceScope scope = app.Services.CreateScope())
{
MangaContext context = scope.ServiceProvider.GetRequiredService<MangaContext>();
@@ -172,14 +182,14 @@ try //Connect to DB and apply migrations
}
catch (Exception e)
{
Log.Debug("Migrations failed!", e);
log.Debug("Migrations failed!", e);
return;
}
Log.Info("Starting Tranga.");
log.Info("Starting Tranga.");
Tranga.ServiceProvider = app.Services;
Tranga.StartupTasks();
Tranga.AddDefaultWorkers();
Log.Info("Running app.");
log.Info("Running app.");
app.Run();

View File

@@ -10,12 +10,12 @@ using API.Workers.MangaDownloadWorkers;
using API.Workers.PeriodicWorkers;
using API.Workers.PeriodicWorkers.MaintenanceWorkers;
using log4net;
using log4net.Config;
namespace API;
public static class Tranga
{
internal static IServiceProvider? ServiceProvider { get; set; }
private static readonly ILog Log = LogManager.GetLogger(typeof(Tranga));
@@ -37,7 +37,6 @@ public static class Tranga
internal static void StartupTasks()
{
Log.Info(Constants.TRANGA);
AddWorker(SendNotificationsWorker);
AddWorker(CleanupMangaconnectorIdsWithoutConnector);
AddWorker(UpdateChaptersDownloadedWorker);