brister/jsmr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Updated scanner logic, and added initial scanner tests.

Browse Source
This commit is contained in:
Brian Bicknell
2025-09-14 21:12:00 -04:00
parent 39274165cb
commit 646cf41476
16 changed files with 412 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JSMR.Application/JSMR.Application.csproj
View File

@@ -6,12 +6,12 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />
</ItemGroup>
<ItemGroup>
<Folder Include="Tags\Queries\Ports\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
</ItemGroup>
</Project>

4
JSMR.Application/Scanning/Contracts/DLSiteWork.cs
View File

@@ -8,8 +8,8 @@ public class DLSiteWork
public string? ProductUrl { get; set; }
public string? ProductId { get; set; }
public DateOnly? AnnouncedDate { get; set; }
public DateTime? ExpectedDate { get; set; }
public DateTime? SalesDate { get; set; }
public DateOnly? ExpectedDate { get; set; }
public DateOnly? SalesDate { get; set; }
public int? Downloads { get; set; }
public byte? StarRating { get; set; }
public int? Votes { get; set; }

3
JSMR.Application/Scanning/Contracts/VoiceWorkScanOptions.cs Normal file
View File

@@ -0,0 +1,3 @@
namespace JSMR.Application.Scanning.Contracts;
public record VoiceWorkScanOptions(int PageNumber, int PageSize, string[] ExcludedMakerIds, bool ExcludePartiallyAIGeneratedWorks, bool ExcludeAIGeneratedWorks);

2
JSMR.Application/Scanning/Ports/IVoiceWorksScanner.cs
View File

@@ -4,5 +4,5 @@ namespace JSMR.Application.Scanning.Ports;
public interface IVoiceWorksScanner
{
Task<IReadOnlyList<DLSiteWork>> ScanPageAsync(ScanVoiceWorksRequest request, CancellationToken cancellationToken = default);
Task<IReadOnlyList<DLSiteWork>> ScanPageAsync(VoiceWorkScanOptions request, CancellationToken cancellationToken = default);
}

61
JSMR.Application/Scanning/ScanVoiceWorksHandler.cs
View File

@@ -1,26 +1,53 @@
using JSMR.Application.Scanning.Ports;
using JSMR.Application.Common.Caching;
using JSMR.Application.Integrations.DLSite.Models;
using JSMR.Application.Integrations.Ports;
using JSMR.Application.Scanning.Contracts;
using JSMR.Application.Scanning.Ports;
using Microsoft.Extensions.DependencyInjection;
namespace JSMR.Application.Scanning;
public sealed class ScanVoiceWorksHandler(IVoiceWorksScanner scanner)
public sealed class ScanVoiceWorksHandler(IServiceProvider serviceProvider, IDLSiteClient dlsiteClient, ISpamCircleCache spamCircleCache)
{
//public async Task<ScanVoiceWorksResponse> HandleAsync(ScanVoiceWorksRequest request, CancellationToken cancellationToken)
//{
// var works = await scanner.ScanPageAsync(request, cancellationToken);
public async Task<ScanVoiceWorksResponse> HandleAsync(ScanVoiceWorksRequest request, CancellationToken cancellationToken)
{
IVoiceWorksScanner? scanner = serviceProvider.GetKeyedService<IVoiceWorksScanner>(request.Locale);
// if (works.Count == 0)
// return new ScanVoiceWorksResponse();
if (scanner is null)
return new();
// var ingests = works.Select(VoiceWorkIngest.From).ToList();
// var upsert = await _writer.UpsertAsync(ingests, ct);
VoiceWorkScanOptions options = new(
PageNumber: request.PageNumber,
PageSize: request.PageSize,
ExcludedMakerIds: await spamCircleCache.GetAsync(cancellationToken),
ExcludePartiallyAIGeneratedWorks: true,
ExcludeAIGeneratedWorks: true
);
// // only update search text for affected rows
// await _search.UpdateAsync(upsert.AffectedVoiceWorkIds, ct);
IReadOnlyList<DLSiteWork> works = await scanner.ScanPageAsync(options, cancellationToken);
// return new ScanVoiceWorksResponse
// {
// Inserted = upsert.Inserted,
// Updated = upsert.Updated
// };
//}
if (works.Count == 0)
return new();
string[] productIds = [.. works.Where(x => !string.IsNullOrWhiteSpace(x.ProductId)).Select(x => x.ProductId!)];
VoiceWorkDetailCollection voiceWorkDetails = await dlsiteClient.GetVoiceWorkDetailsAsync(productIds, cancellationToken);
// TODO
/*
var ingests = works.Select(VoiceWorkIngest.From).ToList();
var upsert = await _writer.UpsertAsync(ingests, ct);
// only update search text for affected rows
await _search.UpdateAsync(upsert.AffectedVoiceWorkIds, ct);
return new ScanVoiceWorksResponse
{
Inserted = upsert.Inserted,
Updated = upsert.Updated
};
*/
return new();
}
}

2
JSMR.Application/Scanning/ScanVoiceWorksRequest.cs
View File

@@ -2,4 +2,4 @@
namespace JSMR.Application.Scanning;
public sealed record ScanVoiceWorksRequest(int PageNumber, int PageSize, Locale Locale);
public sealed record ScanVoiceWorksRequest(int PageNumber, int PageSize, Locale Locale, string[] ExcludedMakerIds);