Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace format extension

Browse Source
This commit is contained in:
Lightczx
2023-11-16 13:15:37 +08:00
parent f1c50dc6c3
commit ba6ee9bb85
61 changed files with 190 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/Snap.Hutao/Snap.Hutao.SourceGeneration/Resx/ResxGenerator.cs
View File

@@ -44,39 +44,39 @@ public sealed class ResxGenerator : IIncrementalGenerator
.OrderBy(x => x.Key, StringComparer.Ordinal);
List<IGrouping<string, AdditionalText>> resxGroups = [.. group];
foreach (IGrouping<string, AdditionalText>? resxGroug in resxGroups)
foreach (IGrouping<string, AdditionalText>? resxGroup in resxGroups)
{
string? rootNamespaceConfiguration = GetMetadataValue(context, options, "RootNamespace", resxGroug);
string? projectDirConfiguration = GetMetadataValue(context, options, "ProjectDir", resxGroug);
string? namespaceConfiguration = GetMetadataValue(context, options, "Namespace", "DefaultResourcesNamespace", resxGroug);
string? resourceNameConfiguration = GetMetadataValue(context, options, "ResourceName", globalName: null, resxGroug);
string? classNameConfiguration = GetMetadataValue(context, options, "ClassName", globalName: null, resxGroug);
string? rootNamespaceConfiguration = GetMetadataValue(context, options, "RootNamespace", resxGroup);
string? projectDirConfiguration = GetMetadataValue(context, options, "ProjectDir", resxGroup);
string? namespaceConfiguration = GetMetadataValue(context, options, "Namespace", "DefaultResourcesNamespace", resxGroup);
string? resourceNameConfiguration = GetMetadataValue(context, options, "ResourceName", globalName: null, resxGroup);
string? classNameConfiguration = GetMetadataValue(context, options, "ClassName", globalName: null, resxGroup);
string rootNamespace = rootNamespaceConfiguration ?? assemblyName ?? "";
string projectDir = projectDirConfiguration ?? assemblyName ?? "";
string? defaultResourceName = ComputeResourceName(rootNamespace, projectDir, resxGroug.Key);
string? defaultNamespace = ComputeNamespace(rootNamespace, projectDir, resxGroug.Key);
string? defaultResourceName = ComputeResourceName(rootNamespace, projectDir, resxGroup.Key);
string? defaultNamespace = ComputeNamespace(rootNamespace, projectDir, resxGroup.Key);
string? ns = namespaceConfiguration ?? defaultNamespace;
string? resourceName = resourceNameConfiguration ?? defaultResourceName;
string className = classNameConfiguration ?? ToCSharpNameIdentifier(Path.GetFileName(resxGroug.Key));
string className = classNameConfiguration ?? ToCSharpNameIdentifier(Path.GetFileName(resxGroup.Key));
if (ns == null)
{
context.ReportDiagnostic(Diagnostic.Create(InvalidPropertiesForNamespace, location: null, resxGroug.First().Path));
context.ReportDiagnostic(Diagnostic.Create(InvalidPropertiesForNamespace, location: null, resxGroup.First().Path));
}
if (resourceName == null)
{
context.ReportDiagnostic(Diagnostic.Create(InvalidPropertiesForResourceName, location: null, resxGroug.First().Path));
context.ReportDiagnostic(Diagnostic.Create(InvalidPropertiesForResourceName, location: null, resxGroup.First().Path));
}
List<ResxEntry>? entries = LoadResourceFiles(context, resxGroug);
List<ResxEntry>? entries = LoadResourceFiles(context, resxGroup);
string content = $"""
// Debug info:
// key: {resxGroug.Key}
// files: {string.Join(", ", resxGroug.Select(f => f.Path))}
// key: {resxGroup.Key}
// files: {string.Join(", ", resxGroup.Select(f => f.Path))}
// RootNamespace (metadata): {rootNamespaceConfiguration}
// ProjectDir (metadata): {projectDirConfiguration}
// Namespace / DefaultResourcesNamespace (metadata): {namespaceConfiguration}
@@ -97,7 +97,7 @@ public sealed class ResxGenerator : IIncrementalGenerator
content += GenerateCode(ns, className, resourceName, entries, supportNullableReferenceTypes);
}
context.AddSource($"{Path.GetFileName(resxGroug.Key)}.resx.g.cs", SourceText.From(content, Encoding.UTF8));
context.AddSource($"{Path.GetFileName(resxGroup.Key)}.resx.g.cs", SourceText.From(content, Encoding.UTF8));
}
}
@@ -285,7 +285,10 @@ public sealed class ResxGenerator : IIncrementalGenerator
if (!entry.IsFileRef)
{
summary.Add(new XElement("para", $"Value: \"{entry.Value}\"."));
foreach((string? each, string locale) in entry.Values.Zip(entry.Locales,(x,y)=>(x,y)))
{
summary.Add(new XElement("para", $"{GetStringWithPadding(locale, 8)} Value: \"{each}\""));
}
}
string comment = summary.ToString().Replace("\r\n", "\r\n /// ", StringComparison.Ordinal);
@@ -299,9 +302,9 @@ public sealed class ResxGenerator : IIncrementalGenerator
""");
if (entry.Value != null)
if (entry.Values.FirstOrDefault() is string value)
{
int args = Regex.Matches(entry.Value, "\\{(?<num>[0-9]+)(\\:[^}]*)?\\}", RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant)
int args = Regex.Matches(value, "\\{(?<num>[0-9]+)(\\:[^}]*)?\\}", RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant)
.Cast<Match>()
.Select(m => int.Parse(m.Groups["num"].Value, CultureInfo.InvariantCulture))
.Distinct()
@@ -360,6 +363,16 @@ public sealed class ResxGenerator : IIncrementalGenerator
return sb.ToString();
}
private static string GetStringWithPadding(string source, int length)
{
if (source.Length >= length)
{
return source;
}
return source + new string('_', length - source.Length);
}
private static string? ComputeResourceName(string rootNamespace, string projectDir, string resourcePath)
{
string fullProjectDir = EnsureEndSeparator(Path.GetFullPath(projectDir));
@@ -404,7 +417,7 @@ public sealed class ResxGenerator : IIncrementalGenerator
foreach (AdditionalText? entry in resxGroug.OrderBy(file => file.Path, StringComparer.Ordinal))
{
SourceText? content = entry.GetText(context.CancellationToken);
if (content == null)
if (content is null)
{
continue;
}
@@ -423,10 +436,12 @@ public sealed class ResxGenerator : IIncrementalGenerator
if (existingEntry != null)
{
existingEntry.Comment ??= comment;
existingEntry.Values.Add(value);
existingEntry.Locales.Add(GetLocaleName(entry.Path));
}
else
{
entries.Add(new ResxEntry { Name = name, Value = value, Comment = comment, Type = type });
entries.Add(new() { Name = name, Values = [value], Locales = [GetLocaleName(entry.Path)], Comment = comment, Type = type });
}
}
}
@@ -532,15 +547,28 @@ public sealed class ResxGenerator : IIncrementalGenerator
return pathWithoutExtension;
}
return Regex.IsMatch(pathWithoutExtension.Substring(indexOf + 1), "^[a-zA-Z]{2}(-[a-zA-Z]{2})?$", RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant, TimeSpan.FromSeconds(1))
return Regex.IsMatch(pathWithoutExtension.Substring(indexOf + 1), "^[a-zA-Z]{2}(-[a-zA-Z]{2,4})?$", RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant, TimeSpan.FromSeconds(1))
? pathWithoutExtension.Substring(0, indexOf)
: pathWithoutExtension;
}
private static string GetLocaleName(string path)
{
string fileName = Path.GetFileNameWithoutExtension(path);
int indexOf = fileName.LastIndexOf('.');
if (indexOf < 0)
{
return "Neutral";
}
return fileName.Substring(indexOf + 1);
}
private sealed class ResxEntry
{
public string? Name { get; set; }
public string? Value { get; set; }
public List<string?> Values { get; set; } = default!;
public List<string> Locales { get; set; } = default!;
public string? Comment { get; set; }
public string? Type { get; set; }
@@ -553,9 +581,9 @@ public sealed class ResxGenerator : IIncrementalGenerator
return true;
}
if (Value != null)
if (Values.FirstOrDefault() is string value)
{
string[] parts = Value.Split(';');
string[] parts = value.Split(';');
if (parts.Length > 1)
{
string type = parts[1];
@@ -579,9 +607,9 @@ public sealed class ResxGenerator : IIncrementalGenerator
return "string";
}
if (Value != null)
if (Values.FirstOrDefault() is string value)
{
string[] parts = Value.Split(';');
string[] parts = value.Split(';');
if (parts.Length > 1)
{
string type = parts[1];

2
src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
View File

@@ -110,7 +110,7 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
if (exception is HttpRequestException httpRequestException)
{
infoBarService.Error(httpRequestException, SH.ControlImageCompositionImageHttpRequest.Format(uri));
infoBarService.Error(httpRequestException, SH.FormatControlImageCompositionImageHttpRequest(uri));
}
else
{

2
src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/DatabaseCorruptedException.cs
View File

@@ -15,7 +15,7 @@ internal sealed class DatabaseCorruptedException : Exception
/// <param name="message">消息</param>
/// <param name="innerException">内部错误</param>
public DatabaseCorruptedException(string message, Exception? innerException)
: base(SH.CoreExceptionServiceDatabaseCorruptedMessage.Format($"{message}\n{innerException?.Message}"), innerException)
: base(SH.FormatCoreExceptionServiceDatabaseCorruptedMessage($"{message}\n{innerException?.Message}"), innerException)
{
}
}

2
src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/UserdataCorruptedException.cs
View File

@@ -15,7 +15,7 @@ internal sealed class UserdataCorruptedException : Exception
/// <param name="message">消息</param>
/// <param name="innerException">内部错误</param>
public UserdataCorruptedException(string message, Exception? innerException)
: base(SH.CoreExceptionServiceUserdataCorruptedMessage.Format($"{message}\n{innerException?.Message}"), innerException)
: base(SH.FormatCoreExceptionServiceUserdataCorruptedMessage($"{message}\n{innerException?.Message}"), innerException)
{
}
}

2
src/Snap.Hutao/Snap.Hutao/Core/IO/PickerExtension.cs
View File

@@ -98,7 +98,7 @@ internal static class PickerExtension
.GetRequiredService<IInfoBarService>()
.Warning(
SH.CoreIOPickerExtensionPickerExceptionInfoBarTitle,
SH.CoreIOPickerExtensionPickerExceptionInfoBarMessage.Format(exception.Message));
SH.FormatCoreIOPickerExtensionPickerExceptionInfoBarMessage(exception.Message));
}
}
}

2
src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
View File

@@ -55,7 +55,7 @@ internal sealed class WindowController
{
RuntimeOptions hutaoOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
window.AppWindow.Title = SH.AppNameAndVersion.Format(hutaoOptions.Version);
window.AppWindow.Title = SH.FormatAppNameAndVersion(hutaoOptions.Version);
window.AppWindow.SetIcon(Path.Combine(hutaoOptions.InstalledLocation, "Assets/Logo.ico"));
ExtendsContentIntoTitleBar();

18
src/Snap.Hutao/Snap.Hutao/Extension/StringExtension.cs
View File

@@ -28,22 +28,4 @@ internal static class StringExtension
{
return source.AsSpan().TrimEnd(value).ToString();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string Format(this string value, object? arg)
{
return string.Format(CultureInfo.CurrentCulture, value, arg);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string Format(this string value, object? arg0, object? arg1)
{
return string.Format(CultureInfo.CurrentCulture, value, arg0, arg1);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string Format(this string value, object? arg0, object? arg1, object? arg2)
{
return string.Format(CultureInfo.CurrentCulture, value, arg0, arg1, arg2);
}
}

4
src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
View File

@@ -64,7 +64,7 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
{
return RefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
? SH.ModelEntityDailyNoteNotRefreshed
: SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime);
: SH.FormatModelEntityDailyNoteRefreshTimeFormat(RefreshTime.ToLocalTime());
}
}
@@ -143,7 +143,7 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
DailyNote = dailyNote;
OnPropertyChanged(nameof(DailyNote));
RefreshTime = DateTimeOffset.Now;
RefreshTime = DateTimeOffset.UtcNow;
OnPropertyChanged(nameof(RefreshTimeFormatted));
}
}

2
src/Snap.Hutao/Snap.Hutao/Model/Entity/ObjectCacheEntry.cs
View File

@@ -28,7 +28,7 @@ internal sealed class ObjectCacheEntry
/// 获取该对象是否过期
/// </summary>
[NotMapped]
public bool IsExpired { get => ExpireTime < DateTimeOffset.Now; }
public bool IsExpired { get => ExpireTime < DateTimeOffset.UtcNow; }
/// <summary>
/// 值字符串

2
src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFInfo.cs
View File

@@ -49,7 +49,7 @@ internal sealed class UIAFInfo : IMappingFrom<UIAFInfo, RuntimeOptions>
{
return new()
{
ExportTimestamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
ExportTimestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
ExportApp = SH.AppName,
ExportAppVersion = runtimeOptions.Version.ToString(),
UIAFVersion = UIAF.CurrentVersion,

2
src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGFInfo.cs
View File

@@ -71,7 +71,7 @@ internal sealed class UIGFInfo : IMappingFrom<UIGFInfo, RuntimeOptions, Metadata
{
Uid = uid,
Language = metadataOptions.LanguageCode,
ExportTimestamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
ExportTimestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
ExportApp = SH.AppName,
ExportAppVersion = runtimeOptions.Version.ToString(),
UIGFVersion = UIGF.CurrentVersion,

2
src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFInfo.cs
View File

@@ -69,7 +69,7 @@ internal sealed class UIIFInfo
return new()
{
Uid = uid,
ExportTimestamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
ExportTimestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
ExportApp = SH.AppName,
ExportAppVersion = hutaoOptions.Version.ToString(),
UIIFVersion = UIIF.CurrentVersion,

2
src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/FetterInfo.cs
View File

@@ -46,7 +46,7 @@ internal sealed class FetterInfo
/// </summary>
public string BirthFormatted
{
get => SH.ModelMetadataFetterInfoBirthdayFormat.Format(BirthMonth, BirthDay);
get => SH.FormatModelMetadataFetterInfoBirthdayFormat(BirthMonth, BirthDay);
}
/// <summary>

2
src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/LevelDescription.cs
View File

@@ -19,7 +19,7 @@ internal sealed class LevelDescription
/// 格式化的等级
/// </summary>
[JsonIgnore]
public string LevelFormatted { get => SH.ModelWeaponAffixFormat.Format(Level + 1); }
public string LevelFormatted { get => SH.FormatModelWeaponAffixFormat(Level + 1); }
/// <summary>
/// 描述

2
src/Snap.Hutao/Snap.Hutao/Service/Achievement/ImportResult.cs
View File

@@ -40,6 +40,6 @@ internal readonly struct ImportResult
/// <inheritdoc/>
public override string ToString()
{
return SH.ServiceAchievementImportResultFormat.Format(Add, Update, Remove);
return SH.FormatServiceAchievementImportResultFormat(Add, Update, Remove);
}
}

12
src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoDbBulkOperation.cs
View File

@@ -181,13 +181,13 @@ internal sealed partial class AvatarInfoDbBulkOperation
if (entity is null)
{
entity = EntityAvatarInfo.From(uid, webInfo);
entity.ShowcaseRefreshTime = DateTimeOffset.Now;
entity.ShowcaseRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.AddAndSave(entity);
}
else
{
entity.Info = webInfo;
entity.ShowcaseRefreshTime = DateTimeOffset.Now;
entity.ShowcaseRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.UpdateAndSave(entity);
}
}
@@ -200,7 +200,7 @@ internal sealed partial class AvatarInfoDbBulkOperation
EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId };
transformer.Transform(ref avatarInfo, source);
entity = EntityAvatarInfo.From(uid, avatarInfo);
entity.CalculatorRefreshTime = DateTimeOffset.Now;
entity.CalculatorRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.AddAndSave(entity);
}
else
@@ -208,7 +208,7 @@ internal sealed partial class AvatarInfoDbBulkOperation
EnkaAvatarInfo avatarInfo = entity.Info;
transformer.Transform(ref avatarInfo, source);
entity.Info = avatarInfo;
entity.CalculatorRefreshTime = DateTimeOffset.Now;
entity.CalculatorRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.UpdateAndSave(entity);
}
}
@@ -221,7 +221,7 @@ internal sealed partial class AvatarInfoDbBulkOperation
EnkaAvatarInfo avatarInfo = new() { AvatarId = avatarId };
transformer.Transform(ref avatarInfo, source);
entity = EntityAvatarInfo.From(uid, avatarInfo);
entity.GameRecordRefreshTime = DateTimeOffset.Now;
entity.GameRecordRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.AddAndSave(entity);
}
else
@@ -229,7 +229,7 @@ internal sealed partial class AvatarInfoDbBulkOperation
EnkaAvatarInfo avatarInfo = entity.Info;
transformer.Transform(ref avatarInfo, source);
entity.Info = avatarInfo;
entity.GameRecordRefreshTime = DateTimeOffset.Now;
entity.GameRecordRefreshTime = DateTimeOffset.UtcNow;
appDbContext.AvatarInfos.UpdateAndSave(entity);
}
}

6
src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs
View File

@@ -80,13 +80,13 @@ internal sealed class SummaryAvatarFactory
// times
ShowcaseRefreshTimeFormat = showcaseRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
? SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed
: SH.ServiceAvatarInfoSummaryShowcaseRefreshTimeFormat.Format(showcaseRefreshTime),
: SH.FormatServiceAvatarInfoSummaryShowcaseRefreshTimeFormat(showcaseRefreshTime.ToLocalTime()),
GameRecordRefreshTimeFormat = gameRecordRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
? SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed
: SH.ServiceAvatarInfoSummaryGameRecordRefreshTimeFormat.Format(gameRecordRefreshTime),
: SH.FormatServiceAvatarInfoSummaryGameRecordRefreshTimeFormat(gameRecordRefreshTime.ToLocalTime()),
CalculatorRefreshTimeFormat = calculatorRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
? SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed
: SH.ServiceAvatarInfoSummaryCalculatorRefreshTimeFormat.Format(calculatorRefreshTime),
: SH.FormatServiceAvatarInfoSummaryCalculatorRefreshTimeFormat(calculatorRefreshTime.ToLocalTime()),
};
ApplyCostumeIconOrDefault(ref propertyAvatar, avatar);

4
src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteNotificationOperation.cs
View File

@@ -139,7 +139,7 @@ internal sealed partial class DailyNoteNotificationOperation
SH.ServiceDailyNoteNotifierResin,
Web.HutaoEndpoints.StaticFile("ItemIcon", "UI_ItemIcon_210.png"),
$"{entry.DailyNote.CurrentResin}",
SH.ServiceDailyNoteNotifierResinCurrent.Format(entry.DailyNote.CurrentResin)));
SH.FormatServiceDailyNoteNotifierResinCurrent(entry.DailyNote.CurrentResin)));
entry.ResinNotifySuppressed = true;
}
}
@@ -160,7 +160,7 @@ internal sealed partial class DailyNoteNotificationOperation
SH.ServiceDailyNoteNotifierHomeCoin,
Web.HutaoEndpoints.StaticFile("ItemIcon", "UI_ItemIcon_204.png"),
$"{entry.DailyNote.CurrentHomeCoin}",
SH.ServiceDailyNoteNotifierHomeCoinCurrent.Format(entry.DailyNote.CurrentHomeCoin)));
SH.FormatServiceDailyNoteNotifierHomeCoinCurrent(entry.DailyNote.CurrentHomeCoin)));
entry.HomeCoinNotifySuppressed = true;
}
}

2
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs
View File

@@ -132,7 +132,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
default:
// ItemId string length not correct.
ThrowHelper.UserdataCorrupted(SH.ServiceGachaStatisticsFactoryItemIdInvalid.Format(item.ItemId), default!);
ThrowHelper.UserdataCorrupted(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(item.ItemId), default!);
break;
}
}

4
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/HutaoStatisticsFactory.cs
View File

@@ -26,7 +26,7 @@ internal sealed class HutaoStatisticsFactory
// TODO: when in new verion
// due to lack of newer metadata
// this can crash
DateTimeOffset now = DateTimeOffset.Now;
DateTimeOffset now = DateTimeOffset.UtcNow;
avatarEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.AvatarEventWish);
avatarEvent2 = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.AvatarEventWish2);
weaponEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.WeaponEventWish);
@@ -55,7 +55,7 @@ internal sealed class HutaoStatisticsFactory
{
8U => context.IdAvatarMap[item.Item],
5U => context.IdWeaponMap[item.Item],
_ => throw ThrowHelper.UserdataCorrupted(SH.ServiceGachaStatisticsFactoryItemIdInvalid.Format(item.Item), default!),
_ => throw ThrowHelper.UserdataCorrupted(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(item.Item), default!),
};
StatisticsItem statisticsItem = source.ToStatisticsItem(unchecked((int)item.Count));

2
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogDbService.cs
View File

@@ -30,7 +30,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
}
catch (SqliteException ex)
{
string message = SH.ServiceGachaLogArchiveCollectionUserdataCorruptedMessage.Format(ex.Message);
string message = SH.FormatServiceGachaLogArchiveCollectionUserdataCorruptedMessage(ex.Message);
throw ThrowHelper.UserdataCorrupted(message, ex);
}
}

2
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogFetchStatus.cs
View File

@@ -41,7 +41,7 @@ internal sealed class GachaLogFetchStatus
{
return AuthKeyTimeout
? SH.ViewDialogGachaLogRefreshProgressAuthkeyTimeout
: SH.ViewDialogGachaLogRefreshProgressDescription.Format(ConfigType.GetLocalizedDescription());
: SH.FormatViewDialogGachaLogRefreshProgressDescription(ConfigType.GetLocalizedDescription());
}
}
}

3
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryManualInputProvider.cs
View File

@@ -39,8 +39,7 @@ internal sealed partial class GachaLogQueryManualInputProvider : IGachaLogQueryP
}
else
{
string message = SH.ServiceGachaLogUrlProviderUrlLanguageNotMatchCurrentLocale
.Format(queryLanguageCode, metadataOptions.LanguageCode);
string message = SH.FormatServiceGachaLogUrlProviderUrlLanguageNotMatchCurrentLocale(queryLanguageCode, metadataOptions.LanguageCode);
return new(false, message);
}
}

7
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs
View File

@@ -5,6 +5,7 @@ using Snap.Hutao.Core.IO;
using Snap.Hutao.Service.Game;
using Snap.Hutao.Service.Metadata;
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
@@ -70,7 +71,8 @@ internal sealed partial class GachaLogQueryWebCacheProvider : IGachaLogQueryProv
{
if (!tempFile.TryGetValue(out TempFile file))
{
return new(false, Regex.Unescape(SH.ServiceGachaLogUrlProviderCachePathNotFound).Format(cacheFile));
string unescaped = Regex.Unescape(SH.ServiceGachaLogUrlProviderCachePathNotFound);
return new(false, string.Format(CultureInfo.CurrentCulture, unescaped, cacheFile));
}
using (FileStream fileStream = new(file.Path, FileMode.Open, FileAccess.Read, FileShare.Read))
@@ -93,8 +95,7 @@ internal sealed partial class GachaLogQueryWebCacheProvider : IGachaLogQueryProv
return new(true, new(result));
}
string message = SH.ServiceGachaLogUrlProviderUrlLanguageNotMatchCurrentLocale
.Format(queryLanguageCode, metadataOptions.LanguageCode);
string message = SH.FormatServiceGachaLogUrlProviderUrlLanguageNotMatchCurrentLocale(queryLanguageCode, metadataOptions.LanguageCode);
return new(false, message);
}
}

8
src/Snap.Hutao/Snap.Hutao/Service/GachaLog/UIGFImportService.cs
View File

@@ -39,13 +39,13 @@ internal sealed partial class UIGFImportService : IUIGFImportService
{
if (!metadataOptions.IsCurrentLocale(uigf.Info.Language))
{
string message = SH.ServiceGachaUIGFImportLanguageNotMatch.Format(uigf.Info.Language, metadataOptions.LanguageCode);
string message = SH.FormatServiceGachaUIGFImportLanguageNotMatch(uigf.Info.Language, metadataOptions.LanguageCode);
ThrowHelper.InvalidOperation(message);
}
if (!uigf.IsMajor2Minor2OrLowerListValid(out long id))
{
string message = SH.ServiceGachaLogUIGFImportItemInvalidFormat.Format(id);
string message = SH.FormatServiceGachaLogUIGFImportItemInvalidFormat(id);
ThrowHelper.InvalidOperation(message);
}
}
@@ -54,7 +54,7 @@ internal sealed partial class UIGFImportService : IUIGFImportService
{
if (!uigf.IsMajor2Minor3OrHigherListValid(out long id))
{
string message = SH.ServiceGachaLogUIGFImportItemInvalidFormat.Format(id);
string message = SH.FormatServiceGachaLogUIGFImportItemInvalidFormat(id);
ThrowHelper.InvalidOperation(message);
}
}
@@ -98,7 +98,7 @@ internal sealed partial class UIGFImportService : IUIGFImportService
// 因此从尾部开始查找
if (currentTypeToAdd.LastOrDefault(item => item.ItemId is 0U) is { } item)
{
ThrowHelper.InvalidOperation(SH.ServiceGachaLogUIGFImportItemInvalidFormat.Format(item.Id));
ThrowHelper.InvalidOperation(SH.FormatServiceGachaLogUIGFImportItemInvalidFormat(item.Id));
}
}
}

4
src/Snap.Hutao/Snap.Hutao/Service/Game/Configuration/GameChannelOptionsService.cs
View File

@@ -53,11 +53,11 @@ internal sealed partial class GameChannelOptionsService : IGameChannelOptionsSer
}
catch (FileNotFoundException ex)
{
ThrowHelper.GameFileOperation(SH.ServiceGameSetMultiChannelConfigFileNotFound.Format(configPath), ex);
ThrowHelper.GameFileOperation(SH.FormatServiceGameSetMultiChannelConfigFileNotFound(configPath), ex);
}
catch (DirectoryNotFoundException ex)
{
ThrowHelper.GameFileOperation(SH.ServiceGameSetMultiChannelConfigFileNotFound.Format(configPath), ex);
ThrowHelper.GameFileOperation(SH.FormatServiceGameSetMultiChannelConfigFileNotFound(configPath), ex);
}
catch (UnauthorizedAccessException ex)
{

2
src/Snap.Hutao/Snap.Hutao/Service/Game/GameFileOperationException.cs
View File

@@ -15,7 +15,7 @@ internal sealed class GameFileOperationException : Exception
/// <param name="message">消息</param>
/// <param name="innerException">内部错误</param>
public GameFileOperationException(string message, Exception? innerException)
: base(SH.ServiceGameFileOperationExceptionMessage.Format(message), innerException)
: base(SH.FormatServiceGameFileOperationExceptionMessage(message), innerException)
{
}
}

15
src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs
View File

@@ -8,6 +8,7 @@ using Snap.Hutao.Core.IO;
using Snap.Hutao.Core.IO.Hashing;
using Snap.Hutao.Service.Game.Scheme;
using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher;
using System.Globalization;
using System.IO;
using System.IO.Compression;
using System.Net.Http;
@@ -236,7 +237,7 @@ internal sealed partial class PackageConverter
private async ValueTask SkipOrDownloadAsync(ItemOperationInfo info, PackageConvertContext context, IProgress<PackageReplaceStatus> progress)
{
// 还原正确的远程地址
string remoteName = info.Remote.RelativePath.Format(context.ToDataFolderName);
string remoteName = string.Format(CultureInfo.CurrentCulture, info.Remote.RelativePath, context.ToDataFolderName);
string cacheFile = context.GetServerCacheTargetFilePath(remoteName);
if (File.Exists(cacheFile))
@@ -283,7 +284,7 @@ internal sealed partial class PackageConverter
{
// System.IO.IOException: The response ended prematurely.
// System.IO.IOException: Received an unexpected EOF or 0 bytes from the transport stream.
ThrowHelper.PackageConvert(SH.ServiceGamePackageRequestScatteredFileFailed.Format(remoteName), ex);
ThrowHelper.PackageConvert(SH.FormatServiceGamePackageRequestScatteredFileFailed(remoteName), ex);
}
}
}
@@ -306,8 +307,8 @@ internal sealed partial class PackageConverter
// 先备份
if (moveToBackup)
{
string localFileName = info.Local.RelativePath.Format(context.FromDataFolderName);
progress.Report(new(SH.ServiceGamePackageConvertMoveFileBackupFormat.Format(localFileName)));
string localFileName = string.Format(CultureInfo.CurrentCulture, info.Local.RelativePath, context.FromDataFolderName);
progress.Report(new(SH.FormatServiceGamePackageConvertMoveFileBackupFormat(localFileName)));
string localFilePath = context.GetGameFolderFilePath(localFileName);
string cacheFilePath = context.GetServerCacheBackupFilePath(localFileName);
@@ -322,8 +323,8 @@ internal sealed partial class PackageConverter
// 后替换
if (moveToTarget)
{
string targetFileName = info.Remote.RelativePath.Format(context.ToDataFolderName);
progress.Report(new(SH.ServiceGamePackageConvertMoveFileRestoreFormat.Format(targetFileName)));
string targetFileName = string.Format(CultureInfo.CurrentCulture, info.Remote.RelativePath, context.ToDataFolderName);
progress.Report(new(SH.FormatServiceGamePackageConvertMoveFileRestoreFormat(targetFileName)));
string targetFilePath = context.GetGameFolderFilePath(targetFileName);
string? targetFileDirectory = Path.GetDirectoryName(targetFilePath);
@@ -339,7 +340,7 @@ internal sealed partial class PackageConverter
// 重命名 _Data 目录
try
{
progress.Report(new(SH.ServiceGamePackageConvertMoveFileRenameFormat.Format(context.FromDataFolderName, context.ToDataFolderName)));
progress.Report(new(SH.FormatServiceGamePackageConvertMoveFileRenameFormat(context.FromDataFolderName, context.ToDataFolderName)));
DirectoryOperation.Move(context.FromDataFolder, context.ToDataFolder);
}
catch (IOException ex)

4
src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoAsAService.cs
View File

@@ -54,13 +54,13 @@ internal sealed partial class HutaoAsAService : IHutaoAsAService
foreach ((string key, object value) in excludedIds)
{
if (value is DateTimeOffset time && time < DateTimeOffset.Now - TimeSpan.FromDays(AnnouncementDuration))
if (value is DateTimeOffset time && time < DateTimeOffset.UtcNow - TimeSpan.FromDays(AnnouncementDuration))
{
excludedIds.Remove(key);
}
}
excludedIds.TryAdd($"{announcement.Id}", DateTimeOffset.Now + TimeSpan.FromDays(AnnouncementDuration));
excludedIds.TryAdd($"{announcement.Id}", DateTimeOffset.UtcNow + TimeSpan.FromDays(AnnouncementDuration));
LocalSetting.Set(SettingKeys.ExcludedAnnouncementIds, excludedIds);
announcements.Remove(announcement);

4
src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoCache.cs
View File

@@ -184,7 +184,7 @@ internal sealed partial class HutaoCache : IHutaoCache
AvatarAppearanceRanks = avatarAppearanceRanksRaw.SortByDescending(r => r.Floor).SelectList(rank => new AvatarRankView
{
Floor = SH.ModelBindingHutaoComplexRankFloor.Format(rank.Floor),
Floor = SH.FormatModelBindingHutaoComplexRankFloor(rank.Floor),
Avatars = rank.Ranks.SortByDescending(r => r.Rate).SelectList(rank => new AvatarView(idAvatarMap[rank.Item], rank.Rate)),
});
}
@@ -201,7 +201,7 @@ internal sealed partial class HutaoCache : IHutaoCache
AvatarUsageRanks = avatarUsageRanksRaw.SortByDescending(r => r.Floor).SelectList(rank => new AvatarRankView
{
Floor = SH.ModelBindingHutaoComplexRankFloor.Format(rank.Floor),
Floor = SH.FormatModelBindingHutaoComplexRankFloor(rank.Floor),
Avatars = rank.Ranks.SortByDescending(r => r.Rate).SelectList(rank => new AvatarView(idAvatarMap[rank.Item], rank.Rate)),
});
}

6
src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs
View File

@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.Options;
using Snap.Hutao.Core.Setting;
using Snap.Hutao.Web.Hutao;
using System.Globalization;
using System.Text.RegularExpressions;
namespace Snap.Hutao.Service.Hutao;
@@ -118,9 +119,10 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions<HutaoUserOpt
{
IsLicensedDeveloper = userInfo.IsLicensedDeveloper;
IsMaintainer = userInfo.IsMaintainer;
GachaLogExpireAt = Regex.Unescape(SH.ServiceHutaoUserGachaLogExpiredAt).Format(userInfo.GachaLogExpireAt);
string unescaped = Regex.Unescape(SH.ServiceHutaoUserGachaLogExpiredAt);
GachaLogExpireAt = string.Format(CultureInfo.CurrentCulture, unescaped, userInfo.GachaLogExpireAt);
GachaLogExpireAtSlim = $"{userInfo.GachaLogExpireAt:yyyy.MM.dd HH:mm:ss}";
IsCloudServiceAllowed = IsLicensedDeveloper || userInfo.GachaLogExpireAt > DateTimeOffset.Now;
IsCloudServiceAllowed = IsLicensedDeveloper || userInfo.GachaLogExpireAt > DateTimeOffset.UtcNow;
}
public async ValueTask<string?> GetTokenAsync()

2
src/Snap.Hutao/Snap.Hutao/Service/Hutao/ObjectCacheDbService.cs
View File

@@ -25,7 +25,7 @@ internal sealed partial class ObjectCacheDbService : IObjectCacheDbService
await appDbContext.ObjectCache.AddAndSaveAsync(new()
{
Key = key,
ExpireTime = DateTimeOffset.Now.Add(expire),
ExpireTime = DateTimeOffset.UtcNow.Add(expire),
Value = JsonSerializer.Serialize(data, jsonSerializerOptions),
}).ConfigureAwait(false);
}

4
src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs
View File

@@ -33,7 +33,7 @@ internal sealed partial class SignInService : ISignInService
{
int index = infoResponse.Data.TotalSignDay - 1;
Award award = rewardResponse.Data.Awards[index];
return new(true, SH.ServiceSignInSuccessRewardFormat.Format(award.Name, award.Count));
return new(true, SH.FormatServiceSignInSuccessRewardFormat(award.Name, award.Count));
}
else
{
@@ -54,7 +54,7 @@ internal sealed partial class SignInService : ISignInService
message = $"RiskCode: {resultResponse.Data?.RiskCode}";
}
return new(false, SH.ServiceSignInClaimRewardFailedFormat.Format(message));
return new(false, SH.FormatServiceSignInClaimRewardFailedFormat(message));
}
}
else

2
src/Snap.Hutao/Snap.Hutao/Service/User/UserFingerprintService.cs
View File

@@ -68,7 +68,7 @@ internal sealed partial class UserFingerprintService : IUserFingerprintService
DeviceId = Core.Random.GetLowerHexString(16),
SeedId = $"{Guid.NewGuid()}",
Platform = "2",
SeedTime = $"{DateTimeOffset.Now.ToUnixTimeMilliseconds()}",
SeedTime = $"{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}",
ExtFields = JsonSerializer.Serialize(extendProperties),
AppName = "bbs_cn",
BbsDeviceId = HoyolabOptions.DeviceId,

4
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
View File

@@ -310,6 +310,10 @@
<ItemGroup>
<AdditionalFiles Include="Resource\Localization\SH.resx" />
<AdditionalFiles Include="Resource\Localization\SH.en.resx" />
<AdditionalFiles Include="Resource\Localization\SH.ja.resx" />
<AdditionalFiles Include="Resource\Localization\SH.ko.resx" />
<AdditionalFiles Include="Resource\Localization\SH.zh-Hant.resx" />
</ItemGroup>
<ItemGroup>

22
src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml.cs
View File

@@ -25,20 +25,16 @@ internal sealed partial class TitleView : UserControl
/// <summary>
/// 标题
/// </summary>
[SuppressMessage("", "CA1822")]
public string Title
{
[SuppressMessage("", "IDE0027")]
get
{
Core.RuntimeOptions hutaoOptions = Ioc.Default.GetRequiredService<Core.RuntimeOptions>();
string format =
#if DEBUG
SH.AppDevNameAndVersion;
return SH.FormatAppDevNameAndVersion(RuntimeOptions.Version);
#else
SH.AppNameAndVersion;
return SH.FormatAppNameAndVersion(RuntimeOptions.Version);
#endif
return format.Format(hutaoOptions.Version);
}
}
@@ -50,15 +46,7 @@ internal sealed partial class TitleView : UserControl
get => DragableGrid;
}
[SuppressMessage("", "CA1822")]
public RuntimeOptions RuntimeOptions
{
get => Ioc.Default.GetRequiredService<RuntimeOptions>();
}
public RuntimeOptions RuntimeOptions { get; } = Ioc.Default.GetRequiredService<RuntimeOptions>();
[SuppressMessage("", "CA1822")]
public HotKeyOptions HotKeyOptions
{
get => Ioc.Default.GetRequiredService<HotKeyOptions>();
}
public HotKeyOptions HotKeyOptions { get; } = Ioc.Default.GetRequiredService<HotKeyOptions>();
}

4
src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementView.cs
View File

@@ -54,7 +54,7 @@ internal sealed class AchievementView : ObservableObject, IEntityWithMetadata<Mo
if (SetProperty(ref isChecked, value))
{
(Entity.Status, Entity.Time) = value
? (AchievementStatus.STATUS_REWARD_TAKEN, DateTimeOffset.Now)
? (AchievementStatus.STATUS_REWARD_TAKEN, DateTimeOffset.UtcNow)
: (AchievementStatus.STATUS_INVALID, default);
OnPropertyChanged(nameof(Time));
@@ -67,6 +67,6 @@ internal sealed class AchievementView : ObservableObject, IEntityWithMetadata<Mo
/// </summary>
public string Time
{
get => $"{Entity.Time:yyyy.MM.dd HH:mm:ss}";
get => $"{Entity.Time.ToLocalTime():yyyy.MM.dd HH:mm:ss}";
}
}

6
src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
View File

@@ -206,13 +206,13 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
case ArchiveAddResult.Added:
await taskContext.SwitchToMainThreadAsync();
SelectedArchive = achievementService.CurrentArchive;
infoBarService.Success(SH.ViewModelAchievementArchiveAdded.Format(name));
infoBarService.Success(SH.FormatViewModelAchievementArchiveAdded(name));
break;
case ArchiveAddResult.InvalidName:
infoBarService.Warning(SH.ViewModelAchievementArchiveInvalidName);
break;
case ArchiveAddResult.AlreadyExists:
infoBarService.Warning(SH.ViewModelAchievementArchiveAlreadyExists.Format(name));
infoBarService.Warning(SH.FormatViewModelAchievementArchiveAlreadyExists(name));
break;
default:
throw Must.NeverHappen();
@@ -226,7 +226,7 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
{
if (Archives is not null && SelectedArchive is not null)
{
string title = SH.ViewModelAchievementRemoveArchiveTitle.Format(SelectedArchive.Name);
string title = SH.FormatViewModelAchievementRemoveArchiveTitle(SelectedArchive.Name);
string content = SH.ViewModelAchievementRemoveArchiveContent;
ContentDialogResult result = await contentDialogFactory
.CreateForConfirmCancelAsync(title, content)

4
src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs
View File

@@ -322,11 +322,11 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
if (result.Interrupted)
{
infoBarService.Warning(SH.ViewModelCultivationEntryAddWarning);
infoBarService.Warning(SH.ViewModelCultivationBatchAddIncompletedFormat.Format(result.SucceedCount, result.SkippedCount));
infoBarService.Warning(SH.FormatViewModelCultivationBatchAddIncompletedFormat(result.SucceedCount, result.SkippedCount));
}
else
{
infoBarService.Success(SH.ViewModelCultivationBatchAddCompletedFormat.Format(result.SucceedCount, result.SkippedCount));
infoBarService.Success(SH.FormatViewModelCultivationBatchAddCompletedFormat(result.SucceedCount, result.SkippedCount));
}
}
}

2
src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/WeaponView.cs
View File

@@ -26,7 +26,7 @@ internal sealed class WeaponView : Equip, ICalculableSource<ICalculableWeapon>
/// <summary>
/// 精炼属性
/// </summary>
public string AffixLevel { get => SH.ModelBindingAvatarPropertyWeaponAffixFormat.Format(AffixLevelNumber); }
public string AffixLevel { get => SH.FormatModelBindingAvatarPropertyWeaponAffixFormat(AffixLevelNumber); }
/// <summary>
/// 精炼名称

2
src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs
View File

@@ -29,7 +29,7 @@ internal sealed class Team : List<AvatarView>
Add(new(idAvatarMap[id]));
}
Rate = SH.ModelBindingHutaoTeamUpCountFormat.Format(team.Rate);
Rate = SH.FormatModelBindingHutaoTeamUpCountFormat(team.Rate);
}
/// <summary>

2
src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs
View File

@@ -20,7 +20,7 @@ internal sealed class TeamAppearanceView
/// <param name="idAvatarMap">映射</param>
public TeamAppearanceView(TeamAppearance teamRank, Dictionary<AvatarId, Avatar> idAvatarMap)
{
Floor = SH.ModelBindingHutaoComplexRankFloor.Format(teamRank.Floor);
Floor = SH.FormatModelBindingHutaoComplexRankFloor(teamRank.Floor);
Up = teamRank.Up.SelectList(teamRate => new Team(teamRate, idAvatarMap));
Down = teamRank.Down.SelectList(teamRate => new Team(teamRate, idAvatarMap));
}

2
src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
View File

@@ -270,7 +270,7 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
if (Archives is not null && SelectedArchive is not null)
{
ContentDialogResult result = await contentDialogFactory
.CreateForConfirmCancelAsync(SH.ViewModelGachaLogRemoveArchiveTitle.Format(SelectedArchive.Uid), SH.ViewModelGachaLogRemoveArchiveDescription)
.CreateForConfirmCancelAsync(SH.FormatViewModelGachaLogRemoveArchiveTitle(SelectedArchive.Uid), SH.ViewModelGachaLogRemoveArchiveDescription)
.ConfigureAwait(false);
if (result == ContentDialogResult.Primary)

12
src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/TypedWishSummary.cs
View File

@@ -28,7 +28,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string MaxOrangePullFormatted
{
get => SH.ModelBindingGachaTypedWishSummaryMaxOrangePullFormat.Format(MaxOrangePull);
get => SH.FormatModelBindingGachaTypedWishSummaryMaxOrangePullFormat(MaxOrangePull);
}
/// <summary>
@@ -36,7 +36,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string MinOrangePullFormatted
{
get => SH.ModelBindingGachaTypedWishSummaryMinOrangePullFormat.Format(MinOrangePull);
get => SH.FormatModelBindingGachaTypedWishSummaryMinOrangePullFormat(MinOrangePull);
}
/// <summary>
@@ -88,7 +88,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string AverageOrangePullFormatted
{
get => SH.ModelBindingGachaTypedWishSummaryAveragePullFormat.Format(AverageOrangePull);
get => SH.FormatModelBindingGachaTypedWishSummaryAveragePullFormat(AverageOrangePull);
}
/// <summary>
@@ -101,7 +101,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string AverageUpOrangePullFormatted
{
get => SH.ModelBindingGachaTypedWishSummaryAveragePullFormat.Format(AverageUpOrangePull);
get => SH.FormatModelBindingGachaTypedWishSummaryAveragePullFormat(AverageUpOrangePull);
}
/// <summary>
@@ -109,7 +109,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string PredictedPullLeftToOrangeFormatted
{
get => SH.ViewModelGachaLogPredictedPullLeftToOrange.Format(PredictedPullLeftToOrange, ProbabilityOfPredictedPullLeftToOrange);
get => SH.FormatViewModelGachaLogPredictedPullLeftToOrange(PredictedPullLeftToOrange, ProbabilityOfPredictedPullLeftToOrange);
}
/// <summary>
@@ -117,7 +117,7 @@ internal sealed partial class TypedWishSummary : Wish
/// </summary>
public string ProbabilityOfNextPullIsOrangeFormatted
{
get => SH.ViewModelGachaLogProbabilityOfNextPullIsOrange.Format(ProbabilityOfNextPullIsOrange);
get => SH.FormatViewModelGachaLogProbabilityOfNextPullIsOrange(ProbabilityOfNextPullIsOrange);
}
/// <summary>

2
src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/Wish.cs
View File

@@ -29,7 +29,7 @@ internal abstract class Wish
/// </summary>
public string TotalCountFormatted
{
get => SH.ModelBindingGachaWishBaseTotalCountFormat.Format(TotalCount);
get => SH.FormatModelBindingGachaWishBaseTotalCountFormat(TotalCount);
}
/// <summary>

2
src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
View File

@@ -138,7 +138,7 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel
}
else
{
infoBarService.Warning(SH.ViewModelLaunchGameMultiChannelReadFail.Format(options.ConfigFilePath));
infoBarService.Warning(SH.FormatViewModelLaunchGameMultiChannelReadFail(options.ConfigFilePath));
}
ObservableCollection<GameAccount> accounts = gameService.GameAccountCollection;

2
src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
View File

@@ -107,7 +107,7 @@ internal sealed partial class AnnouncementViewModel : Abstraction.ViewModel
}
else if (rand == 1)
{
GreetingText = SH.ViewPageHomeGreetingTextCommon2.Format(LocalSetting.Get(SettingKeys.LaunchTimes, 0));
GreetingText = SH.FormatViewPageHomeGreetingTextCommon2(LocalSetting.Get(SettingKeys.LaunchTimes, 0));
}
}
}

3
src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs
View File

@@ -2,7 +2,6 @@
// Licensed under the MIT license.
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
using Microsoft.UI.Xaml.Controls;
using Microsoft.Windows.AppLifecycle;
using Snap.Hutao.Core;
@@ -180,7 +179,7 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
}
else
{
infoBarService.Warning(SH.ViewModelSettingClearWebCachePathInvalid.Format(cacheFolder));
infoBarService.Warning(SH.FormatViewModelSettingClearWebCachePathInvalid(cacheFolder));
}
}
}

2
src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/FloorView.cs
View File

@@ -14,7 +14,7 @@ internal sealed class FloorView : IMappingFrom<FloorView, TowerFloor, SpiralAbys
{
public FloorView(TowerFloor floor, SpiralAbyssMetadataContext context)
{
Index = SH.ModelBindingHutaoComplexRankFloor.Format(floor.Index);
Index = SH.FormatModelBindingHutaoComplexRankFloor(floor.Index);
IndexValue = floor.Index;
Disorders = floor.Descriptions;

2
src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/LevelView.cs
View File

@@ -14,7 +14,7 @@ internal sealed class LevelView : IMappingFrom<LevelView, TowerLevel, SpiralAbys
{
private LevelView(TowerLevel towerLevel, SpiralAbyssMetadataContext context)
{
Index = SH.ModelBindingHutaoComplexRankLevel.Format(towerLevel.Index);
Index = SH.FormatModelBindingHutaoComplexRankLevel(towerLevel.Index);
IndexValue = towerLevel.Index;
Battles = [BattleView.From(towerLevel, 1, context), BattleView.From(towerLevel, 2, context)];
}

2
src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssView.cs
View File

@@ -60,7 +60,7 @@ internal sealed class SpiralAbyssView : IEntityOnly<SpiralAbyssEntry?>,
/// <summary>
/// 视图 中使用的计划 Id 字符串
/// </summary>
public string Schedule { get => SH.ModelEntitySpiralAbyssScheduleFormat.Format(ScheduleId); }
public string Schedule { get => SH.FormatModelEntitySpiralAbyssScheduleFormat(ScheduleId); }
public SpiralAbyssEntry? Entity { get => entity; }

8
src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
View File

@@ -85,7 +85,7 @@ internal sealed partial class UserViewModel : ObservableObject
SelectedUser = Users.Single();
}
infoBarService.Success(SH.ViewModelUserAdded.Format(uid));
infoBarService.Success(SH.FormatViewModelUserAdded(uid));
break;
case UserOptionResult.Incomplete:
infoBarService.Information(SH.ViewModelUserIncomplete);
@@ -94,7 +94,7 @@ internal sealed partial class UserViewModel : ObservableObject
infoBarService.Information(SH.ViewModelUserInvalid);
break;
case UserOptionResult.Updated:
infoBarService.Success(SH.ViewModelUserUpdated.Format(uid));
infoBarService.Success(SH.FormatViewModelUserUpdated(uid));
break;
default:
throw Must.NeverHappen();
@@ -181,7 +181,7 @@ internal sealed partial class UserViewModel : ObservableObject
try
{
await userService.RemoveUserAsync(user).ConfigureAwait(false);
infoBarService.Success(SH.ViewModelUserRemoved.Format(user.UserInfo?.Nickname));
infoBarService.Success(SH.FormatViewModelUserRemoved(user.UserInfo?.Nickname));
}
catch (UserdataCorruptedException ex)
{
@@ -206,7 +206,7 @@ internal sealed partial class UserViewModel : ObservableObject
serviceProvider.GetRequiredService<IClipboardProvider>().SetText(cookieString);
ArgumentNullException.ThrowIfNull(user.UserInfo);
infoBarService.Success(SH.ViewModelUserCookieCopied.Format(user.UserInfo.Nickname));
infoBarService.Success(SH.FormatViewModelUserCookieCopied(user.UserInfo.Nickname));
}
catch (Exception ex)
{

5
src/Snap.Hutao/Snap.Hutao/Web/Enka/EnkaClient.cs
View File

@@ -6,6 +6,7 @@ using Snap.Hutao.Web.Enka.Model;
using Snap.Hutao.Web.Hoyolab;
using Snap.Hutao.Web.Request.Builder;
using Snap.Hutao.Web.Request.Builder.Abstraction;
using System.Globalization;
using System.IO;
using System.Net;
using System.Net.Http;
@@ -37,7 +38,7 @@ internal sealed partial class EnkaClient
/// <returns>Enka API 响应</returns>
public ValueTask<EnkaResponse?> GetForwardDataAsync(in PlayerUid playerUid, CancellationToken token = default)
{
return TryGetEnkaResponseCoreAsync(EnkaAPIHutaoForward.Format(playerUid.Value), token);
return TryGetEnkaResponseCoreAsync(string.Format(CultureInfo.CurrentCulture, EnkaAPIHutaoForward, playerUid.Value), token);
}
/// <summary>
@@ -48,7 +49,7 @@ internal sealed partial class EnkaClient
/// <returns>Enka API 响应</returns>
public ValueTask<EnkaResponse?> GetDataAsync(in PlayerUid playerUid, CancellationToken token = default)
{
return TryGetEnkaResponseCoreAsync(EnkaAPI.Format(playerUid.Value), token);
return TryGetEnkaResponseCoreAsync(string.Format(CultureInfo.CurrentCulture, EnkaAPI, playerUid.Value), token);
}
private async ValueTask<EnkaResponse?> TryGetEnkaResponseCoreAsync(string url, CancellationToken token = default)

12
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/Announcement.cs
View File

@@ -35,20 +35,20 @@ internal sealed class Announcement : AnnouncementContent
TimeSpan span = StartTime - now;
if (span.TotalDays <= 1)
{
return SH.WebAnnouncementTimeHoursBeginFormat.Format((int)span.TotalHours);
return SH.FormatWebAnnouncementTimeHoursBeginFormat((int)span.TotalHours);
}
return SH.WebAnnouncementTimeDaysBeginFormat.Format((int)span.TotalDays);
return SH.FormatWebAnnouncementTimeDaysBeginFormat((int)span.TotalDays);
}
else
{
TimeSpan span = EndTime - now;
if (span.TotalDays <= 1)
{
return SH.WebAnnouncementTimeHoursEndFormat.Format((int)span.TotalHours);
return SH.FormatWebAnnouncementTimeHoursEndFormat((int)span.TotalHours);
}
return SH.WebAnnouncementTimeDaysEndFormat.Format((int)span.TotalDays);
return SH.FormatWebAnnouncementTimeDaysEndFormat((int)span.TotalDays);
}
}
}
@@ -68,9 +68,7 @@ internal sealed class Announcement : AnnouncementContent
{
get
{
// TODO: validate correctness
// UTC+8
DateTimeOffset currentTime = DateTimeOffset.Now;
DateTimeOffset currentTime = DateTimeOffset.UtcNow;
TimeSpan current = currentTime - StartTime;
TimeSpan total = EndTime - StartTime;
return current / total;

8
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs
View File

@@ -38,10 +38,10 @@ internal sealed class DailyNote : DailyNoteCommon
0 => SH.WebDailyNoteRecoveryTimeDay0,
1 => SH.WebDailyNoteRecoveryTimeDay1,
2 => SH.WebDailyNoteRecoveryTimeDay2,
_ => SH.WebDailyNoteRecoveryTimeDayFormat.Format(totalDays),
_ => SH.FormatWebDailyNoteRecoveryTimeDayFormat(totalDays),
};
return SH.WebDailyNoteResinRecoveryFormat.Format(day, reach);
return SH.FormatWebDailyNoteResinRecoveryFormat(day, reach);
}
}
@@ -129,9 +129,9 @@ internal sealed class DailyNote : DailyNoteCommon
0 => SH.WebDailyNoteRecoveryTimeDay0,
1 => SH.WebDailyNoteRecoveryTimeDay1,
2 => SH.WebDailyNoteRecoveryTimeDay2,
_ => SH.WebDailyNoteRecoveryTimeDayFormat.Format(totalDays),
_ => SH.FormatWebDailyNoteRecoveryTimeDayFormat(totalDays),
};
return SH.WebDailyNoteHomeCoinRecoveryFormat.Format(day, reach);
return SH.FormatWebDailyNoteHomeCoinRecoveryFormat(day, reach);
}
}

4
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/Expedition.cs
View File

@@ -81,8 +81,8 @@ internal sealed class Expedition
TimeSpan ts = new(0, 0, RemainedTime);
return ts.Hours > 0
? SH.WebDailyNoteExpeditionRemainHoursFormat.Format(ts.Hours)
: SH.WebDailyNoteExpeditionRemainMinutesFormat.Format(ts.Minutes);
? SH.FormatWebDailyNoteExpeditionRemainHoursFormat(ts.Hours)
: SH.FormatWebDailyNoteExpeditionRemainMinutesFormat(ts.Minutes);
}
}
}

16
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/RecoveryTime.cs
View File

@@ -67,10 +67,10 @@ internal sealed class RecoveryTime
else
{
return new StringBuilder()
.AppendIf(Day > 0, SH.WebDailyNoteTransformerDaysFormat.Format(Day))
.AppendIf(Hour > 0, SH.WebDailyNoteTransformerHoursFormat.Format(Hour))
.AppendIf(Minute > 0, SH.WebDailyNoteTransformerMinutesFormat.Format(Minute))
.AppendIf(Second > 0, SH.WebDailyNoteTransformerSecondsFormat.Format(Second))
.AppendIf(Day > 0, SH.FormatWebDailyNoteTransformerDaysFormat(Day))
.AppendIf(Hour > 0, SH.FormatWebDailyNoteTransformerHoursFormat(Hour))
.AppendIf(Minute > 0, SH.FormatWebDailyNoteTransformerMinutesFormat(Minute))
.AppendIf(Second > 0, SH.FormatWebDailyNoteTransformerSecondsFormat(Second))
.Append(SH.WebDailyNoteTransformerAppend)
.ToString();
}
@@ -92,10 +92,10 @@ internal sealed class RecoveryTime
else
{
return new StringBuilder()
.AppendIf(Day > 0, SH.WebDailyNoteTransformerDaysFormat.Format(Day))
.AppendIf(Hour > 0, SH.WebDailyNoteTransformerHoursFormat.Format(Hour))
.AppendIf(Minute > 0, SH.WebDailyNoteTransformerMinutesFormat.Format(Minute))
.AppendIf(Second > 0, SH.WebDailyNoteTransformerSecondsFormat.Format(Second))
.AppendIf(Day > 0, SH.FormatWebDailyNoteTransformerDaysFormat(Day))
.AppendIf(Hour > 0, SH.FormatWebDailyNoteTransformerHoursFormat(Hour))
.AppendIf(Minute > 0, SH.FormatWebDailyNoteTransformerMinutesFormat(Minute))
.AppendIf(Second > 0, SH.FormatWebDailyNoteTransformerSecondsFormat(Second))
.ToString();
}
}

3
src/Snap.Hutao/Snap.Hutao/Web/Hutao/Geetest/HomaGeetestClient.cs
View File

@@ -5,6 +5,7 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
using Snap.Hutao.Service;
using Snap.Hutao.Web.Request.Builder;
using Snap.Hutao.Web.Request.Builder.Abstraction;
using System.Globalization;
using System.Net.Http;
namespace Snap.Hutao.Web.Hutao.Geetest;
@@ -25,7 +26,7 @@ internal sealed partial class HomaGeetestClient
string url;
try
{
url = template.Format(gt, challenge);
url = string.Format(CultureInfo.CurrentCulture, template, gt, challenge);
}
catch (FormatException)
{

10
src/Snap.Hutao/Snap.Hutao/Web/Hutao/HutaoResponse.cs
View File

@@ -20,20 +20,20 @@ internal sealed class HutaoResponse : Response.Response, ILocalizableResponse
public static HutaoResponse DefaultIfNull(HutaoResponse? response, [CallerMemberName] string callerName = default!)
{
// 0x26F19335 is a magic number that hashed from "Snap.Hutao"
response ??= new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, null), default);
response ??= new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, null), default);
return response;
}
public static HutaoResponse<TData> DefaultIfNull<TData>(HutaoResponse<TData>? response, [CallerMemberName] string callerName = default!)
{
// 0x26F19335 is a magic number that hashed from "Snap.Hutao"
response ??= new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default, default);
return response ?? new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default, default);
response ??= new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, typeof(TData).Name), default, default);
return response ?? new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, typeof(TData).Name), default, default);
}
public override string ToString()
{
return SH.WebResponseFormat.Format(ReturnCode, this.GetLocalizationMessageOrDefault());
return SH.FormatWebResponseFormat(ReturnCode, this.GetLocalizationMessageOrDefault());
}
}
@@ -52,6 +52,6 @@ internal sealed class HutaoResponse<TData> : Response.Response<TData>, ILocaliza
public override string ToString()
{
return SH.WebResponseFormat.Format(ReturnCode, this.GetLocalizationMessageOrDefault());
return SH.FormatWebResponseFormat(ReturnCode, this.GetLocalizationMessageOrDefault());
}
}

2
src/Snap.Hutao/Snap.Hutao/Web/Hutao/Log/HomaLogUploadClient.cs
View File

@@ -46,7 +46,7 @@ internal sealed partial class HomaLogUploadClient
return new()
{
Id = runtimeOptions.DeviceId,
Time = DateTimeOffset.Now.ToUnixTimeMilliseconds(),
Time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
Info = Core.ExceptionService.ExceptionFormat.Format(exception),
};
}

14
src/Snap.Hutao/Snap.Hutao/Web/Response/Response.cs
View File

@@ -56,11 +56,11 @@ internal class Response
public static Response DefaultIfNull(Response? response, [CallerMemberName] string callerName = default!)
{
// 0x26F19335 is a magic number that hashed from "Snap.Hutao"
response ??= new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, null));
response ??= new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, null));
if (((KnownReturnCode)response.ReturnCode) is KnownReturnCode.PleaseLogin or KnownReturnCode.RET_TOKEN_INVALID)
{
response.Message = SH.WebResponseRefreshCookieHintFormat.Format(response.Message);
response.Message = SH.FormatWebResponseRefreshCookieHintFormat(response.Message);
}
return response;
@@ -76,14 +76,14 @@ internal class Response
public static Response<TData> DefaultIfNull<TData>(Response<TData>? response, [CallerMemberName] string callerName = default!)
{
// 0x26F19335 is a magic number that hashed from "Snap.Hutao"
response ??= new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default);
response ??= new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, typeof(TData).Name), default);
if (((KnownReturnCode)response.ReturnCode) is KnownReturnCode.PleaseLogin or KnownReturnCode.RET_TOKEN_INVALID)
{
response.Message = SH.WebResponseRefreshCookieHintFormat.Format(response.Message);
response.Message = SH.FormatWebResponseRefreshCookieHintFormat(response.Message);
}
return response ?? new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default);
return response ?? new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, typeof(TData).Name), default);
}
/// <summary>
@@ -104,7 +104,7 @@ internal class Response
else
{
// Magic number that hashed from "Snap.Hutao"
return new(InternalFailure, SH.WebResponseRequestExceptionFormat.Format(callerName, typeof(TData).Name), default);
return new(InternalFailure, SH.FormatWebResponseRequestExceptionFormat(callerName, typeof(TData).Name), default);
}
}
@@ -129,7 +129,7 @@ internal class Response
/// <inheritdoc/>
public override string ToString()
{
return SH.WebResponseFormat.Format(ReturnCode, Message);
return SH.FormatWebResponseFormat(ReturnCode, Message);
}
}