mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Code refactoring
This commit is contained in:
parent
34d9c5f893
commit
a30f565b94
1 changed files with 16 additions and 11 deletions
|
@ -190,6 +190,18 @@ public static string GetAbsolutePath(string path)
|
||||||
return Path.GetFullPath(path);
|
return Path.GetFullPath(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string GetPathRoot(string path)
|
||||||
|
{
|
||||||
|
int separator = path.IndexOf(Path.DirectorySeparatorChar);
|
||||||
|
|
||||||
|
if (separator > 1 && path[separator - 1] == ':')
|
||||||
|
{
|
||||||
|
return path.Remove(separator + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
public static string SanitizeFileName(string fileName, string replaceWith = "")
|
public static string SanitizeFileName(string fileName, string replaceWith = "")
|
||||||
{
|
{
|
||||||
char[] invalidChars = Path.GetInvalidFileNameChars();
|
char[] invalidChars = Path.GetInvalidFileNameChars();
|
||||||
|
@ -200,24 +212,17 @@ private static string SanitizeFileName(string fileName, string replaceWith, char
|
||||||
{
|
{
|
||||||
fileName = fileName.Trim();
|
fileName = fileName.Trim();
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(replaceWith))
|
foreach (char c in invalidChars)
|
||||||
{
|
{
|
||||||
return new string(fileName.Where(c => !invalidChars.Contains(c)).ToArray());
|
fileName = fileName.Replace(c.ToString(), replaceWith);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
foreach (char invalidFileNameChar in invalidChars)
|
|
||||||
{
|
|
||||||
fileName = fileName.Replace(invalidFileNameChar.ToString(), replaceWith);
|
|
||||||
}
|
|
||||||
|
|
||||||
return fileName.Replace(replaceWith + replaceWith, replaceWith);
|
return fileName;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string SanitizePath(string path, string replaceWith = "")
|
public static string SanitizePath(string path, string replaceWith = "")
|
||||||
{
|
{
|
||||||
string root = Path.GetPathRoot(path);
|
string root = GetPathRoot(path);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(root))
|
if (!string.IsNullOrEmpty(root))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue