summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-10-21 09:21:53 -0500
committerJeff Carr <[email protected]>2025-10-21 09:21:53 -0500
commitc1600cff482abf314bf66bcf758979969672bfca (patch)
treee958c6646d1ff33dabe269148dde9aabb1fb0f02
parente734c024bd18ad13e0f5d162dfee256b5e020be7 (diff)
housecleaning & dump more old stuff
-rw-r--r--errors.go6
-rw-r--r--exit.go15
-rw-r--r--generate.go9
-rw-r--r--init.go45
-rw-r--r--loadByAppname.go2
-rw-r--r--loadCache.go3
-rw-r--r--loadConfig.go3
-rw-r--r--save.go (renamed from saveRaw.go)0
8 files changed, 9 insertions, 74 deletions
diff --git a/errors.go b/errors.go
index 154f3af..a2f7c66 100644
--- a/errors.go
+++ b/errors.go
@@ -6,9 +6,13 @@ import (
)
var NotInitialized error = errors.New("your application config not initialized")
-
var VersionMismatch error = errors.New("your PB version does not match")
+var ErrEmpty error = fmt.Errorf("config file was empty")
+var ErrMarshal error = fmt.Errorf("protobuf parse error")
+
+// more complicated errors. good idea or bad idea?
+
// Finally, declare a package-level variable of your new type.
// This is the "sentinel" error that users will compare against.
var ErrNotInitialized = NotInitializedError{}
diff --git a/exit.go b/exit.go
deleted file mode 100644
index 01ac9a5..0000000
--- a/exit.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package config
-
-// this is an experiment at this point to
-// see how this turns out
-
-import (
- "fmt"
- "os"
-)
-
-// todo: figure out how to pass this back to argv
-func BadExit(reason string, err error) {
- fmt.Println("lib/config bad exit. no app callback here. FIXME", reason, err)
- os.Exit(-1)
-}
diff --git a/generate.go b/generate.go
deleted file mode 100644
index c43e61b..0000000
--- a/generate.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package config
-
-// 'make generate' will call this
-//
-// go generate is a cool feature. many thanks to the GO dev team
-//
-// NOTE: please add to go generate: if ! exists go.mod, run 'go mod init' & 'go mod tidy'
-//
-//go:generate autogenpb --proto config.proto
diff --git a/init.go b/init.go
deleted file mode 100644
index e9c5779..0000000
--- a/init.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package config
-
-// this is an experiment at this point to
-// see how this turns out
-
-/*
-var configPB *Configs
-
-// these are normally what are sent from ldflags
-var APPNAME string
-var BUILDTIME string
-var VERSION string
-
-var argv []string
-
-func Init(appname, version, buildtime string, fromargv []string) error {
- APPNAME = appname
- VERSION = version
- BUILDTIME = buildtime
- argv = fromargv
-
- return loadENV()
-}
-
-func makeNewConfigFile(appname string) error {
- configDir, err := os.UserConfigDir()
- if err != nil {
- fmt.Println("OS isn't returning UserConfigDir()", err)
- return err
- }
- fullname := filepath.Join(configDir, appname, "config.text")
-
- configPB = NewConfigs()
- configPB.Filename = fullname
-
- newvar := new(Config)
- newvar.Key = "example config var"
- newvar.Value = "protobufs are neat"
- configPB.Clone(newvar)
-
- // writes the config file to disk
- err = Save()
- return err
-}
-*/
diff --git a/loadByAppname.go b/loadByAppname.go
index cfa22cf..28f7fee 100644
--- a/loadByAppname.go
+++ b/loadByAppname.go
@@ -44,6 +44,7 @@ func LoadAppnameCache(pb proto.Message, appname string) error {
return nil
}
+/*
// deprecate
func LoadByAppname(pb proto.Message, appname string) error {
protoname, err := GetProtobufName(pb) // defined in the foo.proto file
@@ -80,3 +81,4 @@ func LoadByAppname(pb proto.Message, appname string) error {
}
return nil
}
+*/
diff --git a/loadCache.go b/loadCache.go
index f5cbef1..c45c6d7 100644
--- a/loadCache.go
+++ b/loadCache.go
@@ -14,9 +14,6 @@ import (
"google.golang.org/protobuf/proto"
)
-var ErrEmpty error = fmt.Errorf("config file was empty")
-var ErrMarshal error = fmt.Errorf("protobuf parse error")
-
// loads foo.proto from ~/.cache/<appname>/foo.text
func CacheLoad(pb proto.Message) error {
appname, err := ENV.GetAppname() // already configured by your application
diff --git a/loadConfig.go b/loadConfig.go
index 8e0f5ab..43b40e1 100644
--- a/loadConfig.go
+++ b/loadConfig.go
@@ -84,7 +84,8 @@ func ConfigLoadByName(pb proto.Message, customName string) (string, error) {
// return fullname, err
}
if curfilename == "" {
- log.Printf("ConfigLoadByName() reading in %s\n", fullname)
+ // reading in new file
+ // log.Printf("ConfigLoadByName() reading in %s\n", fullname)
}
if err = loadTEXT(pb, fullname); err == nil {
diff --git a/saveRaw.go b/save.go
index d257649..d257649 100644
--- a/saveRaw.go
+++ b/save.go