Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ✨ support left align for titles #169

Merged
merged 2 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions internal/align/left.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,24 @@ import (
// field to align left should register here
var left = util.NewSet[string]()

func Register(name string) {
left.Add(name)
func Register(names ...string) {
for _, name := range names {
left.Add(name)
}
}

func IsLeft(name string) bool {
return left.Contains(name)
}

var leftHeaderFooter = util.NewSet[string]()

func RegisterHeaderFooter(names ...string) {
for _, name := range names {
leftHeaderFooter.Add(name)
}
}

func IsLeftHeaderFooter(name string) bool {
return leftHeaderFooter.Contains(name)
}
2 changes: 2 additions & 0 deletions internal/content/group.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package content

import (
"github.com/Equationzhao/g/internal/align"
"runtime"

constval "github.com/Equationzhao/g/internal/const"
Expand Down Expand Up @@ -41,6 +42,7 @@ func (g *GroupEnabler) DisableSmartMode() {
}

func (g *GroupEnabler) EnableGroup(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(GroupName)
return func(info *item.FileInfo) (string, string) {
name, returnFuncName := "", GroupName
if g.Numeric {
Expand Down
2 changes: 2 additions & 0 deletions internal/content/inode.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package content

import (
"github.com/Equationzhao/g/internal/align"
constval "github.com/Equationzhao/g/internal/const"
"github.com/Equationzhao/g/internal/item"
"github.com/Equationzhao/g/internal/osbased"
Expand All @@ -16,6 +17,7 @@ func NewInodeEnabler() *InodeEnabler {
const Inode = constval.NameOfInode

func (i *InodeEnabler) Enable(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(Inode)
return func(info *item.FileInfo) (string, string) {
i := ""
if m, ok := info.Cache[Inode]; ok {
Expand Down
2 changes: 2 additions & 0 deletions internal/content/link.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package content

import (
"github.com/Equationzhao/g/internal/align"
"strconv"

constval "github.com/Equationzhao/g/internal/const"
Expand All @@ -19,6 +20,7 @@ func NewLinkEnabler() *LinkEnabler {
const Link = constval.NameOfLink

func (l *LinkEnabler) Enable(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(Link)
return func(info *item.FileInfo) (string, string) {
return renderer.Link(strconv.FormatUint(osbased.LinkCount(info), 10)), Link
}
Expand Down
2 changes: 2 additions & 0 deletions internal/content/mimetype.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package content

import (
"github.com/Equationzhao/g/internal/align"
"os"
"strings"

Expand All @@ -27,6 +28,7 @@ const (
)

func (e *MimeFileTypeEnabler) Enable(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(MimeTypeName, ParentMimeTypeName)
return func(info *item.FileInfo) (string, string) {
res, returnName := func() (string, string) {
tn := ""
Expand Down
2 changes: 2 additions & 0 deletions internal/content/owner.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package content

import (
"github.com/Equationzhao/g/internal/align"
"runtime"

constval "github.com/Equationzhao/g/internal/const"
Expand Down Expand Up @@ -32,6 +33,7 @@ func (o *OwnerEnabler) DisableNumeric() {
}

func (o *OwnerEnabler) EnableOwner(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(OwnerName)
return func(info *item.FileInfo) (string, string) {
name, returnFuncName := "", ""
if o.Numeric {
Expand Down
3 changes: 3 additions & 0 deletions internal/content/size.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package content

import (
"fmt"
"github.com/Equationzhao/g/internal/align"
"strconv"
"strings"
"sync/atomic"
Expand Down Expand Up @@ -242,6 +243,7 @@ const RecursiveSizeName = "recursive_size"

func (s *SizeEnabler) EnableSize(size SizeUnit, renderer *render.Renderer) ContentOption {
s.sizeUint = size
align.RegisterHeaderFooter(SizeName)
return func(info *item.FileInfo) (string, string) {
var v int64
if s.recursive != nil {
Expand Down Expand Up @@ -271,6 +273,7 @@ func NewBlockSizeEnabler() *BlockSizeEnabler {
const BlockSizeName = "Blocks"

func (b *BlockSizeEnabler) Enable(renderer *render.Renderer) ContentOption {
align.RegisterHeaderFooter(BlockSizeName)
return func(info *item.FileInfo) (string, string) {
res := ""
bs := osbased.BlockSize(info)
Expand Down
2 changes: 2 additions & 0 deletions internal/content/sum.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"crypto/sha256"
"crypto/sha512"
"fmt"
"github.com/Equationzhao/g/internal/align"
"hash"
"hash/crc32"
"io"
Expand Down Expand Up @@ -65,6 +66,7 @@ func (s SumEnabler) EnableSum(renderer *render.Renderer, sumTypes ...SumType) Co
}
length += len(sumTypes) - 1
sumName := fmt.Sprintf("%s(%s)", SumName, strings.Join(types, ","))
align.RegisterHeaderFooter(sumName)
return func(info *item.FileInfo) (string, string) {
if info.IsDir() {
return FillBlank("", length), sumName
Expand Down
14 changes: 11 additions & 3 deletions internal/display/header.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,19 @@ func (h HeaderMaker) Make(p Printer, Items ...*item.FileInfo) {
prettyPrinter, isPrettyPrinter := p.(PrettyPrinter)

expand := func(s string, no, space int) {
// left align
if no != len(h.AllPart)-1 && align.IsLeftHeaderFooter(s) {
_, _ = headerFooterStrBuf.WriteString(strings.Repeat(" ", space-1)) // remove the additional following space for right align
}
_, _ = headerFooterStrBuf.WriteString(constval.Underline)
_, _ = headerFooterStrBuf.WriteString(s)
_, _ = headerFooterStrBuf.WriteString(constval.Reset)
if no != len(h.AllPart)-1 {
_, _ = headerFooterStrBuf.WriteString(strings.Repeat(" ", space))
if !align.IsLeftHeaderFooter(s) {
_, _ = headerFooterStrBuf.WriteString(strings.Repeat(" ", space))
} else {
_, _ = headerFooterStrBuf.WriteString(strings.Repeat(" ", 1)) // still need the following space for left align
}
}
}

Expand All @@ -46,9 +54,9 @@ func (h HeaderMaker) Make(p Printer, Items ...*item.FileInfo) {
if s != constval.NameOfName {
toAddNum := len(s) - WidthNoHyperLinkLen(content.String())
if align.IsLeft(s) {
content.SetSuffix(strings.Repeat(" ", toAddNum))
content.AddSuffix(strings.Repeat(" ", toAddNum))
} else {
content.SetPrefix(strings.Repeat(" ", toAddNum))
content.AddPrefix(strings.Repeat(" ", toAddNum))
}
}
it.Set(s, content)
Expand Down
69 changes: 69 additions & 0 deletions main_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package main

import (
"github.com/Equationzhao/g/internal/config"
"github.com/agiledragon/gomonkey/v2"
"github.com/zeebo/assert"
"io/fs"
"os"
"testing"
)

func Test_catchPanic(t *testing.T) {
gomonkey.ApplyFunc(os.Exit, func(int) {})
tests := []struct {
name string
err any
}{
{
name: "empty",
err: nil,
},
{
name: "ErrExist",
err: fs.ErrExist,
},
{
name: "ErrNotExist",
err: fs.ErrNotExist,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
catchPanic(tt.err)
})
}
}

func Test_preprocessArgs(t *testing.T) {
settingArgs := []string{"--args2", "--args3"}
patch := gomonkey.NewPatches()
defer patch.Reset()
patch.ApplyFunc(config.Load, func() (*config.Config, error) {
return &config.Config{
Args: settingArgs,
}, nil
})

os.Args = []string{"g", "-no-config"}
preprocessArgs() // this will remove -no-config
assert.Equal(t, 1, len(os.Args))

os.Args = []string{"g", "--no-config"}
preprocessArgs() // this will remove -no-config
assert.Equal(t, 1, len(os.Args))

os.Args = []string{"g", "--args1"}
preprocessArgs() // this will add args from config
assert.Equal(t, 4, len(os.Args))
assert.DeepEqual(t, os.Args, []string{"g", "--args2", "--args3", "--args1"})

os.Args = []string{"g", "--args1", "-no-config"}
preprocessArgs()
assert.Equal(t, 2, len(os.Args))

settingArgs[0] = "-no-config"
os.Args = []string{"g", "--args1"}
preprocessArgs()
assert.Equal(t, 2, len(os.Args))
}
Loading