mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-21 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2024-10-27 11:21:23 +08:00
parent 47ab41088e
commit 52034ef55c
1 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/converters/iif/iif_data_reader.go
+20 -18
View File
@@ -59,7 +59,8 @@ func (r *iifDataReader) read(ctx core.Context) ([]*iifAccountDataset, []*iifTran
return nil, nil, errs.ErrInvalidIIFFile return nil, nil, errs.ErrInvalidIIFFile
} }
if items[0][0] == '!' { // sample line // read sample line
if items[0][0] == '!' {
if lastLineSign != "" { if lastLineSign != "" {
log.Errorf(ctx, "[iif_data_reader.read] iif missing transaction end line") log.Errorf(ctx, "[iif_data_reader.read] iif missing transaction end line")
return nil, nil, errs.ErrInvalidIIFFile return nil, nil, errs.ErrInvalidIIFFile
@@ -82,19 +83,29 @@ func (r *iifDataReader) read(ctx core.Context) ([]*iifAccountDataset, []*iifTran
currentDatasetType = items[0] currentDatasetType = items[0]
lastLineSign = "" lastLineSign = ""
} }
}
if currentDatasetType == "" { if currentDatasetType == iifAccountSampleLineSignColumnName {
log.Errorf(ctx, "[iif_data_reader.read] cannot read data line before sample line")
return nil, nil, errs.ErrInvalidIIFFile
} else if currentDatasetType == iifAccountSampleLineSignColumnName {
if currentAccountDataset == nil {
currentAccountDataset, err = r.readAccountSampleLine(ctx, items) currentAccountDataset, err = r.readAccountSampleLine(ctx, items)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
} else { } else if currentDatasetType == iifTransactionSampleLineSignColumnName {
currentTransactionDataset, err = r.readTransactionSampleLines(ctx, items)
if err != nil {
return nil, nil, err
}
}
continue
}
// read data lines
if currentDatasetType == "" {
log.Errorf(ctx, "[iif_data_reader.read] cannot read data line before sample line")
return nil, nil, errs.ErrInvalidIIFFile
} else if currentDatasetType == iifAccountSampleLineSignColumnName && currentAccountDataset != nil {
if items[0] == iifAccountLineSignColumnName { if items[0] == iifAccountLineSignColumnName {
accountData := &iifAccountData{ accountData := &iifAccountData{
dataItems: items, dataItems: items,
@@ -104,15 +115,7 @@ func (r *iifDataReader) read(ctx core.Context) ([]*iifAccountDataset, []*iifTran
log.Errorf(ctx, "[iif_data_reader.read] iif line expected reading account sign, but actual is \"%s\"", items[0]) log.Errorf(ctx, "[iif_data_reader.read] iif line expected reading account sign, but actual is \"%s\"", items[0])
return nil, nil, errs.ErrInvalidIIFFile return nil, nil, errs.ErrInvalidIIFFile
} }
} } else if currentDatasetType == iifTransactionSampleLineSignColumnName && currentTransactionDataset != nil {
} else if currentDatasetType == iifTransactionSampleLineSignColumnName {
if currentTransactionDataset == nil {
currentTransactionDataset, err = r.readTransactionSampleLines(ctx, items)
if err != nil {
return nil, nil, err
}
} else {
if lastLineSign == "" { if lastLineSign == "" {
if items[0] == iifTransactionLineSignColumnName { if items[0] == iifTransactionLineSignColumnName {
currentTransactionData = &iifTransactionData{ currentTransactionData = &iifTransactionData{
@@ -143,7 +146,6 @@ func (r *iifDataReader) read(ctx core.Context) ([]*iifAccountDataset, []*iifTran
} }
} }
} }
}
if lastLineSign != "" { if lastLineSign != "" {
log.Errorf(ctx, "[iif_data_reader.read] iif missing transaction end line") log.Errorf(ctx, "[iif_data_reader.read] iif missing transaction end line")