Skip to content

Commit 6eb2c3f

Browse files
committed
Resolve merge conflicts with master branch
2 parents 2143e48 + 36c84d1 commit 6eb2c3f

File tree

186 files changed

+13470
-13628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+13470
-13628
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
44
</PropertyGroup>
5-
</Project>
5+
</Project>

example/DetectFile.cs

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,33 @@
22
using System.IO;
33
using UtfUnknown;
44

5-
namespace ConsoleExample
5+
namespace ConsoleExample;
6+
7+
public class DetectFile
68
{
7-
public class DetectFile
9+
/// <summary>
10+
/// Command line example: detects the encoding of the given file.
11+
/// </summary>
12+
/// <param name="args">a filename</param>
13+
public static void Main(string[] args)
814
{
9-
/// <summary>
10-
/// Command line example: detects the encoding of the given file.
11-
/// </summary>
12-
/// <param name="args">a filename</param>
13-
public static void Main(string[] args)
15+
if (args.Length == 0)
1416
{
15-
if (args.Length == 0)
16-
{
17-
Console.WriteLine("Usage: ConsoleExample <filename>");
18-
return;
19-
}
20-
21-
var filename = args[0];
22-
if (!File.Exists(filename))
23-
{
24-
Console.WriteLine($"File not found: {filename}");
25-
return;
26-
}
17+
Console.WriteLine("Usage: ConsoleExample <filename>");
18+
return;
19+
}
2720

28-
var result = CharsetDetector.DetectFromFile(filename);
29-
var message = result.Detected != null
30-
? $"Detected encoding {result.Detected.Encoding.WebName} with confidence {result.Detected.Confidence}."
31-
: $"Detection failed: {filename}";
32-
Console.WriteLine(message);
21+
var filename = args[0];
22+
if (!File.Exists(filename))
23+
{
24+
Console.WriteLine($"File not found: {filename}");
25+
return;
3326
}
27+
28+
var result = CharsetDetector.DetectFromFile(filename);
29+
var message = result.Detected != null
30+
? $"Detected encoding {result.Detected.Encoding.WebName} with confidence {result.Detected.Confidence}."
31+
: $"Detection failed: {filename}";
32+
Console.WriteLine(message);
3433
}
35-
}
34+
}

0 commit comments

Comments
 (0)