refactor: move segments to module

docs/docs/contributing-segment.md

@@ -6,7 +6,7 @@ sidebar_label: Add Segment
 
 ## Create the logic
 
-Add a new file following this convention: `new_segment.go`.
+Add a new file in the `./src/segments` folder: `new.go`.
 Ensure `New` is a single verb indicating the context the segment renders.
 
 You can use the following template as a guide.
@@ -50,7 +50,7 @@ This will facilitate the review process as not all environments display the icon
 You can find these values and query for icons easily at [Nerd Fonts][nf-icons].
 
 For each segment, there's a single test file ensuring the functionality going forward. The convention
-is `new_segment_test.go`, have a look at [existing segment tests][tests] for inspiration. Oh My Posh makes
+is `new_test.go`, have a look at [existing segment tests][tests] for inspiration. Oh My Posh makes
 use of the test tables pattern for all newly added tests. See [this][tables] blog post for more information.
 
 ## Create a name for your Segment
@@ -168,5 +168,5 @@ And be patient, I'm going as fast as I can 🏎
 [docs]: https://github.com/JanDeDobbeleer/oh-my-posh/tree/main/docs/docs
 [sidebars]: https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/docs/sidebars.js
 [nf-icons]: https://www.nerdfonts.com/cheat-sheet
-[tests]: hhttps://github.com/JanDeDobbeleer/oh-my-posh/blob/main/src/segment_az_test.go
+[tests]: hhttps://github.com/JanDeDobbeleer/oh-my-posh/blob/main/src/segments/az_test.go
 [tables]: https://blog.alexellis.io/golang-writing-unit-tests/

src/config.go

@@ -10,6 +10,7 @@ import (
 	"oh-my-posh/color"
 	"oh-my-posh/environment"
 	"oh-my-posh/properties"
+	"oh-my-posh/segments"
 	"os"
 	"strconv"
 	"strings"
@@ -48,15 +49,6 @@ type TransientPrompt struct {
 	Foreground string `config:"foreground"`
 }
 
-const (
-	// HTTPTimeout timeout used when executing http request
-	HTTPTimeout properties.Property = "http_timeout"
-	// DefaultHTTPTimeout default timeout used when executing http request
-	DefaultHTTPTimeout = 20
-	// DefaultCacheTimeout default timeout used when caching data
-	DefaultCacheTimeout = 10
-)
-
 func printConfigError(err error, eval bool) {
 	if eval {
 		fmt.Println("echo \"Oh My Posh Error:\n\"", err.Error())
@@ -208,8 +200,8 @@ func getDefaultConfig(info string) *Config {
 						Background:      "#fffb38",
 						Foreground:      "#193549",
 						Properties: properties.Map{
-							FetchStashCount:   true,
+							segments.FetchStashCount:   true,
-							FetchUpstreamIcon: true,
+							segments.FetchUpstreamIcon: true,
 						},
 					},
 					{

src/config_test.go

@@ -1,9 +1,11 @@
 package main
 
 import (
+	"oh-my-posh/segments"
 	"testing"
 
 	"github.com/gookit/config/v2"
+	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -17,3 +19,29 @@ func TestSettingsExportJSON(t *testing.T) {
 func testClearDefaultConfig() {
 	config.Default().ClearAll()
 }
+
+func TestParseMappedLocations(t *testing.T) {
+	defer testClearDefaultConfig()
+	cases := []struct {
+		Case string
+		JSON string
+	}{
+		{Case: "new format", JSON: `{ "properties": { "mapped_locations": {"folder1": "one","folder2": "two"} } }`},
+		{Case: "old format", JSON: `{ "properties": { "mapped_locations": [["folder1", "one"], ["folder2", "two"]] } }`},
+	}
+	for _, tc := range cases {
+		config.ClearAll()
+		config.WithOptions(func(opt *config.Options) {
+			opt.DecoderConfig = &mapstructure.DecoderConfig{
+				TagName: "config",
+			}
+		})
+		err := config.LoadStrings(config.JSON, tc.JSON)
+		assert.NoError(t, err)
+		var segment Segment
+		err = config.BindStruct("", &segment)
+		assert.NoError(t, err)
+		mappedLocations := segment.Properties.GetKeyValueMap(segments.MappedLocations, make(map[string]string))
+		assert.Equal(t, "two", mappedLocations["folder2"])
+	}
+}

src/console_title.go

@@ -3,6 +3,7 @@ package main
 import (
 	"oh-my-posh/color"
 	"oh-my-posh/environment"
+	"oh-my-posh/template"
 	"strings"
 )
 
@@ -41,11 +42,11 @@ func (t *consoleTitle) getConsoleTitle() string {
 }
 
 func (t *consoleTitle) getTemplateText() string {
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: t.config.ConsoleTitleTemplate,
 		Env:      t.env,
 	}
-	if text, err := template.render(); err == nil {
+	if text, err := tmpl.Render(); err == nil {
 		return text
 	}
 	return ""

src/constants/constants_unix.go

@@ -0,0 +1,7 @@
+//go:build !windows
+
+package constants
+
+const (
+	DotnetExitCode = 142
+)

src/constants/constants_windows64.go

@@ -0,0 +1,7 @@
+//go:build windows && !386
+
+package constants
+
+const (
+	DotnetExitCode = int(0x80008091)
+)

src/constants/constrants_windows386.go

@@ -0,0 +1,7 @@
+//go:build windows && 386
+
+package constants
+
+const (
+	DotnetExitCode = -2147450735
+)

src/constants_unix.go

@@ -1,7 +0,0 @@
-//go:build !windows
-
-package main
-
-const (
-	dotnetExitCode = 142
-)

src/constants_windows64.go

@@ -1,7 +0,0 @@
-//go:build windows && !386
-
-package main
-
-const (
-	dotnetExitCode = int(0x80008091)
-)

src/constrants_windows386.go

@@ -1,7 +0,0 @@
-//go:build windows && 386
-
-package main
-
-const (
-	dotnetExitCode = -2147450735
-)

src/engine.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"oh-my-posh/color"
 	"oh-my-posh/environment"
+	"oh-my-posh/template"
 	"strings"
 	"time"
 )
@@ -240,11 +241,11 @@ func (e *engine) renderTransientPrompt() string {
 	if len(promptTemplate) == 0 {
 		promptTemplate = "{{ .Shell }}> "
 	}
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: promptTemplate,
 		Env:      e.env,
 	}
-	prompt, err := template.render()
+	prompt, err := tmpl.Render()
 	if err != nil {
 		prompt = err.Error()
 	}

src/main.go

@@ -7,6 +7,7 @@ import (
 	"oh-my-posh/color"
 	"oh-my-posh/environment"
 	"oh-my-posh/regex"
+	"oh-my-posh/template"
 	"os"
 	"strings"
 	"time"
@@ -311,12 +312,12 @@ func getConsoleBackgroundColor(env environment.Environment, backgroundColorTempl
 	if len(backgroundColorTemplate) == 0 {
 		return backgroundColorTemplate
 	}
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: backgroundColorTemplate,
 		Context:  nil,
 		Env:      env,
 	}
-	text, err := template.render()
+	text, err := tmpl.Render()
 	if err != nil {
 		return err.Error()
 	}

src/segment.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"oh-my-posh/environment"
 	"oh-my-posh/properties"
+	"oh-my-posh/segments"
+	"oh-my-posh/template"
 	"runtime/debug"
 	"time"
 )
@@ -148,12 +150,12 @@ const (
 )
 
 func (segment *Segment) string() string {
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: segment.writer.Template(),
 		Context:  segment.writer,
 		Env:      segment.env,
 	}
-	text, err := template.render()
+	text, err := tmpl.Render()
 	if err != nil {
 		return err.Error()
 	}
@@ -208,13 +210,13 @@ func (segment *Segment) getColor(templates []string, defaultColor string) string
 	if len(templates) == 0 {
 		return defaultColor
 	}
-	txtTemplate := &textTemplate{
+	txtTemplate := &template.Text{
 		Context: segment.writer,
 		Env:     segment.env,
 	}
-	for _, template := range templates {
+	for _, tmpl := range templates {
-		txtTemplate.Template = template
+		txtTemplate.Template = tmpl
-		value, err := txtTemplate.render()
+		value, err := txtTemplate.Render()
 		if err != nil || value == "" {
 			continue
 		}
@@ -243,49 +245,49 @@ func (segment *Segment) background() string {
 func (segment *Segment) mapSegmentWithWriter(env environment.Environment) error {
 	segment.env = env
 	functions := map[SegmentType]SegmentWriter{
-		OWM:           &Owm{},
+		OWM:           &segments.Owm{},
-		SESSION:       &Session{},
+		SESSION:       &segments.Session{},
-		PATH:          &Path{},
+		PATH:          &segments.Path{},
-		GIT:           &Git{},
+		GIT:           &segments.Git{},
-		PLASTIC:       &Plastic{},
+		PLASTIC:       &segments.Plastic{},
-		EXIT:          &Exit{},
+		EXIT:          &segments.Exit{},
-		PYTHON:        &Python{},
+		PYTHON:        &segments.Python{},
-		ROOT:          &Root{},
+		ROOT:          &segments.Root{},
-		TEXT:          &Text{},
+		TEXT:          &segments.Text{},
-		TIME:          &Time{},
+		TIME:          &segments.Time{},
-		CMD:           &Cmd{},
+		CMD:           &segments.Cmd{},
-		BATTERY:       &Battery{},
+		BATTERY:       &segments.Battery{},
-		SPOTIFY:       &Spotify{},
+		SPOTIFY:       &segments.Spotify{},
-		SHELL:         &Shell{},
+		SHELL:         &segments.Shell{},
-		NODE:          &Node{},
+		NODE:          &segments.Node{},
-		OS:            &Os{},
+		OS:            &segments.Os{},
-		AZ:            &Az{},
+		AZ:            &segments.Az{},
-		KUBECTL:       &Kubectl{},
+		KUBECTL:       &segments.Kubectl{},
-		DOTNET:        &Dotnet{},
+		DOTNET:        &segments.Dotnet{},
-		TERRAFORM:     &Terraform{},
+		TERRAFORM:     &segments.Terraform{},
-		GOLANG:        &Golang{},
+		GOLANG:        &segments.Golang{},
-		JULIA:         &Julia{},
+		JULIA:         &segments.Julia{},
-		YTM:           &Ytm{},
+		YTM:           &segments.Ytm{},
-		EXECUTIONTIME: &Executiontime{},
+		EXECUTIONTIME: &segments.Executiontime{},
-		RUBY:          &Ruby{},
+		RUBY:          &segments.Ruby{},
-		AWS:           &Aws{},
+		AWS:           &segments.Aws{},
-		JAVA:          &Java{},
+		JAVA:          &segments.Java{},
-		POSHGIT:       &PoshGit{},
+		POSHGIT:       &segments.PoshGit{},
-		AZFUNC:        &AzFunc{},
+		AZFUNC:        &segments.AzFunc{},
-		CRYSTAL:       &Crystal{},
+		CRYSTAL:       &segments.Crystal{},
-		DART:          &Dart{},
+		DART:          &segments.Dart{},
-		NBGV:          &Nbgv{},
+		NBGV:          &segments.Nbgv{},
-		RUST:          &Rust{},
+		RUST:          &segments.Rust{},
-		SYSTEMINFO:    &SystemInfo{},
+		SYSTEMINFO:    &segments.SystemInfo{},
-		ANGULAR:       &Angular{},
+		ANGULAR:       &segments.Angular{},
-		PHP:           &Php{},
+		PHP:           &segments.Php{},
-		NIGHTSCOUT:    &Nightscout{},
+		NIGHTSCOUT:    &segments.Nightscout{},
-		STRAVA:        &Strava{},
+		STRAVA:        &segments.Strava{},
-		WAKATIME:      &Wakatime{},
+		WAKATIME:      &segments.Wakatime{},
-		WIFI:          &Wifi{},
+		WIFI:          &segments.Wifi{},
-		WINREG:        &WindowsRegistry{},
+		WINREG:        &segments.WindowsRegistry{},
-		BREWFATHER:    &Brewfather{},
+		BREWFATHER:    &segments.Brewfather{},
-		IPIFY:         &IPify{},
+		IPIFY:         &segments.IPify{},
 	}
 	if segment.Properties == nil {
 		segment.Properties = make(properties.Map)

src/segment_test.go

@@ -5,6 +5,7 @@ import (
 	"oh-my-posh/environment"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/segments"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -198,7 +199,7 @@ func TestGetColors(t *testing.T) {
 			Env: make(map[string]string),
 		})
 		segment := &Segment{
-			writer: &Aws{
+			writer: &segments.Aws{
 				Profile: tc.Profile,
 				Region:  tc.Region,
 			},

src/segments/angular.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/angular_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/aws.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/aws_test.go

@@ -1,8 +1,9 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/template"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -44,7 +45,7 @@ func TestAWSSegment(t *testing.T) {
 			Region:          "eu-west",
 			Template:        "profile: {{.Profile}}{{if .Region}} in {{.Region}}{{end}}",
 		},
-		{Case: "template: invalid", ExpectedString: invalidTemplate, ExpectedEnabled: true, Profile: "c", Template: "{{ .Burp"},
+		{Case: "template: invalid", ExpectedString: template.InvalidTemplate, ExpectedEnabled: true, Profile: "c", Template: "{{ .Burp"},
 	}
 
 	for _, tc := range cases {

src/segments/az.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/az_functions.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/az_test.go

@@ -1,10 +1,11 @@
-package main
+package segments
 
 import (
 	"io/ioutil"
 	"oh-my-posh/environment"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/template"
 	"path/filepath"
 	"testing"
 
@@ -49,7 +50,7 @@ func TestAzSegment(t *testing.T) {
 		{
 			Case:            "Faulty template",
 			ExpectedEnabled: true,
-			ExpectedString:  incorrectTemplate,
+			ExpectedString:  template.IncorrectTemplate,
 			Template:        "{{ .Burp }}",
 			HasPowerShell:   true,
 		},
@@ -75,15 +76,15 @@ func TestAzSegment(t *testing.T) {
 		env.On("Home").Return(home)
 		var azureProfile, azureRmContext, azureRMContext string
 		if tc.HasCLI {
-			content, _ := ioutil.ReadFile("./test/azureProfile.json")
+			content, _ := ioutil.ReadFile("../test/azureProfile.json")
 			azureProfile = string(content)
 		}
 		if tc.HasPowerShell {
-			content, _ := ioutil.ReadFile("./test/AzureRmContext.json")
+			content, _ := ioutil.ReadFile("../test/AzureRmContext.json")
 			azureRmContext = string(content)
 		}
 		if tc.HasPowerShellUnix {
-			content, _ := ioutil.ReadFile("./test/AzureRmContext.json")
+			content, _ := ioutil.ReadFile("../test/AzureRmContext.json")
 			azureRMContext = string(content)
 		}
 		env.On("GOOS").Return(environment.LinuxPlatform)

src/segments/battery.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"math"

src/segments/battery_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"testing"

src/segments/brewfather.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/base64"

src/segments/brewfather_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/command.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/command_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/crystal.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/crystal_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/dart.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/dart_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/dotnet.go

@@ -1,6 +1,7 @@
-package main
+package segments
 
 import (
+	"oh-my-posh/constants"
 	"oh-my-posh/environment"
 	"oh-my-posh/properties"
 )
@@ -37,6 +38,6 @@ func (d *Dotnet) Enabled() bool {
 	if !enabled {
 		return false
 	}
-	d.Unsupported = d.language.exitCode == dotnetExitCode
+	d.Unsupported = d.language.exitCode == constants.DotnetExitCode
 	return true
 }

src/segments/dotnet_test.go

@@ -1,6 +1,7 @@
-package main
+package segments
 
 import (
+	"oh-my-posh/constants"
 	"oh-my-posh/environment"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
@@ -18,7 +19,7 @@ func TestDotnetSegment(t *testing.T) {
 		Version      string
 		FetchVersion bool
 	}{
-		{Case: "Unsupported version", Expected: "\uf071", HasCommand: true, FetchVersion: true, ExitCode: dotnetExitCode, Version: "3.1.402"},
+		{Case: "Unsupported version", Expected: "\uf071", HasCommand: true, FetchVersion: true, ExitCode: constants.DotnetExitCode, Version: "3.1.402"},
 		{Case: "Regular version", Expected: "3.1.402", HasCommand: true, FetchVersion: true, Version: "3.1.402"},
 		{Case: "Regular version", Expected: "", HasCommand: true, FetchVersion: false, Version: "3.1.402"},
 		{Case: "Regular version", Expected: "", HasCommand: false, FetchVersion: false, Version: "3.1.402"},

src/segments/executiontime.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/executiontime_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/exit.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/exit_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/git.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/git_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/golang.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/golang_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"errors"
@@ -53,7 +53,7 @@ func TestGolang(t *testing.T) {
 			ParseModFile:          true,
 			HasModFileInParentDir: true,
 			InvalidModfile:        true,
-			ExpectedString:        "./go.mod:1: unknown directive: invalid",
+			ExpectedString:        "../go.mod:1: unknown directive: invalid",
 			Version:               "go version go1.16 darwin/amd64",
 		},
 	}
@@ -68,7 +68,7 @@ func TestGolang(t *testing.T) {
 		if tc.ParseModFile {
 			props[ParseModFile] = tc.ParseModFile
 			fileInfo := &environment.FileInfo{
-				Path:         "./go.mod",
+				Path:         "../go.mod",
 				ParentFolder: "./",
 				IsDir:        false,
 			}

src/segments/ipify.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/ipify_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"errors"

src/segments/java.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/java_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/julia.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/julia_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/kubectl.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/kubectl_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"
@@ -111,7 +111,7 @@ func TestKubectlSegment(t *testing.T) {
 		env := new(mock.MockedEnvironment)
 		env.On("HasCommand", "kubectl").Return(tc.KubectlExists)
 		var kubeconfig string
-		content, err := ioutil.ReadFile("./test/kubectl.yml")
+		content, err := ioutil.ReadFile("../test/kubectl.yml")
 		if err == nil {
 			kubeconfig = fmt.Sprintf(string(content), tc.Cluster, tc.UserName, tc.Namespace, tc.Context)
 		}

src/segments/language.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"errors"
@@ -6,6 +6,7 @@ import (
 	"oh-my-posh/environment"
 	"oh-my-posh/properties"
 	"oh-my-posh/regex"
+	"oh-my-posh/template"
 )
 
 const (
@@ -196,12 +197,12 @@ func (l *language) buildVersionURL() {
 	if len(versionURLTemplate) == 0 {
 		return
 	}
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: versionURLTemplate,
 		Context:  l.version,
 		Env:      l.env,
 	}
-	url, err := template.render()
+	url, err := tmpl.Render()
 	if err != nil {
 		return
 	}

src/segments/language_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/nbgv.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/nbgv_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"errors"

src/segments/nightscout.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/nightscout_test.go

@@ -1,9 +1,10 @@
-package main
+package segments
 
 import (
 	"errors"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/template"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -124,7 +125,7 @@ func TestNSSegment(t *testing.T) {
 			JSONResponse: `
 			[{"sgv":50,"direction":"DoubleDown"}]`,
 			Template:        " {{.Sgv}}{{.Burp}}",
-			ExpectedString:  incorrectTemplate,
+			ExpectedString:  template.IncorrectTemplate,
 			ExpectedEnabled: true,
 			CacheTimeout:    10,
 		},

src/segments/node.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/node_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/os.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/os_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/owm.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/owm_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"errors"

src/segments/path.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/path_test.go

@@ -1,13 +1,12 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/template"
 	"testing"
 
-	"github.com/gookit/config/v2"
-	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -24,12 +23,12 @@ func renderTemplate(env *mock.MockedEnvironment, segmentTemplate string, context
 			Env: make(map[string]string),
 		})
 	}
-	template := &textTemplate{
+	tmpl := &template.Text{
 		Template: segmentTemplate,
 		Context:  context,
 		Env:      env,
 	}
-	text, err := template.render()
+	text, err := tmpl.Render()
 	if err != nil {
 		return err.Error()
 	}
@@ -628,29 +627,3 @@ func TestGetPwd(t *testing.T) {
 		assert.Equal(t, tc.Expected, got)
 	}
 }
-
-func TestParseMappedLocations(t *testing.T) {
-	defer testClearDefaultConfig()
-	cases := []struct {
-		Case string
-		JSON string
-	}{
-		{Case: "new format", JSON: `{ "properties": { "mapped_locations": {"folder1": "one","folder2": "two"} } }`},
-		{Case: "old format", JSON: `{ "properties": { "mapped_locations": [["folder1", "one"], ["folder2", "two"]] } }`},
-	}
-	for _, tc := range cases {
-		config.ClearAll()
-		config.WithOptions(func(opt *config.Options) {
-			opt.DecoderConfig = &mapstructure.DecoderConfig{
-				TagName: "config",
-			}
-		})
-		err := config.LoadStrings(config.JSON, tc.JSON)
-		assert.NoError(t, err)
-		var segment Segment
-		err = config.BindStruct("", &segment)
-		assert.NoError(t, err)
-		mappedLocations := segment.Properties.GetKeyValueMap(MappedLocations, make(map[string]string))
-		assert.Equal(t, "two", mappedLocations["folder2"])
-	}
-}

src/segments/php.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/php_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/plastic.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/plastic_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/posh_git.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/posh_git_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/properties.go

@@ -0,0 +1,12 @@
+package segments
+
+import "oh-my-posh/properties"
+
+const (
+	// HTTPTimeout timeout used when executing http request
+	HTTPTimeout properties.Property = "http_timeout"
+	// DefaultHTTPTimeout default timeout used when executing http request
+	DefaultHTTPTimeout = 20
+	// DefaultCacheTimeout default timeout used when caching data
+	DefaultCacheTimeout = 10
+)

src/segments/python.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/python_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/root.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/ruby.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/ruby_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/rust.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/rust_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/scm.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"fmt"

src/segments/scm_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/session.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/session_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/shell.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/shell_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/spotify.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/spotify_darwin.go

@@ -1,6 +1,6 @@
 //go:build darwin
 
-package main
+package segments
 
 func (s *Spotify) Enabled() bool {
 	var err error

src/segments/spotify_darwin_test.go

@@ -1,6 +1,6 @@
 //go:build darwin
 
-package main
+package segments
 
 import (
 	"errors"

src/segments/spotify_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/spotify_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package main
+package segments
 
 import (
 	"strings"

src/segments/spotify_windows_test.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package main
+package segments
 
 import (
 	"errors"

src/segments/spotify_wsl.go

@@ -1,13 +1,13 @@
 //go:build !darwin && !windows
 
-package main
+package segments
 
 import (
 	"encoding/csv"
 	"strings"
 )
 
-func (s *spotify) Enabled() bool {
+func (s *Spotify) Enabled() bool {
 	if !s.env.IsWsl() {
 		return false
 	}

src/segments/spotify_wsl_test.go

@@ -1,6 +1,6 @@
 //go:build !darwin && !windows
 
-package main
+package segments
 
 import (
 	"fmt"
@@ -57,7 +57,7 @@ func TestSpotifyWsl(t *testing.T) {
 		env := new(mock.MockedEnvironment)
 		env.On("IsWsl").Return(true)
 		env.On("RunCommand", "tasklist.exe", []string{"/V", "/FI", "Imagename eq Spotify.exe", "/FO", "CSV", "/NH"}).Return(tc.ExecOutput, nil)
-		s := &spotify{
+		s := &Spotify{
 			env:   env,
 			props: properties.Map{},
 		}

src/segments/strava.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"encoding/json"

src/segments/strava_test.go

@@ -1,10 +1,11 @@
-package main
+package segments
 
 import (
 	"errors"
 	"fmt"
 	"oh-my-posh/mock"
 	"oh-my-posh/properties"
+	"oh-my-posh/template"
 	"testing"
 	"time"
 
@@ -130,7 +131,7 @@ func TestStravaSegment(t *testing.T) {
 			JSONResponse: `
 			[{"sgv":50,"direction":"DoubleDown"}]`,
 			Template:        "{{.Ago}}{{.Burp}}",
-			ExpectedString:  incorrectTemplate,
+			ExpectedString:  template.IncorrectTemplate,
 			ExpectedEnabled: true,
 			CacheTimeout:    10,
 		},

src/segments/sysinfo.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/sysinfo_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/terraform.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/terraform_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/mock"

src/segments/text.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/text_test.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"

src/segments/time.go

@@ -1,4 +1,4 @@
-package main
+package segments
 
 import (
 	"oh-my-posh/environment"