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

Moved some classes around to the domain layer.

Browse Source
This commit is contained in:
Brian Bicknell
2025-11-01 13:28:36 -04:00
parent 14129a8bba
commit 4191a42afd
19 changed files with 115 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
JSMR.Infrastructure/Scanning/DLSiteSearchFilterBuilder.cs
View File

@@ -1,15 +1,15 @@
using JSMR.Domain.ValueObjects;
using JSMR.Infrastructure.Common.Locales;
using JSMR.Application.Enums;
using JSMR.Domain.ValueObjects;
namespace JSMR.Infrastructure.Scanning;
public class DLSiteSearchFilterBuilder
public sealed class DLSiteSearchFilterBuilder
{
private readonly List<string> _optionsAnd = [];
private readonly List<string> _optionsNot = [];
private readonly List<string> _excludedMakers = [];
private ILocale _locale = new JapaneseLocale();
private Locale _locale = Locale.Japanese;
private void AddToOptionsAnd(string value)
{
@@ -27,7 +27,7 @@ public class DLSiteSearchFilterBuilder
_optionsNot.Add(value);
}
public DLSiteSearchFilterBuilder UseLocale(ILocale locale)
public DLSiteSearchFilterBuilder UseLocale(Locale locale)
{
_locale = locale;
@@ -90,12 +90,12 @@ public class DLSiteSearchFilterBuilder
public string BuildSearchQuery(int pageNumber, int pageSize)
{
ILocale locale = _locale ?? new JapaneseLocale();
var (localeAbbreviation, localeCode) = LocaleMap.Map[_locale];
using (var writer = new StringWriter())
{
writer.Write($"https://www.dlsite.com/maniax/");
writer.Write($"fsr/=/language/{locale.Abbreviation}/");
writer.Write($"fsr/=/language/{localeAbbreviation}/");
writer.Write("sex_category[0]/male/");
writer.Write("ana_flg/all/");
@@ -129,7 +129,7 @@ public class DLSiteSearchFilterBuilder
writer.Write($"per_page/{pageSize}/");
writer.Write($"page/{pageNumber}/");
writer.Write("show_type/1/");
writer.Write($"?locale={locale.Code}");
writer.Write($"?locale={localeCode}");
return writer.ToString();
}

9
JSMR.Infrastructure/Scanning/DLSiteSearchFilterBuilderExtensions.cs
View File

@@ -1,6 +1,5 @@
using JSMR.Domain.ValueObjects;
using JSMR.Infrastructure.Common.Locales;
using JSMR.Infrastructure.Common.SupportedLanguages;
using JSMR.Application.Enums;
using JSMR.Domain.ValueObjects;
namespace JSMR.Infrastructure.Scanning;
@@ -8,12 +7,12 @@ public static class DLSiteSearchFilterBuilderExtensions
{
public static DLSiteSearchFilterBuilder UseDefaultLocale(this DLSiteSearchFilterBuilder searchFilterBuilder)
{
return searchFilterBuilder.UseLocale(new JapaneseLocale());
return searchFilterBuilder.UseLocale(Locale.Japanese);
}
public static DLSiteSearchFilterBuilder UseEnglishLocale(this DLSiteSearchFilterBuilder searchFilterBuilder)
{
return searchFilterBuilder.UseLocale(new EnglishLocale());
return searchFilterBuilder.UseLocale(Locale.English);
}
public static DLSiteSearchFilterBuilder IncludeJapaneseSupportedLanguage(this DLSiteSearchFilterBuilder searchFilterBuilder)

6
JSMR.Infrastructure/Scanning/EnglishVoiceWorksScanner.cs
View File

@@ -1,7 +1,5 @@
using JSMR.Application.Common;
using JSMR.Application.Enums;
using JSMR.Domain.ValueObjects;
using JSMR.Infrastructure.Common.Locales;
using JSMR.Infrastructure.Common.SupportedLanguages;
using JSMR.Infrastructure.Http;
using System.Globalization;
using System.Text.RegularExpressions;
@@ -16,7 +14,7 @@ public partial class EnglishVoiceWorksScanner(IHtmlLoader loader) : VoiceWorksSc
[GeneratedRegex(@"^(Early|Middle|Late)\s(.*?)\s(\d{4})", RegexOptions.IgnoreCase, "en-US")]
private static partial Regex EstimatedDateRegex();
protected override ILocale Locale => new EnglishLocale();
protected override Locale Locale => Locale.English;
protected override SupportedLanguage[] SupportedLanguages =>
[

6
JSMR.Infrastructure/Scanning/JapaneseVoiceWorksScanner.cs
View File

@@ -1,7 +1,5 @@
using JSMR.Application.Common;
using JSMR.Application.Enums;
using JSMR.Domain.ValueObjects;
using JSMR.Infrastructure.Common.Locales;
using JSMR.Infrastructure.Common.SupportedLanguages;
using JSMR.Infrastructure.Http;
using System.Text.RegularExpressions;
@@ -15,7 +13,7 @@ public partial class JapaneseVoiceWorksScanner(IHtmlLoader loader) : VoiceWorksS
[GeneratedRegex("販売日:&nbsp;(.*?)年(.*?)月(.*)日", RegexOptions.IgnoreCase, "en-US")]
private static partial Regex SalesDateRegex();
protected override ILocale Locale => new JapaneseLocale();
protected override Locale Locale => Locale.Japanese;
protected override SupportedLanguage[] SupportedLanguages =>
[

16
JSMR.Infrastructure/Scanning/LocaleMap.cs Normal file
View File

@@ -0,0 +1,16 @@
using JSMR.Application.Enums;
namespace JSMR.Infrastructure.Scanning;
internal class LocaleMap
{
public static readonly IReadOnlyDictionary<Locale, (string Abbreviation, string Code)> Map =
new Dictionary<Locale, (string, string)>
{
{ Locale.Japanese, ("jp", "ja_JP") },
{ Locale.English, ("en", "en_US") },
{ Locale.ChineseSimplified, ("zh-cn", "zh_CN") },
{ Locale.ChineseTraditional, ("zh-tw", "zh_TW") },
{ Locale.Korean, ("ko", "ko_KR") },
};
}

4
JSMR.Infrastructure/Scanning/VoiceWorksScanner.cs
View File

@@ -1,9 +1,9 @@
using HtmlAgilityPack;
using JSMR.Application.Enums;
using JSMR.Application.Scanning.Contracts;
using JSMR.Application.Scanning.Ports;
using JSMR.Domain.Enums;
using JSMR.Domain.ValueObjects;
using JSMR.Infrastructure.Common.Locales;
using JSMR.Infrastructure.Http;
using JSMR.Infrastructure.Scanning.Models;
using System.Globalization;
@@ -13,7 +13,7 @@ namespace JSMR.Infrastructure.Scanning;
public abstract class VoiceWorksScanner(IHtmlLoader htmlLoader) : IVoiceWorksScanner
{
protected abstract ILocale Locale { get; }
protected abstract Locale Locale { get; }
protected abstract SupportedLanguage[] SupportedLanguages { get; }
protected abstract DateOnly? GetEstimatedReleaseDate(string expectedDate);