mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 12:14:44 -04:00
* Took care of some notes in the code * Fixed an issue where Extra might get flagged as special too early, if in a word like Extraordinary * Moved Tag cleanup code into Scanner service. Added a SplitQuery to another heavy API. Refactored Scan loop to remove parallelism and use async instead. * Lots of rework on the codebase to support detailed messages and easier management of message sending. Need to take a break on this work. * Progress is being made, but slowly. Code is broken in this commit. * Progress is being made, but slowly. Code is broken in this commit. * Fixed merge issue * Fixed unit tests * CoverUpdate is now hooked into new ProgressEvent structure * Refactored code to remove custom observables and have everything use standard messages$ * Refactored a ton of instances to NotificationProgressEvent style and tons of the UI to respect that too. UI is still a bit buggy, but wholistically the work is done. * Working much better. Sometimes events come in too fast. Currently cover update progress doesn't display on UI * Fixed unit tests * Removed SignalREvent to minimize internal event types. Updated the UI to use progress bars. Finished SiteThemeService. * Merged metadata refresh progress events and changed library scan events to merge cleaner in the UI * Changed RefreshMetadataProgress to CoverUpdateProgress to reflect the event better. * Theme Cleanup (#1089) * Fixed e-ink theme not properly applying correctly * Fixed some seed changes. Changed card checkboxes to use our themed ones * Fixed recently added carousel not going to recently-added page * Fixed an issue where no results found would show when searching for a library name * Cleaned up list a bit, typeahead dropdown still needs work * Added a TODO to streamline series-card component * Removed ng-lazyload-image module since we don't use it. We use lazysizes * Darken card on hover * Fixing accordion focus style * ux pass updates - Fixed typeahead width - Fixed changelog download buttons - Fixed a select - Fixed various input box-shadows - Fixed all anchors to only have underline on hover - Added navtab hover and active effects * more ux pass - Fixed spacing on theme cards - Fixed some light theme issues - Exposed text-muted-color for theme card subtitle color * UX pass fixes - Changed back to bright green for primary on dark theme - Changed fa icon to black on e-ink * Merged changelog component * Fixed anchor buttons text decoration * Changed nav tabs to have a background color instead of open active state * When user is not authenticated, make sure we set default theme (dark) * Cleanup on carousel * Updated Users tab to use small buttons with icons to align with Library tab * Cleaned up brand to not underline, removed default link underline on hover in dropdown and pill tabs * Fixed collection detail posters not rendering Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> * Bump versions by dotnet-bump-version. * Tweaked some of the emitting code * Some css, but pretty bad. Robbie please save me * Removed a todo * styling update * Only send filename on FileScanProgress * Some console.log spam cleanup * Various updates * Show events widget activity based on activeEvents * progress bar color updates * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
157 lines
5.4 KiB
C#
157 lines
5.4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.Update;
|
|
using API.SignalR;
|
|
using API.SignalR.Presence;
|
|
using Flurl.Http;
|
|
using Kavita.Common.EnvironmentInfo;
|
|
using Kavita.Common.Helpers;
|
|
using MarkdownDeep;
|
|
using Microsoft.AspNetCore.SignalR;
|
|
using Microsoft.Extensions.Hosting;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services.Tasks;
|
|
|
|
internal class GithubReleaseMetadata
|
|
{
|
|
/// <summary>
|
|
/// Name of the Tag
|
|
/// <example>v0.4.3</example>
|
|
/// </summary>
|
|
// ReSharper disable once InconsistentNaming
|
|
public string Tag_Name { get; init; }
|
|
/// <summary>
|
|
/// Name of the Release
|
|
/// </summary>
|
|
public string Name { get; init; }
|
|
/// <summary>
|
|
/// Body of the Release
|
|
/// </summary>
|
|
public string Body { get; init; }
|
|
/// <summary>
|
|
/// Url of the release on Github
|
|
/// </summary>
|
|
// ReSharper disable once InconsistentNaming
|
|
public string Html_Url { get; init; }
|
|
/// <summary>
|
|
/// Date Release was Published
|
|
/// </summary>
|
|
// ReSharper disable once InconsistentNaming
|
|
public string Published_At { get; init; }
|
|
}
|
|
|
|
public interface IVersionUpdaterService
|
|
{
|
|
Task<UpdateNotificationDto> CheckForUpdate();
|
|
Task PushUpdate(UpdateNotificationDto update);
|
|
Task<IEnumerable<UpdateNotificationDto>> GetAllReleases();
|
|
}
|
|
|
|
public class VersionUpdaterService : IVersionUpdaterService
|
|
{
|
|
private readonly ILogger<VersionUpdaterService> _logger;
|
|
private readonly IEventHub _eventHub;
|
|
private readonly IPresenceTracker _tracker;
|
|
private readonly Markdown _markdown = new MarkdownDeep.Markdown();
|
|
#pragma warning disable S1075
|
|
private const string GithubLatestReleasesUrl = "https://api.github.com/repos/Kareadita/Kavita/releases/latest";
|
|
private const string GithubAllReleasesUrl = "https://api.github.com/repos/Kareadita/Kavita/releases";
|
|
#pragma warning restore S1075
|
|
|
|
public VersionUpdaterService(ILogger<VersionUpdaterService> logger, IEventHub eventHub, IPresenceTracker tracker)
|
|
{
|
|
_logger = logger;
|
|
_eventHub = eventHub;
|
|
_tracker = tracker;
|
|
|
|
FlurlHttp.ConfigureClient(GithubLatestReleasesUrl, cli =>
|
|
cli.Settings.HttpClientFactory = new UntrustedCertClientFactory());
|
|
FlurlHttp.ConfigureClient(GithubAllReleasesUrl, cli =>
|
|
cli.Settings.HttpClientFactory = new UntrustedCertClientFactory());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fetches the latest release from Github
|
|
/// </summary>
|
|
/// <returns>Latest update or null if current version is greater than latest update</returns>
|
|
public async Task<UpdateNotificationDto?> CheckForUpdate()
|
|
{
|
|
var update = await GetGithubRelease();
|
|
var dto = CreateDto(update);
|
|
return new Version(dto.UpdateVersion) <= new Version(dto.CurrentVersion) ? null : dto;
|
|
}
|
|
|
|
public async Task<IEnumerable<UpdateNotificationDto>> GetAllReleases()
|
|
{
|
|
var updates = await GetGithubReleases();
|
|
return updates.Select(CreateDto);
|
|
}
|
|
|
|
private UpdateNotificationDto CreateDto(GithubReleaseMetadata update)
|
|
{
|
|
if (update == null || string.IsNullOrEmpty(update.Tag_Name)) return null;
|
|
var updateVersion = new Version(update.Tag_Name.Replace("v", string.Empty));
|
|
var currentVersion = BuildInfo.Version.ToString();
|
|
|
|
if (updateVersion.Revision == -1)
|
|
{
|
|
currentVersion = currentVersion.Substring(0, currentVersion.LastIndexOf(".", StringComparison.Ordinal));
|
|
}
|
|
|
|
return new UpdateNotificationDto()
|
|
{
|
|
CurrentVersion = currentVersion,
|
|
UpdateVersion = updateVersion.ToString(),
|
|
UpdateBody = _markdown.Transform(update.Body.Trim()),
|
|
UpdateTitle = update.Name,
|
|
UpdateUrl = update.Html_Url,
|
|
IsDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker,
|
|
PublishDate = update.Published_At
|
|
};
|
|
}
|
|
|
|
public async Task PushUpdate(UpdateNotificationDto update)
|
|
{
|
|
if (update == null) return;
|
|
|
|
var updateVersion = new Version(update.CurrentVersion);
|
|
|
|
if (BuildInfo.Version < updateVersion)
|
|
{
|
|
_logger.LogInformation("Server is out of date. Current: {CurrentVersion}. Available: {AvailableUpdate}", BuildInfo.Version, updateVersion);
|
|
await _eventHub.SendMessageAsync(MessageFactory.UpdateAvailable, MessageFactory.UpdateVersionEvent(update),
|
|
true);
|
|
}
|
|
else if (Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development)
|
|
{
|
|
_logger.LogInformation("Server is up to date. Current: {CurrentVersion}", BuildInfo.Version);
|
|
await _eventHub.SendMessageAsync(MessageFactory.UpdateAvailable, MessageFactory.UpdateVersionEvent(update),
|
|
true);
|
|
}
|
|
}
|
|
|
|
|
|
private static async Task<GithubReleaseMetadata> GetGithubRelease()
|
|
{
|
|
var update = await GithubLatestReleasesUrl
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.GetJsonAsync<GithubReleaseMetadata>();
|
|
|
|
return update;
|
|
}
|
|
|
|
private static async Task<IEnumerable<GithubReleaseMetadata>> GetGithubReleases()
|
|
{
|
|
var update = await GithubAllReleasesUrl
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.GetJsonAsync<IEnumerable<GithubReleaseMetadata>>();
|
|
|
|
return update;
|
|
}
|
|
}
|