removed args validations

IngvarX · Nov 2, 2023 · 3330b67 · 3330b67
1 parent 92afcb2
commit 3330b67
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 25 deletions.
diff --git a/src/Camelot.Services.Abstractions/IPathService.cs b/src/Camelot.Services.Abstractions/IPathService.cs
@@ -18,8 +18,6 @@ public interface IPathService
 
     string GetExtension(string path);
 
-    bool IsExtension(string extension);
-
     string RightTrimPathSeparators(string path);
 
     string LeftTrimPathSeparators(string relativePath);

diff --git a/src/Camelot.Services/PathService.cs b/src/Camelot.Services/PathService.cs
@@ -88,17 +88,6 @@ public string GetExtension(string path)
         return extension.StartsWith(".") ? extension[1..] : extension;
     }
 
-    public bool IsExtension(string extension)
-    {
-        if (string.IsNullOrWhiteSpace(extension))
-            return false;
-        if (extension.Contains("."))
-            return false;
-        if (extension.Contains(_environmentPathService.GetDirectorySeparator()))
-            return false;
-        return true;
-    }
-
     public string RightTrimPathSeparators(string path) => path == "/" ? path : path.TrimEnd('/').TrimEnd('\\');
 
     public string LeftTrimPathSeparators(string relativePath) => relativePath.TrimStart('/').TrimStart('\\');

diff --git a/src/Camelot.ViewModels.Windows/ShellIcons/WindowsIconTypes.cs b/src/Camelot.ViewModels.Windows/ShellIcons/WindowsIconTypes.cs
@@ -12,11 +12,6 @@ public static bool IsIconThatRequiresExtract(string fileName, string extension)
             {
                 throw new ArgumentNullException(nameof(extension));
             }
-            if (extension.StartsWith("."))
-            {
-                // As per stanards of this project, extension don't have dot prefix.
-                throw new ArgumentOutOfRangeException(nameof(extension));
-            }
             if (fileName.Contains('?') || fileName.Contains(','))
             {
                 return true; // icon in indexed resource

diff --git a/src/Camelot.ViewModels.Windows/ShellIcons/WindowsShellIconsService.cs b/src/Camelot.ViewModels.Windows/ShellIcons/WindowsShellIconsService.cs
@@ -23,7 +23,7 @@ public WindowsShellIconsService(
 
     public ImageModel GetIconForExtension(string extension)
     {
-        if (!_pathService.IsExtension(extension))
+        if (string.IsNullOrEmpty(extension))
         {
             throw new ArgumentException(extension, nameof(extension));
         }

diff --git a/src/Camelot.ViewModels.Windows/WinApi/ShellIcon.cs b/src/Camelot.ViewModels.Windows/WinApi/ShellIcon.cs
@@ -12,12 +12,6 @@ public static string GetIconForExtension(string extension)
             throw new ArgumentNullException(nameof(extension));
         }
 
-        if (extension.StartsWith("."))
-        {
-            // As per stanards of this project, extension don't have dot prefix.
-            throw new ArgumentOutOfRangeException(nameof(extension));
-        }
-
         // But to work with Windows API, we still need to add dot prefix...
         extension = "." + extension;