Skip to content

Commit

Permalink
Lazy initialization; remove ZhConverter.Initialize.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ejball
ejball committed Oct 18, 2023
1 parent 724ca4c commit ac13550
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 61 deletions.
9 changes: 0 additions & 9 deletions src/OpenCCNET/ZhConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@ namespace OpenCCNET
{
public static partial class ZhConverter
{
/// <summary>
/// 初始化
/// </summary>
public static void Initialize()
{
ZhSegment.Initialize();
ZhDictionary.Initialize();
}

#region 简体中文

/// <summary>
Expand Down
93 changes: 54 additions & 39 deletions src/OpenCCNET/ZhDictionary.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,114 +13,111 @@ public static class ZhDictionary
/// <summary>
/// 简体中文=>繁体中文（OpenCC标准）单字转换字典
/// </summary>
public static IDictionary<string, string> STCharacters { get; set; }
public static IDictionary<string, string> STCharacters => _STCharacters.Value;

/// <summary>
/// 简体中文=>繁体中文（OpenCC标准）词汇转换字典
/// </summary>
public static IDictionary<string, string> STPhrases { get; set; }
public static IDictionary<string, string> STPhrases => _STPhrases.Value;

/// <summary>
/// 繁体中文（OpenCC标准）=>简体中文单字转换字典
/// </summary>
public static IDictionary<string, string> TSCharacters { get; set; }
public static IDictionary<string, string> TSCharacters => _TSCharacters.Value;

/// <summary>
/// 繁体中文（OpenCC标准）=>简体中文词汇转换字典
/// </summary>
public static IDictionary<string, string> TSPhrases { get; set; }
public static IDictionary<string, string> TSPhrases => _TSPhrases.Value;

/// <summary>
/// 繁体中文（OpenCC标准）=>繁体中文（台湾）单字转换字典
/// </summary>
public static IDictionary<string, string> TWVariants { get; set; }
public static IDictionary<string, string> TWVariants => _TWVariants.Value;

/// <summary>
/// 繁体中文（OpenCC标准）=>繁体中文（台湾）词汇转换字典
/// </summary>
public static IDictionary<string, string> TWPhrases { get; set; }
public static IDictionary<string, string> TWPhrases => _TWPhrases.Value;

/// <summary>
/// 繁体中文（台湾）=>繁体中文（OpenCC标准）单字转换字典
/// </summary>
public static IDictionary<string, string> TWVariantsRev { get; set; }
public static IDictionary<string, string> TWVariantsRev => _TWVariantsRev.Value;

/// <summary>
/// 繁体中文（台湾）=>繁体中文（OpenCC标准）异体字词汇转换字典
/// </summary>
public static IDictionary<string, string> TWVariantsRevPhrases { get; set; }
public static IDictionary<string, string> TWVariantsRevPhrases => _TWVariantsRevPhrases.Value;

/// <summary>
/// 繁体中文（台湾）=>繁体中文（OpenCC标准）词汇转换字典
/// </summary>
public static IDictionary<string, string> TWPhrasesRev { get; set; }
public static IDictionary<string, string> TWPhrasesRev => _TWPhrasesRev.Value;

/// <summary>
/// 繁体中文（OpenCC标准）=>繁体中文（香港）单字转换字典
/// </summary>
public static IDictionary<string, string> HKVariants { get; set; }
public static IDictionary<string, string> HKVariants => _HKVariants.Value;

/// <summary>
/// 繁体中文（香港）=>繁体中文（OpenCC标准）单字转换字典
/// </summary>
public static IDictionary<string, string> HKVariantsRev { get; set; }
public static IDictionary<string, string> HKVariantsRev => _HKVariantsRev.Value;

/// <summary>
/// 繁体中文（香港）=>繁体中文（OpenCC标准）异体字词汇转换字典
/// </summary>
public static IDictionary<string, string> HKVariantsRevPhrases { get; set; }
public static IDictionary<string, string> HKVariantsRevPhrases => _HKVariantsRevPhrases.Value;

/// <summary>
/// 日语（旧字体）=>日语（新字体）单字转换字典
/// </summary>
public static IDictionary<string, string> JPVariants { get; set; }
public static IDictionary<string, string> JPVariants => _JPVariants.Value;

/// <summary>
/// 日语（新字体）=>日语（旧字体）单字转换字典
/// </summary>
public static IDictionary<string, string> JPVariantsRev { get; set; }
public static IDictionary<string, string> JPVariantsRev => _JPVariantsRev.Value;

/// <summary>
/// 日语（新字体）=>日语（旧字体）异体字单字转换字典
/// </summary>
public static IDictionary<string, string> JPShinjitaiCharacters { get; set; }
public static IDictionary<string, string> JPShinjitaiCharacters => _JPShinjitaiCharacters.Value;

/// <summary>
/// 日语（新字体）=>日语（旧字体）异体字词汇转换字典
/// </summary>
public static IDictionary<string, string> JPShinjitaiPhrases { get; set; }
public static IDictionary<string, string> JPShinjitaiPhrases => _JPShinjitaiPhrases.Value;


/// <summary>
/// 加载所有字典文件
/// </summary>
public static void Initialize()
static ZhDictionary()
{
using var zipArchive = new ZipArchive(typeof(ZhDictionary).Assembly.GetManifestResourceStream("Dictionary.zip") ?? throw new InvalidOperationException("Missing dictionary zip file."));
STCharacters = LoadDictionary(zipArchive, "STCharacters");
STPhrases = LoadDictionary(zipArchive, "STPhrases");
TSCharacters = LoadDictionary(zipArchive, "TSCharacters");
TSPhrases = LoadDictionary(zipArchive, "TSPhrases");
TWVariants = LoadDictionary(zipArchive, "TWVariants");
TWPhrases = LoadDictionary(zipArchive, "TWPhrasesIT", "TWPhrasesName", "TWPhrasesOther");
TWVariantsRev = LoadDictionaryReversed(zipArchive, "TWVariants");
TWVariantsRevPhrases = LoadDictionary(zipArchive, "TWVariantsRevPhrases");
TWPhrasesRev = LoadDictionaryReversed(zipArchive, "TWPhrasesIT", "TWPhrasesName", "TWPhrasesOther");
HKVariants = LoadDictionary(zipArchive, "HKVariants");
HKVariantsRev = LoadDictionaryReversed(zipArchive, "HKVariants");
HKVariantsRevPhrases = LoadDictionary(zipArchive, "HKVariantsRevPhrases");
JPVariants = LoadDictionary(zipArchive, "JPVariants");
JPVariantsRev = LoadDictionaryReversed(zipArchive, "JPVariants");
JPShinjitaiCharacters = LoadDictionary(zipArchive, "JPShinjitaiCharacters");
JPShinjitaiPhrases = LoadDictionary(zipArchive, "JPShinjitaiPhrases");
_STCharacters = new(() => LoadDictionary("STCharacters"));
_STPhrases = new(() => LoadDictionary("STPhrases"));
_TSCharacters = new(() => LoadDictionary("TSCharacters"));
_TSPhrases = new(() => LoadDictionary("TSPhrases"));
_TWVariants = new(() => LoadDictionary("TWVariants"));
_TWPhrases = new(() => LoadDictionary("TWPhrasesIT", "TWPhrasesName", "TWPhrasesOther"));
_TWVariantsRev = new(() => LoadDictionaryReversed("TWVariants"));
_TWVariantsRevPhrases = new(() => LoadDictionary("TWVariantsRevPhrases"));
_TWPhrasesRev = new(() => LoadDictionaryReversed("TWPhrasesIT", "TWPhrasesName", "TWPhrasesOther"));
_HKVariants = new(() => LoadDictionary("HKVariants"));
_HKVariantsRev = new(() => LoadDictionaryReversed("HKVariants"));
_HKVariantsRevPhrases = new(() => LoadDictionary("HKVariantsRevPhrases"));
_JPVariants = new(() => LoadDictionary("JPVariants"));
_JPVariantsRev = new(() => LoadDictionaryReversed("JPVariants"));
_JPShinjitaiCharacters = new(() => LoadDictionary("JPShinjitaiCharacters"));
_JPShinjitaiPhrases = new(() => LoadDictionary("JPShinjitaiPhrases"));
}

/// <summary>
/// 加载字典文件
/// </summary>
/// <param name="dictionaryNames">字典名称</param>
private static IDictionary<string, string> LoadDictionary(ZipArchive zipArchive, params string[] dictionaryNames)
private static IDictionary<string, string> LoadDictionary(params string[] dictionaryNames)
{
using var zipArchive = new ZipArchive(typeof(ZhDictionary).Assembly.GetManifestResourceStream("Dictionary.zip") ?? throw new InvalidOperationException("Missing dictionary zip file."));
var dictionaryPaths = dictionaryNames.Select(name => $"{name}.txt")
.ToList();
var dictionary = new Dictionary<string, string>();
Expand All @@ -144,8 +141,9 @@ private static IDictionary<string, string> LoadDictionary(ZipArchive zipArchive,
/// 反向加载字典文件
/// </summary>
/// <param name="dictionaryNames">字典名称</param>
private static IDictionary<string, string> LoadDictionaryReversed(ZipArchive zipArchive, params string[] dictionaryNames)
private static IDictionary<string, string> LoadDictionaryReversed(params string[] dictionaryNames)
{
using var zipArchive = new ZipArchive(typeof(ZhDictionary).Assembly.GetManifestResourceStream("Dictionary.zip") ?? throw new InvalidOperationException("Missing dictionary zip file."));
var dictionaryPaths = dictionaryNames.Select(name => $"{name}.txt");
var dictionary = new Dictionary<string, string>();
foreach (var path in dictionaryPaths)
Expand All @@ -166,6 +164,23 @@ private static IDictionary<string, string> LoadDictionaryReversed(ZipArchive zip

return dictionary;
}

private static readonly Lazy<IDictionary<string, string>> _STCharacters;
private static readonly Lazy<IDictionary<string, string>> _STPhrases;
private static readonly Lazy<IDictionary<string, string>> _TSCharacters;
private static readonly Lazy<IDictionary<string, string>> _TSPhrases;
private static readonly Lazy<IDictionary<string, string>> _TWVariants;
private static readonly Lazy<IDictionary<string, string>> _TWPhrases;
private static readonly Lazy<IDictionary<string, string>> _TWVariantsRev;
private static readonly Lazy<IDictionary<string, string>> _TWVariantsRevPhrases;
private static readonly Lazy<IDictionary<string, string>> _TWPhrasesRev;
private static readonly Lazy<IDictionary<string, string>> _HKVariants;
private static readonly Lazy<IDictionary<string, string>> _HKVariantsRev;
private static readonly Lazy<IDictionary<string, string>> _HKVariantsRevPhrases;
private static readonly Lazy<IDictionary<string, string>> _JPVariants;
private static readonly Lazy<IDictionary<string, string>> _JPVariantsRev;
private static readonly Lazy<IDictionary<string, string>> _JPShinjitaiCharacters;
private static readonly Lazy<IDictionary<string, string>> _JPShinjitaiPhrases;
}
}
}
6 changes: 0 additions & 6 deletions src/OpenCCNET/ZhSegment.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ public static class ZhSegment
/// </summary>
public static JiebaSegmenter Jieba = new JiebaSegmenter();

public static void Initialize()
{
// 通过调用一次jieba分词来提前加载所需资源
Jieba.Cut(string.Empty);
}

/// <summary>
/// 利用jieba.NET分词
/// </summary>
Expand Down
8 changes: 1 addition & 7 deletions tests/OpenCCNET.Tests/ZhConverterTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
using NUnit.Framework;
using NUnit.Framework;

namespace OpenCCNET.Tests
{
[TestFixture]
internal class ZhConverterTests
{
[OneTimeSetUp]
public void SetUp()
{
ZhConverter.Initialize();
}

[Test]
public void HansToFromTw()
{
Expand Down

0 comments on commit ac13550

Please sign in to comment.