feat: locales and minor fixes
This commit is contained in:
@@ -6,6 +6,8 @@ import (
|
||||
"fmt"
|
||||
"github.com/kuzgoga/fogg"
|
||||
"github.com/xuri/excelize/v2"
|
||||
"golang.org/x/text/language"
|
||||
"golang.org/x/text/message"
|
||||
"log/slog"
|
||||
"reflect"
|
||||
"slices"
|
||||
@@ -18,6 +20,8 @@ type TableHeaders struct {
|
||||
IgnoredFieldsIndexes []int
|
||||
}
|
||||
|
||||
var p = message.NewPrinter(language.Russian)
|
||||
|
||||
func isPrimitiveType(valueType reflect.Type) bool {
|
||||
switch valueType.Kind() {
|
||||
case reflect.Bool,
|
||||
@@ -48,7 +52,7 @@ func ExportEntitiesToSpreadsheet(filename string, exporters ...ExporterInterface
|
||||
file := excelize.NewFile()
|
||||
defer func() {
|
||||
if err := file.Close(); err != nil {
|
||||
slog.Error("Error while closing excel file: ", err)
|
||||
slog.Error(p.Sprintf("Error while closing excel file: %s", err))
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -125,7 +129,7 @@ func ExportEntityToSpreadsheet[T any](file *excelize.File, sheetName string, ent
|
||||
err = file.SetCellValue(sheetName, cellName, fieldValue)
|
||||
}
|
||||
|
||||
slog.Info(fmt.Sprintf("Field %s value: %v, %s\n", cellName, fieldValue, datatype))
|
||||
slog.Info(p.Sprintf("Field %s value: %v, %s\n", cellName, fieldValue, datatype))
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -176,7 +180,7 @@ func getNestedFieldValue(obj reflect.Value, path string) (any, error) {
|
||||
val = val.FieldByName(field)
|
||||
|
||||
if !val.IsValid() {
|
||||
return nil, fmt.Errorf("field %s not found", field)
|
||||
return nil, errors.New(p.Sprintf("field %s not found", field))
|
||||
}
|
||||
}
|
||||
return val.Interface(), nil
|
||||
@@ -193,7 +197,7 @@ func SerializeNestedField(fieldInfo reflect.StructField, fieldValue reflect.Valu
|
||||
if tag.HasTag("ui") && tag.GetTag("ui").HasParam("field") {
|
||||
uiTag = *tag.GetTag("ui")
|
||||
} else {
|
||||
slog.Error("Fail to extract Field tag")
|
||||
slog.Error(p.Sprintf("Fail to extract Field tag"))
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
@@ -254,7 +258,7 @@ func ExportHeaders(entity any) (TableHeaders, error) {
|
||||
for i := range v.NumField() {
|
||||
tag, err := fogg.Parse(string(v.Field(i).Tag))
|
||||
if err != nil {
|
||||
return headers, errors.New(fmt.Sprintf("Error occured while tag parsing `%s`: %s", err, string(v.Field(i).Tag)))
|
||||
return headers, errors.New(p.Sprintf("Error occurred while tag parsing `%s`: %s", err, string(v.Field(i).Tag)))
|
||||
}
|
||||
|
||||
uiTag := tag.GetTag("ui")
|
||||
@@ -303,7 +307,7 @@ func WriteHeaders(sheetName string, entity any, file *excelize.File) (TableHeade
|
||||
func GetStyleId(f *excelize.File, style *excelize.Style) (int, error) {
|
||||
styleId, err := f.NewStyle(style)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("error occured while creating a style: %w", err)
|
||||
return 0, errors.New(p.Sprintf("error occurred while creating a style: %w", err))
|
||||
}
|
||||
|
||||
return styleId, nil
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package excel
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"errors"
|
||||
"log/slog"
|
||||
|
||||
"github.com/xuri/excelize/v2"
|
||||
@@ -15,7 +15,7 @@ type Importer struct {
|
||||
|
||||
func ImportEntitiesFromSpreadsheet(path string, importers ...Importer) error {
|
||||
for _, importer := range importers {
|
||||
err := ImportEntitiesFromSpreadsheet(path, importer)
|
||||
err := ImportFromSpreadsheet(path, importer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -28,7 +28,7 @@ func ImportFromSpreadsheet(filepath string, importer Importer) error {
|
||||
defer func() {
|
||||
err := f.Close()
|
||||
if err != nil {
|
||||
slog.Error(fmt.Sprintf("Failed to close file: %s", err))
|
||||
slog.Error(p.Sprintf("Failed to close file: %s", err))
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -36,6 +36,11 @@ func ImportFromSpreadsheet(filepath string, importer Importer) error {
|
||||
return err
|
||||
}
|
||||
|
||||
sheetIndex, err := f.GetSheetIndex("MySheet")
|
||||
if err != nil || sheetIndex == -1 {
|
||||
return errors.New(p.Sprintf("Sheet `%s` not found", importer.SheetName))
|
||||
}
|
||||
|
||||
rows, err := f.GetRows(importer.SheetName)
|
||||
|
||||
if err != nil {
|
||||
|
||||
25
internal/addons/excel/locales.go
Normal file
25
internal/addons/excel/locales.go
Normal file
@@ -0,0 +1,25 @@
|
||||
package excel
|
||||
|
||||
import (
|
||||
"golang.org/x/text/language"
|
||||
"golang.org/x/text/message"
|
||||
)
|
||||
|
||||
func init() {
|
||||
excelAddon()
|
||||
}
|
||||
|
||||
func excelAddon() {
|
||||
message.SetString(language.Russian, "Error while closing excel file: %v", "Ошибка при закрытии файла Excel: %v")
|
||||
message.SetString(language.Russian, "Field %s not found", "Поле %s не найдено")
|
||||
message.SetString(language.Russian, "Error occured while tag parsing `%s`: %s", "Произошла ошибка при разборе тега `%s`: %s")
|
||||
message.SetString(language.Russian, "Fail to extract Field tag", "Не удалось извлечь тег поля")
|
||||
message.SetString(language.Russian, "Error occured while creating a style: %w", "Произошла ошибка при создании стиля: %w")
|
||||
message.SetString(language.Russian, "Error while setting cell value: %v", "Ошибка при установке значения ячейки: %v")
|
||||
message.SetString(language.Russian, "Error while setting cell style: %v", "Ошибка при установке стиля ячейки: %v")
|
||||
message.SetString(language.Russian, "Operation cancelled", "Операция отменена")
|
||||
message.SetString(language.Russian, "error occurred while creating a style: %w", "Ошибка при создании стиля: %w")
|
||||
message.SetString(language.Russian, "Failed to close file: %s", "Не удалось закрыть файл: %s")
|
||||
message.SetString(language.Russian, "Error occurred while tag parsing `%s`: %s", "Ошибка при разборе тэга: `%s`: %s")
|
||||
message.SetString(language.Russian, "Sheet `%s` not found", "Лист `%s` не найден")
|
||||
}
|
||||
Reference in New Issue
Block a user