Merge branch 'release/v2.4.0'

joonro · Jun 6, 2022 · 8f91d52 · 8f91d52
2 parents 457c272 + 31d0ab5
commit 8f91d52
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/README.org b/README.org
@@ -68,14 +68,16 @@ If (-Not (Test-Path Variable:PSise)) {  # Only run this in the console and not i
     Import-Module Get-ChildItemColor
 
     Set-Alias l Get-ChildItem -option AllScope
-    Set-Alias ls Get-ChildItemColorFormatWide -option AllScope
+    Set-Alias ls Get-ChildItemColorFormatWide -option AllScope [-HideHeader]
 }
 #+end_src
 
 So =l= yields colored output of =Get-ChildItem= and =ls= yields colored output
-of =Get-ChildItem | Format-Wide= equivalent.
-
-[fn:pathProfile] ~$Home\[My ]Documents\WindowsPowerShell\Profile.ps1~
+of =Get-ChildItem | Format-Wide= equivalent. There is an optional
+~-HideHeader~ switch which will supress printing of headers (path on top) for
+~Get-ChildItemColorFormatWide~ when specified.
+
+[fn:pathProfile] ~$Home\[My ]Documents\PowerShell\Profile.ps1~ or ~$Home\[My ]Documents\WindowsPowerShell\Profile.ps1~ 
 
 [fn:pathProfileISE] ~$Home\[My ]Documents\WindowsPowerShell\Microsoft.PowerShellISE_profile.ps1~
 
@@ -116,6 +118,8 @@ $Global:GetChildItemColorVerticalSpace = 1
 * Authors
 - [[http://github.com/joonro][Joon Ro]].
 * Changelog
+** v2.4.0
+- Add ~HideHeader~ switch to ~Get-ChildItemColorFormatWide~ ([[https://github.com/joonro/Get-ChildItemColor/issues/29][#29]])
 ** v2.3.0
 - Better handling of header printout ([[https://github.com/joonro/Get-ChildItemColor/issues/41][#41]])
 ** v2.2.2

diff --git a/src/Get-ChildItemColor.psd1 b/src/Get-ChildItemColor.psd1
@@ -10,7 +10,7 @@
 RootModule = 'Get-ChildItemColor.psm1'
 
 # Version number of this module.
-ModuleVersion = '2.2.3'
+ModuleVersion = '2.4.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/src/Get-ChildItemColor.psm1 b/src/Get-ChildItemColor.psm1
@@ -42,14 +42,15 @@ Function Get-ChildItemColor {
 Function Get-ChildItemColorFormatWide {
     Param(
         [string]$Path = "",
-        [switch]$Force
+        [switch]$Force,
+        [switch]$HideHeader
     )
 
     $nnl = $True
 
     $Expression = "Get-ChildItem -Path `"$Path`" $Args"
 
-    if ($Force) {$Expression += " -Force"}
+    If ($Force) {$Expression += " -Force"}
 
     $Items = Invoke-Expression $Expression
 
@@ -67,8 +68,7 @@ Function Get-ChildItemColorFormatWide {
             If ($Item.PSParentPath -match "FileSystem") {
                 $ParentType = "Directory"
                 $ParentName = $Item.PSParentPath.Replace("Microsoft.PowerShell.Core\FileSystem::", "")
-            }
-            ElseIf ($Item.PSParentPath -match "Registry") {
+            } ElseIf ($Item.PSParentPath -match "Registry") {
                 $ParentType = "Hive"
                 $ParentName = $Item.PSParentPath.Replace("Microsoft.PowerShell.Core\Registry::", "")
             }
@@ -78,7 +78,12 @@ Function Get-ChildItemColorFormatWide {
             $LastParentName = $ParentName
         }
 
-        If ($LastParentName -ne $ParentName) {
+        If ($i -eq 0 -and $HideHeader) {
+                Write-Host ""
+        }
+
+        # write header
+        If ($LastParentName -ne $ParentName -and -not $HideHeader) {
             If ($i -ne 0 -AND $Host.UI.RawUI.CursorPosition.X -ne 0){  # conditionally add an empty line
                 Write-Host ""
             }
@@ -95,7 +100,6 @@ Function Get-ChildItemColorFormatWide {
             For ($l=1; $l -le $GetChildItemColorVerticalSpace; $l++) {
                 Write-Host ""
             }
-
         }
 
         $nnl = ++$i % $cols -ne 0
@@ -189,8 +193,7 @@ Function Out-Default {
         }
     }
 
-    End
-    {
+    End {
         Try {
             For ($l=1; $l -le $GetChildItemColorVerticalSpace; $l++) {
                 Write-Host ""