Support EZTheme

Jaykul · Jaykul · commit 5afeec0ac04e · 2020-07-22T22:24:59.000-04:00
+semver:feature
diff --git a/Source/PowerLine.format.ps1xml b/Source/PowerLine.format.ps1xml
@@ -0,0 +1,26 @@
+<Configuration>
+    <ViewDefinitions>
+        <View>
+            <Name>PowerLine-Preview</Name>
+            <ViewSelectedBy>
+                <TypeName>PowerLine.Theme</TypeName>
+            </ViewSelectedBy>
+            <CustomControl>
+                <CustomEntries>
+                    <CustomEntry>
+                        <CustomItem>
+                            <ExpressionBinding>
+                                <ScriptBlock>
+                                    $CurrentTheme = Get-PowerLineTheme
+                                    $_ | Set-PowerLineTheme
+                                    $( Write-PowerLinePrompt )
+                                    $CurrentTheme | Set-PowerLineTheme
+                                </ScriptBlock>
+                            </ExpressionBinding>
+                        </CustomItem>
+                    </CustomEntry>
+                </CustomEntries>
+            </CustomControl>
+        </View>
+    </ViewDefinitions>
+</Configuration>
diff --git a/Source/PowerLine.psd1 b/Source/PowerLine.psd1
@@ -4,7 +4,7 @@
 RootModule = 'PowerLine.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.1.2'
+ModuleVersion = '3.2.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -34,7 +34,7 @@ PowerShellVersion = '5.0.0'
 # TypesToProcess = @("PowerLine.types.ps1xml")
 
 # Format files (.ps1xml) to be loaded when importing this module
-# FormatsToProcess = @()
+FormatsToProcess = @("PowerLine.format.ps1xml")
 
 RequiredModules = @(
     @{ModuleName="Configuration"; ModuleVersion="1.1.0"}
@@ -43,7 +43,7 @@ RequiredModules = @(
 # RequiredAssemblies = "lib\PowerLine.dll"
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-FunctionsToExport = 'Set-PowerLinePrompt', 'Write-PowerlinePrompt', 'Export-PowerLinePrompt', 'Add-PowerLineBlock', 'Remove-PowerLineBlock', 'New-PromptText', 'Get-Elapsed', 'Get-ErrorCount', 'Get-SegmentedPath', 'Get-ShortenedPath', 'Test-Success', 'Test-Elevation'
+FunctionsToExport = 'Set-PowerLinePrompt', 'Write-PowerlinePrompt', 'Export-PowerLinePrompt', 'Get-PowerLineTheme', 'Add-PowerLineBlock', 'Remove-PowerLineBlock', 'New-PromptText', 'Get-Elapsed', 'Get-ErrorCount', 'Get-SegmentedPath', 'Get-ShortenedPath', 'Test-Success', 'Test-Elevation'
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = @()
@@ -52,7 +52,7 @@ CmdletsToExport = @()
 VariablesToExport = @()
 
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
-AliasesToExport = 'New-PowerLineBlock'
+AliasesToExport = 'New-PowerLineBlock', 'Set-PowerLineTheme'
 
 # List of all files packaged with this module
 # FileList = @()
@@ -61,7 +61,7 @@ AliasesToExport = 'New-PowerLineBlock'
 PrivateData = @{
     PSData = @{
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = @("Prompt","ANSI","VirtualTerminal")
+        Tags = @("Prompt", "ANSI", "VirtualTerminal", "EzTheme")
 
         # A URL to the license for this module.
         LicenseUri = 'https://github.com/Jaykul/PowerLine/blob/master/LICENSE'
@@ -74,6 +74,7 @@ PrivateData = @{
 
         # ReleaseNotes of this module
         ReleaseNotes = '
+        3.2.0: Add support for EzTheme
         3.1.2: Fix the -HideError switch being backwards
                Log non-terminating errors
         3.1.1: Fix default insertion point when -Timeline or -Newline are used
@@ -83,6 +84,10 @@ PrivateData = @{
             Fixes longstanding bug where right-aligned columns would sometimes leak background color
         '
     } # End of PSData hashtable
+    "EzTheme" = @{
+        Get = 'Get-PowerLineTheme'
+        Set = 'Set-PowerLineTheme'
+    }
 } # End of PrivateData hashtable
 
 # HelpInfo URI of this module
diff --git a/Source/Public/Export-PowerLinePrompt.ps1 b/Source/Public/Export-PowerLinePrompt.ps1
@@ -5,12 +5,10 @@ function Export-PowerLinePrompt {
     $Local:Configuration = $Script:PowerLineConfig
     $Configuration.Prompt = [ScriptBlock[]]$global:Prompt
     $Configuration.Colors = [PoshCode.Pansies.RgbColor[]]$global:Prompt.Colors
-
-
     @{
         ExtendedCharacters = [PoshCode.Pansies.Entities]::ExtendedCharacters
         EscapeSequences    = [PoshCode.Pansies.Entities]::EscapeSequences
         PowerLineConfig    = $Script:PowerLineConfig
     } | Export-Configuration -AsHashtable
 
-}
+}
diff --git a/Source/Public/Get-PowerLineTheme.ps1 b/Source/Public/Get-PowerLineTheme.ps1
@@ -0,0 +1,25 @@
+function Get-PowerLineTheme {
+    <#
+        .SYNOPSIS
+            Get the themeable PowerLine settings
+    #>
+    [CmdletBinding()]
+    param()
+
+    $Local:Configuration = $Script:PowerLineConfig
+    $Configuration.Prompt = [ScriptBlock[]]$global:Prompt
+    $Configuration.Colors = [PoshCode.Pansies.RgbColor[]]$global:Prompt.Colors
+
+    $null = $Configuration.Remove("DefaultAddIndex")
+
+    $Configuration.PowerLineCharacters = @{
+        'ColorSeparator' = [PoshCode.Pansies.Entities]::ExtendedCharacters['ColorSeparator']
+        'ReverseColorSeparator' = [PoshCode.Pansies.Entities]::ExtendedCharacters['ReverseColorSeparator']
+        'Separator' = [PoshCode.Pansies.Entities]::ExtendedCharacters['Separator']
+        'ReverseSeparator' = [PoshCode.Pansies.Entities]::ExtendedCharacters['ReverseSeparator']
+    }
+
+    $Result = New-Object PSObject -Property $Configuration
+    $Result.PSTypeNames.Insert(0, "PowerLine.Theme")
+    $Result
+}
diff --git a/Source/Public/Set-PowerLinePrompt.ps1 b/Source/Public/Set-PowerLinePrompt.ps1
@@ -20,48 +20,68 @@ function Set-PowerLinePrompt {
     #   Set-PowerLinePrompt -FullColor
     #
     #   Sets the powerline prompt and forces the assumption of full RGB color support instead of 16 color
+    [Alias("Set-PowerLineTheme")]
     [CmdletBinding(DefaultParameterSetName = "PowerLine")]
     param(
         # A script which outputs a string used to update the Window Title each time the prompt is run
+        [Parameter(ValueFromPipelineByPropertyName)]
         [scriptblock]$Title,
 
         # Keep the .Net Current Directory in sync with PowerShell's
+        [Parameter(ValueFromPipelineByPropertyName)]
         [Alias("CurrentDirectory")]
         [switch]$SetCurrentDirectory,
 
         # If true, set the [PowerLine.Prompt] static members to extended characters from PowerLine fonts
-        [Parameter(ParameterSetName = "PowerLine")]
+        [Parameter(ParameterSetName = "PowerLine", ValueFromPipelineByPropertyName)]
         [switch]$PowerLineFont,
 
         # If true, set the [PowerLine.Prompt] static members to characters available in Consolas and Courier New
         [Parameter(ParameterSetName = "Reset")]
         [switch]$ResetSeparators,
 
         # If true, assume full color support, otherwise normalize to 16 ConsoleColor
-        [Parameter()]
+        [Parameter(ValueFromPipelineByPropertyName)]
         [switch]$FullColor,
 
         # If true, adds ENABLE_VIRTUAL_TERMINAL_PROCESSING to the console output mode. Useful on PowerShell versions that don't restore the console
-        [Parameter()]
+        [Parameter(ValueFromPipelineByPropertyName)]
         [switch]$RestoreVirtualTerminal,
 
         # Add a "I ♥ PS" on a line by itself to it's prompt (using ConsoleColors, to keep it safe from PSReadLine)
+        [Parameter(ValueFromPipelineByPropertyName)]
         [switch]$Newline,
 
         # Add a right-aligned timestamp before the newline (implies Newline)
+        [Parameter(ValueFromPipelineByPropertyName)]
         [switch]$Timestamp,
 
+        # Prevent errors in the prompt from being shown (like the normal PowerShell behavior)
+        [Parameter(ValueFromPipelineByPropertyName)]
         [switch]$HideErrors,
 
         # One or more scriptblocks you want to use as your new prompt
+        [Parameter(ValueFromPipelineByPropertyName)]
         [System.Collections.Generic.List[ScriptBlock]]$Prompt,
 
         # One or more colors you want to use as the prompt background
+        [Parameter(ValueFromPipelineByPropertyName)]
         [System.Collections.Generic.List[PoshCode.Pansies.RgbColor]]$Colors,
 
         # If set, calls Export-PowerLinePrompt
-        [Switch]$Save
-
+        [Parameter()]
+        [Switch]$Save,
+
+        # A hashtable of extended characters you can use in PowerLine output (or any PANSIES output) with HTML entity syntax like "&hearts;". By default you have the HTML named entities plus the Branch (), Lock (), Gear (⛯) and Power (⚡) icons. You can add any characters you wish, but to change the Powerline theme, you need to specify these four keys using matching pairs:
+        #
+        # @{
+        #    "ColorSeparator" = ""
+        #    "ReverseColorSeparator" = ""
+        #    "Separator" = ""
+        #    "ReverseSeparator" = ""
+        # }
+        [Parameter(ValueFromPipelineByPropertyName)]
+        [hashtable]$PowerLineCharacters
     )
     if ($null -eq $script:OldPrompt) {
         $script:OldPrompt = $function:global:prompt
@@ -95,7 +115,7 @@ function Set-PowerLinePrompt {
         }
     }
 
-    if ($PowerLineConfig.FullColor -eq $Null -and $Host.UI.SupportsVirtualTerminal) {
+    if ($Null -eq $PowerLineConfig.FullColor -and $Host.UI.SupportsVirtualTerminal) {
         $PowerLineConfig.FullColor = (Get-Process -Id $global:Pid).MainWindowHandle -ne 0
     }
 
@@ -141,6 +161,11 @@ function Set-PowerLinePrompt {
         [PoshCode.Pansies.Entities]::ExtendedCharacters['Branch'] = [char]0xE0A0
         [PoshCode.Pansies.Entities]::ExtendedCharacters['Gear'] = [char]0x26EF
     }
+    if ($PowerLineCharacters) {
+        foreach ($key in $PowerLineCharacters.Keys) {
+            [PoshCode.Pansies.Entities]::ExtendedCharacters["$key"] = $PowerLineCharacters[$key].ToString()
+        }
+    }
 
     if($null -eq $PowerLineConfig.DefaultAddIndex) {
         $PowerLineConfig.DefaultAddIndex    = -1
diff --git a/Source/postfix.ps1 b/Source/postfix.ps1
@@ -0,0 +1,3 @@
+if (Get-Module EzTheme -ErrorAction SilentlyContinue) {
+    Get-ModuleTheme | Set-PowerLineTheme
+}
diff --git a/build.ps1 b/build.ps1
@@ -1,37 +1,26 @@
-[CmdletBinding()]
+#requires -Module ModuleBuilder
+[CmdletBinding(SupportsShouldProcess)]
 param(
-    [ValidateSet("Release","Debug")]
-    $Configuration = "Release"
-)
-
-Push-Location $PSScriptRoot
-try {
-    $BuildTimer = New-Object System.Diagnostics.Stopwatch
-    $BuildTimer.Start()
+    # A specific folder to build into
+    $OutputDirectory,
 
-    $ModuleName = Split-Path $PSScriptRoot -Leaf
-    $ErrorActionPreference = "Stop"
-    $version = Get-Metadata ".\Source\${ModuleName}.psd1"
-    $folder = mkdir $version -Force
+    # The version of the output module
+    [Alias("ModuleVersion")]
+    [string]$SemVer
+)
 
-    Get-ChildItem Source -filter "${ModuleName}.*" |
-        Copy-Item -Dest $folder.FullName -PassThru |
-        ForEach {
-            Write-Host "  $($_.Name) -> $($_.FullName)"
-        }
+# Sanitize parameters to pass to Build-Module
+$ErrorActionPreference = "Stop"
+Push-Location $PSScriptRoot -StackName BuildModuleScript
 
-    Get-ChildItem Source\Private, Source\Public -Filter *.ps1 -Recurse |
-        Sort-Object Directory, Name |
-        Get-Content |
-        Set-Content "$($folder.FullName)\${ModuleName}.psm1"
-    Write-Host "  PowerLine -> $($folder.FullName)\${ModuleName}.psm1"
+if (-not $Semver -and (Get-Command gitversion -ErrorAction Ignore)) {
+    if ($semver = gitversion -showvariable SemVer) {
+        $null = $PSBoundParameters.Add("SemVer", $SemVer)
+    }
+}
 
-    Write-Host
-    Write-Host "Module build finished." -ForegroundColor Green
-    $BuildTimer.Stop()
-    Write-Host "Total Elapsed $($BuildTimer.Elapsed.ToString("hh\:mm\:ss\.ff"))"
-} catch {
-    throw $_
+try {
+    Build-Module @PSBoundParameters -Target CleanBuild
 } finally {
-    Pop-Location
-}
+    Pop-Location -StackName BuildModuleScript
+}
diff --git a/build.psd1 b/build.psd1
@@ -0,0 +1,9 @@
+# Use this file to override the default parameter values used by the `Build-Module`
+# command when building the module (see `Get-Help Build-Module -Full` for details).
+@{
+    ModuleManifest           = "Source/PowerLine.psd1"
+    OutputDirectory          = "../"
+    VersionedOutputDirectory = $true
+    CopyDirectories          = @('Examples','PowerLine.format.ps1xml','Configuration.psd1')
+    Postfix                  = "postfix.ps1"
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if (Get-Module EzTheme -ErrorAction SilentlyContinue) {`
	`2`	`+ Get-ModuleTheme \| Set-PowerLineTheme`
	`3`	`+}`