Update util.go

donnie4w · Aug 26, 2024 · 7dcf720 · 7dcf720
1 parent e7c3a58
commit 7dcf720
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/logger/util.go b/logger/util.go
@@ -7,11 +7,17 @@ package logger
 
 import (
 	"github.com/donnie4w/gofer/buffer"
+	"os"
+	"path/filepath"
 	"strings"
+	"time"
 )
 
+var _current = ""
+var _lastUpdate time.Time
+
 func getfileInfo(flag *_FORMAT, fileName *string, line *int, funcName *string, filebuf *buffer.Buffer) {
-	if *flag&(FORMAT_SHORTFILENAME|FORMAT_LONGFILENAME) != 0 {
+	if *flag&(FORMAT_SHORTFILENAME|FORMAT_LONGFILENAME|FORMAT_RELATIVEFILENAME) != 0 {
 		if *flag&FORMAT_SHORTFILENAME != 0 {
 			short := *fileName
 			for i := len(*fileName) - 1; i > 0; i-- {
@@ -21,6 +27,18 @@ func getfileInfo(flag *_FORMAT, fileName *string, line *int, funcName *string, f
 				}
 			}
 			fileName = &short
+		} else if *flag&FORMAT_RELATIVEFILENAME != 0 {
+			if time.Since(_lastUpdate) > time.Second || _current == "" {
+				if c, err := os.Getwd(); err == nil {
+					_current = c
+				}
+			}
+			_lastUpdate = time.Now()
+			if _current != "" {
+				if relative, err := filepath.Rel(_current, *fileName); err == nil {
+					fileName = &relative
+				}
+			}
 		}
 		filebuf.Write([]byte(*fileName))
 		if *flag&FORMAT_FUNC != 0 && funcName != nil && *funcName != "" {