Skip to content

Commit df3fbec

Browse files
committed
feat: forked into 'github.com/ralvarezdev/go-strings'
1 parent a5bcbe3 commit df3fbec

File tree

6 files changed

+33
-230
lines changed

6 files changed

+33
-230
lines changed

go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ module github.com/ralvarezdev/go-logger
33
go 1.23.4
44

55
require github.com/ralvarezdev/go-flags v0.3.1
6+
7+
require github.com/ralvarezdev/go-strings v0.1.0

go.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
github.com/ralvarezdev/go-flags v0.3.0 h1:JItUzutZKiVsYxQGRjF9DsGTBvRo3ScadMz5s6YUcKY=
2-
github.com/ralvarezdev/go-flags v0.3.0/go.mod h1:R3yVBYvzwqfOp26LidaiJ/zftVAnPC3pKunVpV/vosE=
1+
github.com/ralvarezdev/go-flags v0.3.1 h1:YxGYUonmr0dwJL+9oDY/4GqCl1CYwYDJExpGXXMc9rU=
32
github.com/ralvarezdev/go-flags v0.3.1/go.mod h1:R3yVBYvzwqfOp26LidaiJ/zftVAnPC3pKunVpV/vosE=
3+
github.com/ralvarezdev/go-strings v0.1.0 h1:bE4eEkdfsHwpgUw+s8/EdLPkRTPki/FTGZx8iEOOQBQ=
4+
github.com/ralvarezdev/go-strings v0.1.0/go.mod h1:8sFOqmPJpqzS7bTjf91EzUCITnwpmkfifwY80GxV5r8=

logger.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
package go_logger
22

33
import (
4-
gologgerseparator "github.com/ralvarezdev/go-logger/separator"
54
gologgerstatus "github.com/ralvarezdev/go-logger/status"
6-
gologgerstrings "github.com/ralvarezdev/go-logger/strings"
5+
gostringsadd "github.com/ralvarezdev/go-strings/add"
6+
gostringsaddformat "github.com/ralvarezdev/go-strings/add/format"
7+
gostringsconvert "github.com/ralvarezdev/go-strings/convert"
8+
gostringsseparator "github.com/ralvarezdev/go-strings/separator"
79
"log"
810
"strings"
911
)
1012

1113
var (
1214
// HeaderSeparator is the header separator
13-
HeaderSeparator = gologgerseparator.NewRepeatedContent(gologgerseparator.Space)
15+
HeaderSeparator = gostringsseparator.NewRepeatedContent(gostringsseparator.Space)
1416

1517
// StatusSeparator is the status separator
16-
StatusSeparator = gologgerseparator.NewRepeatedContent(gologgerseparator.Space)
18+
StatusSeparator = gostringsseparator.NewRepeatedContent(gostringsseparator.Space)
1719

1820
// DescriptionSeparator is the description separator
19-
DescriptionSeparator = gologgerseparator.NewMultiline(
20-
gologgerseparator.Space,
21-
gologgerseparator.NewLine,
21+
DescriptionSeparator = gostringsseparator.NewMultiline(
22+
gostringsseparator.Space,
23+
gostringsseparator.NewLine,
2224
1,
2325
)
2426

2527
// MessageSeparator is the message separator
26-
MessageSeparator = gologgerseparator.Space
28+
MessageSeparator = gostringsseparator.Space
2729

2830
// AddCharactersFn is the add characters function
29-
AddCharactersFn = gologgerstrings.AddBrackets
31+
AddCharactersFn = gostringsadd.Brackets
3032
)
3133

3234
type (
@@ -79,20 +81,18 @@ func (m *Message) String() string {
7981
if m.header != "" {
8082
formattedMessage = append(
8183
formattedMessage,
82-
gologgerstrings.FormatString(
84+
AddCharactersFn(
8385
HeaderSeparator,
8486
m.header,
85-
AddCharactersFn,
8687
),
8788
)
8889
}
8990

9091
// Format status
9192
formattedMessage = append(
9293
formattedMessage,
93-
gologgerstrings.FormatStatus(
94+
m.status.Format(
9495
StatusSeparator,
95-
m.status,
9696
AddCharactersFn,
9797
),
9898
)
@@ -105,7 +105,7 @@ func (m *Message) String() string {
105105
// Add formatted description
106106
if m.description != nil && len(*m.description) > 0 {
107107
formattedMessage = append(
108-
formattedMessage, gologgerstrings.FormatStringArray(
108+
formattedMessage, gostringsaddformat.StringArray(
109109
DescriptionSeparator,
110110
m.description,
111111
AddCharactersFn,
@@ -155,7 +155,7 @@ func (d *DefaultLogger) Info(header, subheader string, details *[]string) {
155155
// Error logs an error message
156156
func (d *DefaultLogger) Error(header, subheader string, errors *[]error) {
157157
// Map errors to a string array
158-
mappedErrors := gologgerstrings.MapErrorArrayToStringArray(errors)
158+
mappedErrors := gostringsconvert.ErrorArrayToStringArray(errors)
159159
d.BuildAndLog(
160160
header,
161161
subheader,

separator/separator.go

-61
This file was deleted.

status/status.go

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package status
22

3+
import (
4+
gostringsadd "github.com/ralvarezdev/go-strings/add"
5+
gostringsseparator "github.com/ralvarezdev/go-strings/separator"
6+
)
7+
38
type (
49
// Status is the status of the logger
510
Status int
@@ -30,3 +35,11 @@ func (s Status) String() string {
3035
return "UNKNOWN"
3136
}
3237
}
38+
39+
// Format gets the formatted status
40+
func (s Status) Format(
41+
contentSeparator *gostringsseparator.Content,
42+
addCharactersFn gostringsadd.CharactersFn,
43+
) string {
44+
return addCharactersFn(contentSeparator, s.String())
45+
}

strings/strings.go

-152
This file was deleted.

0 commit comments

Comments
 (0)