Change project struct and add more methods

Signed-off-by: aliwoto <[email protected]>

.github/workflows/go-linux.yml

@@ -0,0 +1,22 @@
+name: Go
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17
+
+    - name: Test
+      run: go test -v ./...

.gitignore

@@ -0,0 +1,23 @@
+.env
+.docker_build/
+bin/
+*.exe
+vendor/
+sibylBinary
+PsychoPass
+sibylSystem
+*.old.go
+woto_files/
+tmp_files/
+labs/
+*.old.go
+*.db
+*.log
+
+# ignore debug binary file
+__debug_bin
+
+# ignore config file
+config.ini
+*.token
+triggers.json

argTypes.go → argparser/constants.go

@@ -1,12 +1,10 @@
-// Bot.go Project
-// Copyright (C) 2021 Sayan Biswas, ALiwoto
+// argparser Project
+// Copyright (C) 2021 wotoTeam, ALiwoto
 // This file is subject to the terms and conditions defined in
 // file 'LICENSE', which is part of the source code.
 
 package argparser
 
-type FlagType uint8
-
 const (
 	NoneFlagType FlagType = iota
 	BoolFlagType
@@ -34,3 +32,13 @@ const (
 	Int32TypeStr  = "int32"
 	Int64TypeStr  = "int64"
 )
+
+// common and global HLCs.
+const (
+	TrueHlc  = "true"
+	YesHlc   = "yes"
+	OnHlc    = "on"
+	FalseHlc = "false"
+	NoHlc    = "no"
+	OffHlc   = "off"
+)

arg.go → argparser/helpers.go

@@ -13,30 +13,35 @@ import (
 )
 
 // Flag is the options passed along with the commands
-// by users. they should send them with prefex "--",
+// by users. they should send them with prefix "--",
 // but we will remove them in the pTools.
 type Flag struct {
-	name  string
-	index int
-	value interface{}
-	fType FlagType
+	name   string
+	index  int
+	value  interface{}
+	fType  FlagType
+	emptyT bool
 }
 
 type EventArgs struct {
-	command string // command without '/' or '!'
-	flags   []Flag
-	rawData string
+	prefixes []rune
+	command  string // command without '/' or '!'
+	flags    []Flag
+	rawData  string
 }
 
 // ParseArg will parse the whole text into an EventArg and will return it.
-func ParseArg(text string) (e *EventArgs, err error) {
-	if ws.IsEmpty(&text) {
+func ParseArg(text string, prefixes []rune) (e *EventArgs, err error) {
+	if text == "" {
 		return nil, errors.New("text cannot be empty")
 	}
 
+	if len(prefixes) == 0 {
+		prefixes = DefaultPrefixes
+	}
+
 	ss := ws.Ss(text)
-	if !ss.HasPrefix(ws.COMMAND_PREFIX1, ws.COMMAND_PREFIX2,
-		ws.SUDO_PREFIX1) {
+	if !ss.HasRunePrefix(prefixes...) {
 		return nil, errors.New("this message is not a command at all")
 	}
 
@@ -50,16 +55,16 @@ func ParseArg(text string) (e *EventArgs, err error) {
 		return nil, errors.New("length of the command cannot be zero")
 	}
 
-	cmdSs := cmd.TrimStr(ws.COMMAND_PREFIX1, ws.COMMAND_PREFIX2,
-		ws.SUDO_PREFIX1, ws.SPACE_VALUE)
+	cmdSs := cmd.TrimStr(toStrArray(prefixes)...)
 	if cmdSs.IsEmpty() {
 		return nil, errors.New("command cannot be only whitespace")
 	}
 
 	cmdStr := cmdSs.GetValue()
 
 	e = &EventArgs{
-		command: cmdStr,
+		command:  cmdStr,
+		prefixes: prefixes,
 	}
 
 	// lock the special characters such as "--", ":", "=".
@@ -130,14 +135,26 @@ func ParseArg(text string) (e *EventArgs, err error) {
 		tmpFlag.setRealValue(fixTmpStr(tmp))
 
 		myFlags = append(myFlags, tmpFlag)
-
 	}
 
 	e.setFlags(myFlags)
 
 	return e, nil
 }
 
+func ParseArgDefault(text string) (e *EventArgs, err error) {
+	return ParseArg(text, DefaultPrefixes)
+}
+
+func toStrArray(r []rune) []string {
+	var s []string
+	for _, v := range r {
+		s = append(s, string(v))
+	}
+	s = append(s, ws.SPACE_VALUE)
+	return s
+}
+
 func fixTmpStr(tmp string) string {
 	tmp = strings.TrimSpace(tmp)
 	if strings.HasPrefix(tmp, ws.EqualStr) {
@@ -162,3 +179,16 @@ func lookRaw(text *string, e *EventArgs) {
 
 	e.rawData = tmp
 }
+
+func ToBoolType(value string) (v, isBool bool) {
+	value = strings.TrimSpace(value)
+	value = strings.ToLower(value)
+	switch value {
+	case TrueHlc, YesHlc, OnHlc:
+		return true, true
+	case FalseHlc, NoHlc, OffHlc:
+		return false, true
+	default:
+		return false, false
+	}
+}

getMethods.go → argparser/methods.go

@@ -1,4 +1,4 @@
-// Bot.go Project
+// argparser Project
 // Copyright (C) 2021 Sayan Biswas, ALiwoto
 // This file is subject to the terms and conditions defined in
 // file 'LICENSE', which is part of the source code.
@@ -14,6 +14,72 @@ import (
 
 //---------------------------------------------------------
 
+func (f *Flag) setName(name string) {
+	name = strings.TrimSpace(name)
+	f.name = name
+}
+
+func (f *Flag) setNameQ(q ws.QString) {
+	f.setName(q.GetValue())
+}
+
+func (f *Flag) setNilValue() {
+	f.value = nil
+	f.fType = NoneFlagType
+}
+
+func (f *Flag) setRealValue(value string) {
+	tmp := strings.TrimSpace(value)
+	if len(tmp) == ws.BaseIndex {
+		f.setAsBool(true)
+		f.setAsEmpty()
+		return
+	}
+
+	myI, err := strconv.ParseInt(value, ws.BaseTen, ws.Base64Bit)
+	if err == nil {
+		f.setAsInt(&myI)
+		return
+	}
+
+	if tmp[ws.BaseIndex] == ws.CHAR_STR {
+		myInt := len(tmp) - ws.BaseOneIndex
+		if tmp[myInt] == ws.CHAR_STR {
+			tmp = strings.TrimPrefix(tmp, ws.STR_SIGN)
+			tmp = strings.TrimSuffix(tmp, ws.STR_SIGN)
+			f.setAsString(&tmp)
+			return
+		}
+	}
+
+	v, isBool := ToBoolType(value)
+	if isBool {
+		f.setAsBool(v)
+		return
+	}
+
+	f.setAsString(&value)
+}
+
+func (f *Flag) setAsBool(value bool) {
+	f.value = value
+	f.fType = BoolFlagType
+}
+
+func (f *Flag) setAsEmpty() {
+	f.emptyT = true
+}
+
+func (f *Flag) setAsString(value *string) {
+	f.value = *value
+	f.fType = StringFlagType
+}
+
+func (f *Flag) setAsInt(value *int64) {
+	f.value = *value
+	f.fType = Int64FlagType
+}
+
 // GetValue will return you the value of this flag.
 // remember that value can be
 func (f *Flag) GetValue() interface{} {
@@ -90,6 +156,10 @@ func (f *Flag) GetAsString() string {
 	return NoneTypeStr
 }
 
+func (f *Flag) isEmpty() bool {
+	return f.emptyT || f.fType == NoneFlagType
+}
+
 func (f *Flag) GetAsInteger() (vI int64, ok bool) {
 	v, t := f.GetValueAndType()
 	if t == StringFlagType {
@@ -318,6 +388,17 @@ func (e *EventArgs) GetAsIntegerOrRaw(name ...string) (vI int64, ok bool) {
 	}
 }
 
+func (e *EventArgs) GetFirstNoneEmptyValue() string {
+	for _, current := range e.flags {
+		if !current.isEmpty() {
+			return current.GetAsString()
+		}
+	}
+
+	// lets return raw data here; as it is the last resort.
+	return e.rawData
+}
+
 // GetAsString will give you the boolean value of the flag
 // with the specified name.
 // if there is no flag with this name, or there is an
@@ -331,21 +412,12 @@ func (e *EventArgs) GetAsBool(name ...string) bool {
 	return f.GetAsBool()
 }
 
-//---------------------------------------------------------
-
-func ToBoolType(value string) (v, isBool bool) {
-	value = strings.TrimSpace(value)
-	value = strings.ToLower(value)
-	switch value {
-	case TrueHlc, YesHlc, OnHlc:
-		return true, true
-	case FalseHlc, NoHlc, OffHlc:
-		return false, true
-	default:
-		return false, false
-	}
+func (e *EventArgs) setFlags(f []Flag) {
+	e.flags = f
 }
 
+//---------------------------------------------------------
+
 func (t *FlagType) ToString() string {
 	switch *t {
 	case NoneFlagType:

constants.go → argparser/types.go

@@ -1,6 +1,8 @@
-// argparser Project
-// Copyright (C) 2021 wotoTeam, ALiwoto
+// Bot.go Project
+// Copyright (C) 2021 Sayan Biswas, ALiwoto
 // This file is subject to the terms and conditions defined in
 // file 'LICENSE', which is part of the source code.
 
 package argparser
+
+type FlagType uint8

argparser/vars.go

@@ -0,0 +1,8 @@
+package argparser
+
+var (
+	DefaultPrefixes = []rune{
+		'/',
+		'!',
+	}
+)

examples/.gitignore

@@ -0,0 +1,2 @@
+examples
+examples.exe

examples/bools/main.go

@@ -8,7 +8,7 @@ package main
 import (
 	"log"
 
-	"github.com/ALiwoto/argparser"
+	"github.com/ALiwoto/argparser/argparser"
 )
 
 const boolTest = "/test --flag1 true --flag2 on" +
@@ -17,7 +17,7 @@ const boolTest = "/test --flag1 true --flag2 on" +
 	" --flag5 off"
 
 func main() {
-	args, err := argparser.ParseArg(boolTest)
+	args, err := argparser.ParseArgDefault(boolTest)
 	if err != nil {
 		log.Fatal(err)
 	}

go.mod

@@ -2,5 +2,4 @@ module github.com/ALiwoto/argparser
 
 go 1.16
 
-require github.com/ALiwoto/StrongStringGo v1.0.4
-
+require github.com/ALiwoto/StrongStringGo v1.0.6

go.sum

@@ -1,2 +1,4 @@
 github.com/ALiwoto/StrongStringGo v1.0.4 h1:QqlO3bkbLxPq/B4iKhBRF48FYIoApNHQnFQBkCPoT00=
 github.com/ALiwoto/StrongStringGo v1.0.4/go.mod h1:t7WxtiphnwdgJaq443DSCAw7q+Ut3V8Pg1kT6IcdKmE=
+github.com/ALiwoto/StrongStringGo v1.0.6 h1:O2pZ58qu2gGXA57JjDqtleWSCHP9kkm4vZO/hdLJunI=
+github.com/ALiwoto/StrongStringGo v1.0.6/go.mod h1:t7WxtiphnwdgJaq443DSCAw7q+Ut3V8Pg1kT6IcdKmE=