chenx221/Comic_PDF_Helper
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

修复错误的处理方式

Browse Source 
解决当漫画名包含全角数字时出错的问题
This commit is contained in:
Chenx221 2023-07-25 18:00:26 +08:00
parent 958b1bf0c3
commit 4296abea79
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ConsoleApp1/ConsoleApp1/Program.cs
View File

@ -14,7 +14,8 @@ namespace ConsoleApp1
static void Main(string[] args) static void Main(string[] args)
{ {
// 设置控制台的输出编码为UTF-8 // 设置控制台的输出编码为UTF-8
Console.OutputEncoding = Encoding.UTF8; //Console.OutputEncoding = Encoding.UTF8;
Console.OutputEncoding = Encoding.GetEncoding(936);
// 获取上级文件夹路径 // 获取上级文件夹路径
Console.Write("请输入漫画所在的根路径："); Console.Write("请输入漫画所在的根路径：");
@ -46,6 +47,9 @@ namespace ConsoleApp1
// 循环处理每个漫画文件夹 // 循环处理每个漫画文件夹
foreach (string comicFolder in comicFolders) foreach (string comicFolder in comicFolders)
{ {
// 输出开始处理提示信息
Console.WriteLine($"开始处理漫画文件夹 {comicFolder}...");
// 确保漫画文件夹中包含图像文件 // 确保漫画文件夹中包含图像文件
string[] imageFiles = Directory.GetFiles(comicFolder, "*.*", SearchOption.AllDirectories) string[] imageFiles = Directory.GetFiles(comicFolder, "*.*", SearchOption.AllDirectories)
.Where(file => file.ToLower().EndsWith(".jpg") || file.ToLower().EndsWith(".png")) .Where(file => file.ToLower().EndsWith(".jpg") || file.ToLower().EndsWith(".png"))
@ -137,12 +141,16 @@ namespace ConsoleApp1
{ {
public int Compare(string x, string y) public int Compare(string x, string y)
{ {
// Define the regex pattern to match numbers in the strings // Get the file names from the full file paths
string fileNameX = Path.GetFileName(x);
string fileNameY = Path.GetFileName(y);
// Define the regex pattern to match numbers in the file names
string pattern = @"(\d+)"; string pattern = @"(\d+)";
// Get all the matches of numbers in the strings // Get all the matches of numbers in the file names
MatchCollection matchesX = Regex.Matches(x, pattern); MatchCollection matchesX = Regex.Matches(fileNameX, pattern);
MatchCollection matchesY = Regex.Matches(y, pattern); MatchCollection matchesY = Regex.Matches(fileNameY, pattern);
// Compare the matches one by one // Compare the matches one by one
int matchCount = Math.Min(matchesX.Count, matchesY.Count); int matchCount = Math.Min(matchesX.Count, matchesY.Count);
@ -156,13 +164,13 @@ namespace ConsoleApp1
return numComparison; return numComparison;
// Compare the non-numeric parts between the matched numbers // Compare the non-numeric parts between the matched numbers
int nonNumericComparison = x.IndexOf(matchesX[i].Value) - y.IndexOf(matchesY[i].Value); int nonNumericComparison = fileNameX.IndexOf(matchesX[i].Value) - fileNameY.IndexOf(matchesY[i].Value);
if (nonNumericComparison != 0) if (nonNumericComparison != 0)
return nonNumericComparison; return nonNumericComparison;
} }
// If the numbers are the same up to this point, compare the remaining non-numeric parts // If the numbers are the same up to this point, compare the remaining non-numeric parts
return x.CompareTo(y); return fileNameX.CompareTo(fileNameY);
} }
} }