Use process block for pipeline. Fix PSScriptAnalyzer warnings

cklutz · Oct 23, 2020 · 5e9addf · 5e9addf
1 parent e6adcca
commit 5e9addf
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 61 deletions.
diff --git a/Terminal-Icons/Private/ConvertFrom-ColorEscapeSequence.ps1 b/Terminal-Icons/Private/ConvertFrom-ColorEscapeSequence.ps1
@@ -7,12 +7,14 @@ function ConvertFrom-ColorEscapeSequence {
         [string]$Sequence
     )
 
-    # Example input sequence: 'e[38;2;135;206;250m'
+    process {
+        # Example input sequence: 'e[38;2;135;206;250m'
 
-    $arr = $Sequence.Split(';')
-    $r   = '{0:x}' -f [int]$arr[2]
-    $g   = '{0:x}' -f [int]$arr[3]
-    $b   = '{0:x}' -f [int]$arr[4].TrimEnd('m')
+        $arr = $Sequence.Split(';')
+        $r   = '{0:x}' -f [int]$arr[2]
+        $g   = '{0:x}' -f [int]$arr[3]
+        $b   = '{0:x}' -f [int]$arr[4].TrimEnd('m')
 
-    ($r + $g + $b).ToUpper()
+        ($r + $g + $b).ToUpper()
+    }
 }
diff --git a/Terminal-Icons/Private/ConvertFrom-Psd1.ps1 b/Terminal-Icons/Private/ConvertFrom-Psd1.ps1
@@ -1,10 +1,13 @@
 function ConvertFrom-Psd1 {
+    [OutputType([System.Collections.Hashtable])]
     [cmdletBinding()]
     param (
         [parameter(Mandatory, ValueFromPipeline)]
         [Microsoft.PowerShell.DesiredStateConfiguration.ArgumentToConfigurationDataTransformation()]
         [hashtable]$Data
     )
 
-    return $Data
+    process {
+        return $Data
+    }
 }
diff --git a/Terminal-Icons/Private/ConvertFrom-RGBColor.ps1 b/Terminal-Icons/Private/ConvertFrom-RGBColor.ps1
@@ -7,11 +7,13 @@ function ConvertFrom-RGBColor {
         [string]$RGB
     )
 
-    $RGB = $RGB.Replace('#', '')
-    $r   = [convert]::ToInt32($RGB.SubString(0,2), 16)
-    $g   = [convert]::ToInt32($RGB.SubString(2,2), 16)
-    $b   = [convert]::ToInt32($RGB.SubString(4,2), 16)
+    process {
+        $RGB = $RGB.Replace('#', '')
+        $r   = [convert]::ToInt32($RGB.SubString(0,2), 16)
+        $g   = [convert]::ToInt32($RGB.SubString(2,2), 16)
+        $b   = [convert]::ToInt32($RGB.SubString(4,2), 16)
 
-    $escape = [char]27
-    "${escape}[38;2;$r;$g;$b`m"
+        $escape = [char]27
+        "${escape}[38;2;$r;$g;$b`m"
+    }
 }
diff --git a/Terminal-Icons/Private/Resolve-Icon.ps1 b/Terminal-Icons/Private/Resolve-Icon.ps1
@@ -2,59 +2,61 @@ function Resolve-Icon {
     [OutputType([System.Collections.Hashtable])]
     [cmdletbinding()]
     param(
-        [parameter(ValueFromPipeline=$true)]
+        [parameter(ValueFromPipeline)]
         [System.IO.FileSystemInfo]$FileInfo
     )
 
-    if ($FileInfo.PSIsContainer) {
-        # Determine directory icon
-        $iconName  = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories.WellKnown[$FileInfo.Name]
-        if (-not $iconName) {
-            $iconName =  $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories[$FileInfo.Name]
+    process {
+        if ($FileInfo.PSIsContainer) {
+            # Determine directory icon
+            $iconName  = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories.WellKnown[$FileInfo.Name]
             if (-not $iconName) {
-                $iconName =  $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories['']
+                $iconName =  $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories[$FileInfo.Name]
+                if (-not $iconName) {
+                    $iconName =  $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Directories['']
+                }
             }
-        }
-        $icon = $glyphs[$iconName]
+            $icon = $glyphs[$iconName]
 
-        # Determine directory color
-        $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories.WellKnown[$FileInfo.Name]
-        #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories.WellKnown[$FileInfo.Name]
-        if (-not $color) {
-            #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories[$FileInfo.Name]
-            $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories[$FileInfo.Name]
+            # Determine directory color
+            $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories.WellKnown[$FileInfo.Name]
+            #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories.WellKnown[$FileInfo.Name]
             if (-not $color) {
-                #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories['']
-                $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories['']
+                #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories[$FileInfo.Name]
+                $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories[$FileInfo.Name]
+                if (-not $color) {
+                    #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Directories['']
+                    $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Directories['']
+                }
             }
-        }
-    } else {
-        # Determine file icon
-        $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files.WellKnown[$FileInfo.Name]
-        if (-not $iconName) {
-            $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files[$FileInfo.Extension]
+        } else {
+            # Determine file icon
+            $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files.WellKnown[$FileInfo.Name]
             if (-not $iconName) {
-                $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files['']
+                $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files[$FileInfo.Extension]
+                if (-not $iconName) {
+                    $iconName = $themeData.Themes.Icon[$themeData.CurrentIconTheme].Types.Files['']
+                }
             }
-        }
-        $icon = $glyphs[$iconName]
+            $icon = $glyphs[$iconName]
 
-        # Determine file color
-        $themeData.Themes.Color[$themeData.CurrentColorTheme]
-        #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files.WellKnown[$FileInfo.Name]
-        $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files.WellKnown[$FileInfo.Name]
-        if (-not $color) {
-            #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files[$FileInfo.Extension]
-            $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files[$FileInfo.Extension]
+            # Determine file color
+            $themeData.Themes.Color[$themeData.CurrentColorTheme]
+            #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files.WellKnown[$FileInfo.Name]
+            $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files.WellKnown[$FileInfo.Name]
             if (-not $color) {
-                #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files['']
-                $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files['']
+                #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files[$FileInfo.Extension]
+                $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files[$FileInfo.Extension]
+                if (-not $color) {
+                    #$color = $themeData.Themes.Color[$themeData.CurrentColorTheme].Types.Files['']
+                    $color = $script:colorSequences[$themeData.CurrentColorTheme].Types.Files['']
+                }
             }
         }
-    }
 
-    @{
-        Icon  = $icon
-        Color = $color
+        @{
+            Icon  = $icon
+            Color = $color
+        }
     }
 }
diff --git a/Terminal-Icons/Private/Save-Theme.ps1 b/Terminal-Icons/Private/Save-Theme.ps1
@@ -5,6 +5,8 @@ function Save-Theme {
         [hashtable]$Theme
     )
 
-    $themePath = Get-ThemeStoragePath
-    $themeData | Export-CliXml -Path $themePath -Force
+    process {
+        $themePath = Get-ThemeStoragePath
+        $Theme | Export-CliXml -Path $themePath -Force
+    }
 }
diff --git a/Terminal-Icons/Public/Format-TerminalIcons.ps1 b/Terminal-Icons/Public/Format-TerminalIcons.ps1
@@ -27,12 +27,14 @@ function Format-TerminalIcons {
     [OutputType([System.String])]
     [cmdletbinding()]
     param(
-        [parameter(Mandatory, ValueFromPipeline=$true)]
+        [parameter(Mandatory, ValueFromPipeline)]
         [System.IO.FileSystemInfo]$FileInfo
     )
 
-    $escape      = [char]27
-    $colorReset  = "${escape}[0m"
-    $displayInfo = Resolve-Icon $FileInfo
-    "$($displayInfo.Color)$($displayInfo.Icon)  $($FileInfo.Name)$colorReset"
+    process {
+        $escape      = [char]27
+        $colorReset  = "${escape}[0m"
+        $displayInfo = Resolve-Icon $FileInfo
+        "$($displayInfo.Color)$($displayInfo.Icon)  $($FileInfo.Name)$colorReset"
+    }
 }
diff --git a/Terminal-Icons/Public/Set-TerminalIconsColorTheme.ps1 b/Terminal-Icons/Public/Set-TerminalIconsColorTheme.ps1
@@ -30,5 +30,7 @@ function Set-TerminalIconsColorTheme {
         [string]$Name
     )
 
-    Set-Theme -Name $Name -Type Color
+    process {
+        Set-Theme -Name $Name -Type Color
+    }
 }
diff --git a/Terminal-Icons/Public/Set-TerminalIconsIconTheme.ps1 b/Terminal-Icons/Public/Set-TerminalIconsIconTheme.ps1
@@ -30,5 +30,7 @@ function Set-TerminalIconsIconTheme {
         [string]$Name
     )
 
-    Set-Theme -Name $Name -Type Icon
+    process {
+        Set-Theme -Name $Name -Type Icon
+    }
 }