fix(cliff): Fixed double changelog

Signed-off-by: dark0dave <dark0dave@mykolab.com>

Author: dark0dave

cliff.toml

@@ -23,13 +23,6 @@ body = """\
             {% else %} by [{{ commit.author.name }}](https://github.com/{{ commit.author.name }}){%- endif %}\
     {%- endfor -%}
 {% endfor %}
-{% if version %}
-    {% if previous.version %}\
-Full Changelog: [{{ previous.version }}...{{ version }}]({{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }})\
-    {% endif %}\
-{% else -%}\
-  {% raw %}\n{% endraw %}\
-{% endif %}\
 {% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
 ### New Contributors
 {% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}

cmd/file-view.go

@@ -32,9 +32,21 @@ type fileview struct {
 	title    string
 	content  string
 	viewport viewport.Model
+	callback func() (tea.Model, tea.Cmd)
 }
 
-func NewFileView(path string) fileview {
+func NewFileView(content string, title string, callback func() (tea.Model, tea.Cmd)) fileview {
+	f := fileview{title: title, content: content, callback: callback}
+	headerHeight := lipgloss.Height(f.headerView())
+	footerHeight := lipgloss.Height(f.footerView())
+	verticalMarginHeight := headerHeight + footerHeight
+	f.viewport = viewport.New(width, height-verticalMarginHeight)
+	f.viewport.YPosition = headerHeight
+	f.viewport.SetContent(f.content)
+	return f
+}
+
+func NewFileViewFromFile(path string, callback func() (tea.Model, tea.Cmd)) fileview {
 	content := ""
 	if filepath.Ext(path) == ".are" {
 		f, err := os.Open(path)
@@ -56,42 +68,28 @@ func NewFileView(path string) fileview {
 			content = ""
 		}
 	}
-	f := fileview{title: filepath.Base(path), content: content}
-	headerHeight := lipgloss.Height(f.headerView())
-	footerHeight := lipgloss.Height(f.footerView())
-	verticalMarginHeight := headerHeight + footerHeight
-	f.viewport = viewport.New(width, height-verticalMarginHeight)
-	f.viewport.YPosition = headerHeight
-	f.viewport.SetContent(f.content)
-	return f
+	return NewFileView(content, filepath.Base(path), callback)
 }
 
 func (f fileview) Init() tea.Cmd {
 	return nil
 }
 
 func (f fileview) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var (
-		cmd  tea.Cmd
-		cmds []tea.Cmd
-	)
+	var cmd tea.Cmd
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		if k := msg.String(); k == "ctrl+c" || k == "q" || k == "esc" {
-			return f, tea.Quit
+			return f.callback()
 		}
 
 	case tea.WindowSizeMsg:
 		setViewport(f, msg)
 	}
 
-	// Handle keyboard and mouse events in the viewport
 	f.viewport, cmd = f.viewport.Update(msg)
-	// Send an extra WindowSize to update
-	cmds = append(cmds, cmd)
-
-	return f, tea.Batch(cmds...)
+	return f, cmd
 }
 
 func setViewport(f fileview, msg tea.WindowSizeMsg) {

cmd/list-varriables.go

@@ -17,23 +17,18 @@ var baseStyle = lipgloss.NewStyle().
 	BorderForeground(lipgloss.Color("240"))
 
 type listVariables struct {
-	heading []string
-	table   table.Model
+	table table.Model
 }
 
 func generateRows(path string, file fs.FileInfo) *[]table.Row {
 	rows := []table.Row{}
-	fileContent, err := util.ReadFileToString(filepath.Join(path, file.Name()))
+	fileContent, err := util.ReadFileToString(path)
 	if err != nil {
 		return &rows
 	}
 	variables, err := translation.FromFileContents(fileContent)
 	if err == nil {
-		lang_path := strings.Split(path, "/")
-		lang := ""
-		if len(lang_path) > 2 {
-			lang = lang_path[len(lang_path)-2]
-		}
+		lang := filepath.Base(filepath.Dir(path))
 		for _, v := range *variables {
 			rows = append(rows, table.Row{file.Name(), lang, v.Identifier, v.Value})
 		}
@@ -43,18 +38,18 @@ func generateRows(path string, file fs.FileInfo) *[]table.Row {
 
 func NewList(path string) listVariables {
 	columns := []table.Column{
-		{Title: "FileName", Width: 12},
-		{Title: "Lang", Width: 8},
-		{Title: "Id", Width: 4},
-		{Title: "Value", Width: 40},
+		{Title: "FileName", Width: int(0.2 * float64(width))},
+		{Title: "Lang", Width: int(0.1 * float64(width))},
+		{Title: "Id", Width: int(0.05 * float64(width))},
+		{Title: "Value", Width: int(0.55 * float64(width))},
 	}
 	rows := []table.Row{}
 	filepath.WalkDir(path, func(path string, file fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 		ext := filepath.Ext(file.Name())
-		if !file.IsDir() && ext == ".tra" {
+		if !file.IsDir() && strings.ToLower(ext) == ".tra" {
 			info, _ := file.Info()
 			file_rows := *generateRows(path, info)
 			rows = append(rows, file_rows...)
@@ -67,7 +62,7 @@ func NewList(path string) listVariables {
 		table.WithColumns(columns),
 		table.WithRows(rows),
 		table.WithFocused(true),
-		table.WithHeight(7),
+		table.WithHeight(height-7),
 	)
 
 	s := table.DefaultStyles()
@@ -91,6 +86,24 @@ func (l listVariables) Init() tea.Cmd { return nil }
 func (l listVariables) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		h, w := docStyle.GetFrameSize()
+		h1, w1 := baseStyle.GetFrameSize()
+		h += h1
+		w += w1
+		if msg.Height > h {
+			l.table.SetHeight(msg.Height - h)
+		}
+		if msg.Width > w {
+			ratio := float64(msg.Width - w)
+			l.table.SetColumns([]table.Column{
+				{Title: "FileName", Width: int(0.2 * ratio)},
+				{Title: "Lang", Width: int(0.1 * ratio)},
+				{Title: "Id", Width: int(0.05 * ratio)},
+				{Title: "Value", Width: int(0.55 * ratio)},
+			})
+			l.table.SetWidth(int(ratio))
+		}
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "esc":
@@ -99,19 +112,26 @@ func (l listVariables) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			} else {
 				l.table.Focus()
 			}
-		case "q", "ctrl+c":
+		case "q", "ctrl+c", "ctrl+d":
 			return l, tea.Quit
 		case "enter":
-			l.heading = []string{""}
+			content := ""
 			counter := 0
-			for _, s := range strings.Split(l.table.SelectedRow()[2], " ") {
+			for _, s := range strings.Split(l.table.SelectedRow()[3], " ") {
 				counter += len(s)
 				if counter >= 42 {
-					l.heading = append(l.heading, "\n")
+					content += "\n"
 					counter = 0
+				} else if strings.Trim(content, " ") != "" {
+					content += " "
 				}
-				l.heading = append(l.heading, s)
+				content += s
 			}
+			title := strings.Join(l.table.SelectedRow()[:3], " ")
+			f := NewFileView(content, title, func() (tea.Model, tea.Cmd) {
+				return l, cmd
+			})
+			return f, f.Init()
 		}
 	}
 	l.table, cmd = l.table.Update(msg)
@@ -120,12 +140,5 @@ func (l listVariables) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (l listVariables) View() string {
 	body := []string{l.table.View(), "\n\n", l.table.HelpView(), " enter"}
-	if len(l.heading) == 0 {
-		return baseStyle.Render(body...)
-	} else {
-		payload := l.heading
-		payload = append(payload, "\n")
-		payload = append(payload, body...)
-		return baseStyle.Render(payload...)
-	}
+	return baseStyle.Render(body...)
 }

cmd/tree.go

@@ -86,7 +86,9 @@ func (n nested) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "e", "enter":
 			nodes := n.tree.Nodes()
 			node, _ := getSelected(&n, &nodes, 0)
-			f := NewFileView(node.Desc)
+			f := NewFileViewFromFile(node.Desc, func() (tea.Model, tea.Cmd) {
+				return n, nil
+			})
 			return f, f.Init()
 		}
 	}

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/charmbracelet/lipgloss v0.13.0
 	github.com/dark0dave/infinity_file_formats v0.0.0-20241126215235-54369c958d54
 	github.com/savannahostrowski/tree-bubble v0.0.0-20230724043728-d7bb06a8a67e
+	golang.org/x/text v0.3.8
 )
 
 require (
@@ -30,5 +31,4 @@ require (
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.3.8 // indirect
 )

pkg/translation/varriables.go

@@ -3,6 +3,11 @@ package translation
 import (
 	"errors"
 	"fmt"
+	"unicode"
+
+	"golang.org/x/text/runes"
+	"golang.org/x/text/transform"
+	"golang.org/x/text/unicode/norm"
 )
 
 var (
@@ -36,6 +41,14 @@ func (v *Variable) end() int {
 	return v.valueEnd
 }
 
+func ToAscii(str string) string {
+	result, _, err := transform.String(transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn))), str)
+	if err != nil {
+		return ""
+	}
+	return result
+}
+
 func FromString(s string, start int) (*Variable, error) {
 	v := &Variable{}
 	for i := start; i < len(s); i++ {
@@ -59,7 +72,7 @@ func FromString(s string, start int) (*Variable, error) {
 		// "~" is 126
 		if v.isRecording() && s[i] == 126 {
 			v.valueEnd = i
-			v.Value = s[v.valueStart:v.valueEnd]
+			v.Value = ToAscii(s[v.valueStart:v.valueEnd])
 			v.toggleRecording()
 			break
 		}

pkg/translation/varriables_test.go

@@ -29,6 +29,14 @@ func TestString(t *testing.T) {
 			testString: "@123 test string~",
 			error:      ErrValue,
 		},
+		{
+			expected: &Variable{
+				Identifier: "0",
+				Value:      "Aboleth le�� ve sv� n�dr�i, mimo dosah tv�ch zbran�. Mus� naj�t jin� zp�sob, jak zni�it mechanismus, kter� ho dr�� na�ivu.",
+			},
+			testString: "@0    = ~Aboleth le�� ve sv� n�dr�i, mimo dosah tv�ch zbran�. Mus� naj�t jin� zp�sob, jak zni�it mechanismus, kter� ho dr�� na�ivu.~",
+			error:      nil,
+		},
 	}
 	for _, tc := range testCases {
 		v, err := FromString(tc.testString, 0)