Merge branch 'rmcrackan:master' into master

This commit is contained in:
Mbucari 2022-12-16 08:55:08 -07:00 committed by GitHub
commit ef973ac56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -15,7 +15,7 @@ namespace FileManager
public const int MaxFilenameLength = 255; public const int MaxFilenameLength = 255;
private const int MAX_PATH = 260; private const int MAX_PATH = 260;
private const string LONG_PATH_PREFIX = "\\\\?\\"; private const string LONG_PATH_PREFIX = @"\\?\";
public string Path { get; init; } public string Path { get; init; }
public override string ToString() => Path; public override string ToString() => Path;
@ -35,13 +35,13 @@ namespace FileManager
if (path.StartsWith(LONG_PATH_PREFIX)) if (path.StartsWith(LONG_PATH_PREFIX))
return new LongPath { Path = path }; return new LongPath { Path = path };
else if ((path.Length > 2 && path[1] == ':') || path.StartsWith("UNC\\")) else if ((path.Length > 2 && path[1] == ':') || path.StartsWith(@"UNC\"))
return new LongPath { Path = LONG_PATH_PREFIX + path }; return new LongPath { Path = LONG_PATH_PREFIX + path };
else if (path.StartsWith("\\\\")) else if (path.StartsWith(@"\\"))
//The "\\?\" prefix can also be used with paths constructed according to the //The "\\?\" prefix can also be used with paths constructed according to the
//universal naming convention (UNC). To specify such a path using UNC, use //universal naming convention (UNC). To specify such a path using UNC, use
//the "\\?\UNC\" prefix. //the "\\?\UNC\" prefix.
return new LongPath { Path = LONG_PATH_PREFIX + "UNC\\" + path.Substring(2) }; return new LongPath { Path = LONG_PATH_PREFIX + @"UNC\" + path.Substring(2) };
else else
{ {
//These prefixes are not used as part of the path itself. They indicate that //These prefixes are not used as part of the path itself. They indicate that

View File

@ -179,6 +179,7 @@ namespace FileManager
} }
catch (Exception exDebug) catch (Exception exDebug)
{ {
Serilog.Log.Logger.Debug(exDebug, "Silent failure");
return false; return false;
} }

View File

@ -23,7 +23,7 @@ namespace AccountsTests
{ {
public class AccountsTestBase public class AccountsTestBase
{ {
protected const string EMPTY_FILE = "{\r\n \"Accounts\": []\r\n}"; protected string EMPTY_FILE { get; } = "{\r\n \"Accounts\": []\r\n}".Replace("\r\n", Environment.NewLine);
protected string TestFile; protected string TestFile;
protected Locale usLocale => Localization.Get("us"); protected Locale usLocale => Localization.Get("us");