brister/jsmr
1
0
Fork 0
Code Issues 1 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

10
JSMR.Infrastructure/Common/Locales/EnglishLocale.cs
View File

@@ -1,7 +1,7 @@
namespace JSMR.Infrastructure.Common.Locales;
public class EnglishLocale : ILocale
{
public string Abbreviation => "en";
public string Code => "en_US";
}
//public class EnglishLocale : ILocale
//{
// public string Abbreviation => "en";
// public string Code => "en_US";
//}

10
JSMR.Infrastructure/Common/Locales/ILocale.cs
View File

@@ -1,7 +1,7 @@
namespace JSMR.Infrastructure.Common.Locales;
public interface ILocale
{
string Abbreviation { get; }
string Code { get; }
}
//public interface ILocale
//{
// string Abbreviation { get; }
// string Code { get; }
//}

10
JSMR.Infrastructure/Common/Locales/JapaneseLocale.cs
View File

@@ -1,7 +1,7 @@
namespace JSMR.Infrastructure.Common.Locales;
public class JapaneseLocale : ILocale
{
public string Abbreviation => "jp";
public string Code => "ja_JP";
}
//public class JapaneseLocale : ILocale
//{
// public string Abbreviation => "jp";
// public string Code => "ja_JP";
//}

61
JSMR.Infrastructure/Integrations/DLSite/Mapping/DLSiteToDomainMapper.cs
View File

@@ -16,25 +16,6 @@ public static class DLSiteToDomainMapper
private const string OptAIFull = "AIG";
private const string OptAIPartial = "AIP";
private static readonly (string Code, Language Lang)[] SupportedLanguageFlags =
[
(SupportedLanguage.Japanese.Code, Language.Japanese),
(SupportedLanguage.English.Code, Language.English),
(SupportedLanguage.ChineseTraditional.Code, Language.ChineseTraditional),
(SupportedLanguage.ChineseSimplified.Code, Language.ChineseSimplified)
];
private static readonly (string Code, SupportedLanguage Lang)[] SupportedLanguageFlags2 =
[
(SupportedLanguage.Japanese.Code, SupportedLanguage.Japanese),
(SupportedLanguage.English.Code, SupportedLanguage.English),
(SupportedLanguage.ChineseTraditional.Code, SupportedLanguage.ChineseTraditional),
(SupportedLanguage.ChineseSimplified.Code, SupportedLanguage.ChineseSimplified)
];
private static readonly Dictionary<string, Language> TranslationLanguageMap =
SupportedLanguageFlags.ToDictionary(x => x.Code, x => x.Lang, StringComparer.OrdinalIgnoreCase);
private static readonly Dictionary<int, AgeRating> AgeRatingMap = new()
{
{ 1, AgeRating.AllAges },
@@ -89,11 +70,10 @@ public static class DLSiteToDomainMapper
if (string.IsNullOrWhiteSpace(productInfo.TitleId) || string.IsNullOrWhiteSpace(productInfo.TitleName))
return null;
return new VoiceWorkSeries
{
Identifier = productInfo.TitleId,
Name = productInfo.TitleName
};
return new VoiceWorkSeries(
Identifier: productInfo.TitleId,
Name: productInfo.TitleName
);
}
private static VoiceWorkTranslation? MapTranslation(ProductInfo info, HashSet<string> options)
@@ -108,30 +88,37 @@ public static class DLSiteToDomainMapper
if (!options.Contains(languageCode))
return null;
if (!TranslationLanguageMap.TryGetValue(languageCode, out Language language))
if (!SupportedLanguage.TryFromCode(languageCode, out SupportedLanguage? supportedLanguage))
return null;
string originalId = translationInfo.OriginalWorkNumber;
bool isOfficial = options.Contains(OptOfficialTranslation);
bool isRecommended = options.Contains(OptRecommendedTranslation);
return new VoiceWorkTranslation
{
OriginalProductId = originalId,
Language = language,
IsOfficialTranslation = isOfficial,
IsRecommendedTranslation = isRecommended
};
TranslationKind translationKind = TranslationKind.None;
if (options.Contains(OptOfficialTranslation))
translationKind |= TranslationKind.Official;
if (options.Contains(OptRecommendedTranslation))
translationKind |= TranslationKind.Recommended;
//bool isOfficial = options.Contains(OptOfficialTranslation);
//bool isRecommended = options.Contains(OptRecommendedTranslation);
return new VoiceWorkTranslation(
OriginalProductId: originalId,
Language: supportedLanguage.Language,
Kind: translationKind
);
}
private static SupportedLanguage[] MapSupportedLanguages(HashSet<string> options)
{
List<SupportedLanguage> languages = [];
foreach (var (code, language) in SupportedLanguageFlags2)
foreach (SupportedLanguage supportedLanguage in SupportedLanguage.All)
{
if (options.Contains(code) && !languages.Contains(language))
languages.Add(language);
if (options.Contains(supportedLanguage.Code) && !languages.Contains(supportedLanguage))
languages.Add(supportedLanguage);
}
return [.. languages];

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);