wip-flag-migration #28

Merged
Alfred-mk merged 44 commits from wip-flag-migration into master 2024-09-04 11:25:34 +02:00
2 changed files with 20 additions and 10 deletions
Showing only changes of commit cc323707fc - Show all commits

View File

@ -83,7 +83,11 @@ func main() {
fp := path.Join(dp, sessionId) fp := path.Join(dp, sessionId)
ussdHandlers := ussd.NewHandlers(fp, &st) ussdHandlers,err := ussd.NewHandlers(fp, &st)
if(err != nil){
fmt.Fprintf(os.Stderr, "handler setup failed with error: %v\n", err)
}
rfs.AddLocalFunc("select_language", ussdHandlers.SetLanguage) rfs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
rfs.AddLocalFunc("create_account", ussdHandlers.CreateAccount) rfs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)

View File

@ -9,6 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"git.defalsify.org/vise.git/asm"
"git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/engine"
"git.defalsify.org/vise.git/lang" "git.defalsify.org/vise.git/lang"
"git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/resource"
@ -29,25 +30,30 @@ type FSData struct {
St *state.State St *state.State
} }
type Handlers struct { type Handlers struct {
fs *FSData fs *FSData
parser *asm.FlagParser
accountFileHandler utils.AccountFileHandlerInterface accountFileHandler utils.AccountFileHandlerInterface
accountService server.AccountServiceInterface accountService server.AccountServiceInterface
} }
func NewHandlers(path string, st *state.State) *Handlers { func NewHandlers(dir string, st *state.State) (*Handlers, error) {
pfp := path.Join(dir, "pp.csv")
parser := asm.NewFlagParser()
_, err := parser.Load(pfp)
if err != nil {
return nil, err
}
return &Handlers{ return &Handlers{
fs: &FSData{ fs: &FSData{
Path: path, Path: dir,
St: st, St: st,
}, },
accountFileHandler: utils.NewAccountFileHandler(path + "_data"), parser: parser,
accountFileHandler: utils.NewAccountFileHandler(dir + "_data"),
accountService: &server.AccountService{}, accountService: &server.AccountService{},
}, nil
} }
}
// Define the regex pattern as a constant // Define the regex pattern as a constant
const pinPattern = `^\d{4}$` const pinPattern = `^\d{4}$`
Alfred-mk marked this conversation as resolved
Review

I don't think mutex is needed here, it will be loaded once (before threads) and only read from then right?

I don't think mutex is needed here, it will be loaded once (before threads) and only read from then right?