From ae8a4ba476664801f243bca1fc6cd89d99ae7da8 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Tue, 26 Sep 2023 00:26:07 +1000 Subject: Added filename source decoding --- Pages/ViewMedia.razor | 12 +++++++++++- Program.cs | 1 + Services/SourceService.cs | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Services/SourceService.cs diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor index f1270f2..ce9d608 100644 --- a/Pages/ViewMedia.razor +++ b/Pages/ViewMedia.razor @@ -4,6 +4,7 @@ @inject IDbContextFactory dbFactory @inject ITagService tagService @inject IMediaService mediaService +@inject ISourceService sourceService @attribute [Authorize] @title @@ -55,6 +56,9 @@ Original Checksum @foreach(var file in media.UploadedFiles.OrderByDescending(uf => uf.UploadTime)) { + string? sourceUrl = null; + if(file.Filename is not null) + sourceUrl = sourceService.GetUrlFromFilename(file.Filename); @(file.CreateTime?.ToString("d") ?? "N/A") @@ -63,7 +67,13 @@ @(file.LastWriteTime?.ToString("d") ?? "N/A") @(file.UploadTime.ToString("d")) - @file.Filename + + @if(sourceUrl is not null) { + @file.Filename + } else { + @file.Filename + } + @file.Length.ToBytesSI() (); builder.Services.AddScoped(); builder.Services.AddHostedService(); + builder.Services.AddSingleton(); var app = builder.Build(); diff --git a/Services/SourceService.cs b/Services/SourceService.cs new file mode 100644 index 0000000..d145346 --- /dev/null +++ b/Services/SourceService.cs @@ -0,0 +1,20 @@ +using System.Text.RegularExpressions; + +namespace HyperBooru.Services; + +public interface ISourceService { + public string? GetUrlFromFilename(string filename); +} + +public class SourceService : ISourceService { + private Regex PixivRegex = + new(@"^([0-9]+)_p[0-9]+(_master1200)?\.[^.]+$", RegexOptions.Compiled); + + public string? GetUrlFromFilename(string filename) { + var pixivMatch = PixivRegex.Match(filename); + if(pixivMatch.Success) + return $"https://pixiv.net/en/artworks/{pixivMatch.Groups[1].Value}"; + + return null; + } +} -- cgit v1.3