Skip to content

Feature/local cache #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aoxue wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/local cache #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fed1ece
翻译过的文本保存到本地，避免重复翻译请求
aoxue Oct 9, 2021
8d08295
处理正则匹配字符串时中存在换行导致无法匹配的问题
aoxue Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions NetCore.zh-hans/AppConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using System.Collections.Generic;
using System.IO;
using System.Text;

Expand All @@ -7,11 +8,13 @@ namespace NetCore.zh_hans
public static class AppConfig
{
private static readonly string configPath;
private static readonly string dataPath;

static AppConfig()
{
//获得配置文件的全路径
configPath = System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "app.json";
dataPath = System.AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "data.json";
}
public static BaiduAccount GetBaiduAccount()
{
Expand All @@ -20,7 +23,7 @@ public static BaiduAccount GetBaiduAccount()
return new BaiduAccount();
}

string json = File.ReadAllText(configPath, Encoding.UTF8);
var json = File.ReadAllText(configPath, Encoding.UTF8);
if (string.IsNullOrWhiteSpace(json))
{
return new BaiduAccount();
Expand All @@ -30,22 +33,50 @@ public static BaiduAccount GetBaiduAccount()
}
public static void SetBaiduAccount(string appid, string secret)
{
using FileStream fs = System.IO.File.Open(configPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);
using var fs = System.IO.File.Open(configPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);

string json = JsonConvert.SerializeObject(new BaiduAccount
var json = JsonConvert.SerializeObject(new BaiduAccount
{
Appid = appid,
Secret = secret
});

byte[] bytes = Encoding.UTF8.GetBytes(json);
var bytes = Encoding.UTF8.GetBytes(json);
fs.Write(bytes, 0, bytes.Length);
//刷新缓冲区
fs.Flush();

// File.WriteAllText(configPath, json);
}


public static void SetTranslateData(IDictionary<string, string> data)
{
using var fs = System.IO.File.Open(dataPath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);

var json = JsonConvert.SerializeObject(data);
var bytes = Encoding.UTF8.GetBytes(json);
fs.Write(bytes, 0, bytes.Length);
//刷新缓冲区
fs.Flush();
}

public static IDictionary<string, string> GetTranslateData()
{
if (!File.Exists(dataPath))
{
return new Dictionary<string, string>();
}

var json = File.ReadAllText(dataPath, Encoding.UTF8);
if (string.IsNullOrWhiteSpace(json))
{
return new Dictionary<string, string>();
}

return JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
}

}
public class BaiduAccount
{
Expand Down
59 changes: 49 additions & 10 deletions NetCore.zh-hans/FormTranslate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -106,6 +107,10 @@ private async Task<Dictionary<string, string>> GetTranslateDict(string[] fileNam

}));

var translateData = AppConfig.GetTranslateData();

var concurrentDictionary = new ConcurrentDictionary<string, string>(translateData);

//百度翻译高级版（QPS=10）
const int qps = 5;
var bathCount = allText.Count / qps;
Expand All @@ -129,14 +134,32 @@ private async Task<Dictionary<string, string>> GetTranslateDict(string[] fileNam
button_Import.Text = $"翻译文本：{text}";
}));

var translationText = await TranslateText(text, appid, secret);
if (!concurrentDictionary.TryGetValue(text.ReplaceSpace(), out var translationText))
{
translationText = await TranslateText(text, appid, secret);

if (!string.IsNullOrWhiteSpace(translationText))
{
concurrentDictionary.TryAdd(text.ReplaceSpace(), translationText);
}

await Task.Delay(TimeSpan.FromMilliseconds(200));
}

dict[text] = translationText;
await Task.Delay(TimeSpan.FromMilliseconds(200));
}
}));
}

await Task.WhenAll(list.ToArray());
try
{
await Task.WhenAll(list.ToArray());
}
catch (Exception)
{
AppConfig.SetTranslateData(concurrentDictionary);
}


//对于请求失败的词语 再重试一次
var failKeys = dict
Expand All @@ -147,9 +170,16 @@ private async Task<Dictionary<string, string>> GetTranslateDict(string[] fileNam
{
var translationText = await TranslateText(key, appid, secret);
dict[key] = translationText;

if (!string.IsNullOrWhiteSpace(translationText))
{
concurrentDictionary.TryAdd(key.ReplaceSpace(), translationText);
}
await Task.Delay(TimeSpan.FromMilliseconds(200));
}

AppConfig.SetTranslateData(concurrentDictionary);

return dict;
}

Expand Down Expand Up @@ -184,7 +214,7 @@ private async Task<HashSet<string>> GetAllText(string[] fileNames)
var matches = new List<Match>();
foreach (var pattern in regexPatterns)
{
var regex = new Regex(pattern);
var regex = new Regex(pattern, RegexOptions.Multiline);
var result = regex.Matches(readXmlList);
if (result.Count > 0)
{
Expand All @@ -197,11 +227,13 @@ private async Task<HashSet<string>> GetAllText(string[] fileNames)

foreach (var match in matches)
{
var text = match.Value?.Trim()
.Replace("\r\n", "")
.Replace(" ", " ")
.Trim('\n', ' ')
;
if (string.IsNullOrWhiteSpace(match.Value))
{
continue;
}

var text = match.Value.Trim();

if (!string.IsNullOrWhiteSpace(text))
{
//如果不包含空格，说明是一个单词，不进行替换
Expand All @@ -216,7 +248,14 @@ private async Task<HashSet<string>> GetAllText(string[] fileNames)
}
private static async Task<string> TranslateText(string text, string appid, string secret)
{
var okStr = await Translate.TranslateText(text, appid, secret); //执行翻译
var originalText = text.ReplaceSpace();

if (string.IsNullOrWhiteSpace(text))
{
return "";
}

var okStr = await Translate.TranslateText(originalText, appid, secret); //执行翻译
if (string.IsNullOrWhiteSpace(okStr))
{
return "";
Expand Down
28 changes: 28 additions & 0 deletions NetCore.zh-hans/StringExtenstions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System.Text.RegularExpressions;

namespace NetCore.zh_hans
{
public static class StringExtensions
{
/// <summary>
/// 把\n \r 替换成空格
/// 把多个空格替换成一个空格
/// </summary>
/// <param name="str"></param>
/// <returns></returns>
public static string ReplaceSpace(this string str)
{
if (string.IsNullOrWhiteSpace(str))
{
return str;
}

var text = str
.Replace('\r', ' ')
.Replace('\n', ' ');

var replaceSpaceRegex = new Regex(@"\s{1,}", RegexOptions.IgnoreCase);
return replaceSpaceRegex.Replace(text, " ").Trim();
}
}
}
34 changes: 2 additions & 32 deletions NetCore.zh-hans/Translate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;

Expand Down Expand Up @@ -102,15 +101,15 @@ public static async Task<string> TranslateText(string str, string inputAppId, st
}

//https://api.fanyi.baidu.com/api/trans/product/apidoc
public class TranslateResult
private class TranslateResult
{
public int error_code { get; set; }
public string from { get; set; }
public string to { get; set; }
public Trans_Result[] trans_result { get; set; }
}

public class Trans_Result
private class Trans_Result
{
/// <summary>
/// 原文
Expand All @@ -122,34 +121,5 @@ public class Trans_Result
public string dst { get; set; }
}


/// <summary>
/// Unicode转字符串
/// </summary>
/// <param name="source">经过Unicode编码的字符串</param>
/// <returns>正常字符串</returns>
public static string UnicodeToString(string source)
{
return new Regex(@"\\u([0-9A-F]{4})", RegexOptions.IgnoreCase | RegexOptions.Compiled).Replace(
source, x => string.Empty + Convert.ToChar(Convert.ToUInt16(x.Result("$1"), 16)));
}

/// <summary>
/// 字符串转Unicode
/// </summary>
/// <param name="source">源字符串</param>
/// <returns>Unicode编码后的字符串</returns>
public static string String2Unicode(string source)
{
var bytes = Encoding.Unicode.GetBytes(source);
var stringBuilder = new StringBuilder();
for (var i = 0; i < bytes.Length; i += 2)
{
stringBuilder.AppendFormat("\\u{0}{1}", bytes[i + 1].ToString("x").PadLeft(2, '0'), bytes[i].ToString("x").PadLeft(2, '0'));
}
return stringBuilder.ToString();
}


}
}