bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加gspath目录检索包管理工具，改进gcfg配置文件检索功能

Browse Source
This commit is contained in:
John
2018-05-03 13:35:08 +08:00
parent 6817f3a792
commit ffaebd046a
5 changed files with 167 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
g/frame/gins/gins.go
View File

@ -9,11 +9,13 @@
package gins
import (
"runtime"
"gitee.com/johng/gf/g/os/gcfg"
"gitee.com/johng/gf/g/os/gcmd"
"gitee.com/johng/gf/g/os/genv"
"gitee.com/johng/gf/g/os/gview"
"gitee.com/johng/gf/g/os/gfile"
"gitee.com/johng/gf/g/util/gregx"
"gitee.com/johng/gf/g/container/gmap"
)
@ -70,6 +72,22 @@ func Config() *gcfg.Config {
}
}
config := gcfg.New(path)
// 添加代码级的搜索目录检索地址，常用于开发环境调试，只添加入口文件目录
path = ""
for i := 1; i < 10000; i++ {
if _, file, _, ok := runtime.Caller(i); ok {
// 不包含go源码路径
if !gregx.IsMatchString("^" + runtime.GOROOT(), file) {
path = file
}
} else {
break
}
}
if path != "" {
config.AddPath(gfile.Dir(path))
}
// 单例对象缓存控制
Set(gFRAME_CORE_COMPONENT_NAME_CONFIG, config)
return config
}

74
g/os/gcfg/gcfg.go
View File

@ -9,9 +9,7 @@
package gcfg
import (
"sync"
"strings"
"gitee.com/johng/gf/g/os/gfile"
"gitee.com/johng/gf/g/os/gspath"
"gitee.com/johng/gf/g/os/gfsnotify"
"gitee.com/johng/gf/g/container/gmap"
"gitee.com/johng/gf/g/encoding/gjson"
@ -24,66 +22,66 @@ const (
// 配置管理对象
type Config struct {
mu sync.RWMutex // 并发互斥锁
path *gtype.String // 配置文件存放目录，绝对路径
paths *gspath.SPath // 搜索目录路径
jsons *gmap.StringInterfaceMap // 配置文件对象
closed *gtype.Bool // 是否已经被close
}
// 生成一个配置管理对象
func New(path string) *Config {
s := gspath.New()
s.Set(path)
return &Config {
path : gtype.NewString(path),
paths : s,
jsons : gmap.NewStringInterfaceMap(),
closed : gtype.NewBool(),
}
}
// 判断从哪个配置文件中获取内容，返回配置文件的绝对路径
func (c *Config) filePath(file []string) string {
path := gDEFAULT_CONFIG_FILE
func (c *Config) filePath(file...string) string {
name := gDEFAULT_CONFIG_FILE
if len(file) > 0 {
path = file[0]
name = file[0]
}
fpath := c.path.Val() + gfile.Separator + path
return fpath
return c.paths.Search(name)
}
// 设置配置管理器的配置文件存放目录绝对路径
func (c *Config) SetPath(path string) {
if strings.Compare(c.path.Val(), path) != 0 {
c.path.Set(path)
c.mu.Lock()
c.jsons = gmap.NewStringInterfaceMap()
c.mu.Unlock()
func (c *Config) SetPath(path string) error {
if err := c.paths.Set(path); err != nil {
return err
}
c.jsons.Clear()
return nil
}
// 获取配置管理器的配置文件存放目录绝对路径
func (c *Config) GetPath() string {
return c.path.Val()
// 添加配置管理器的配置文件搜索路径
func (c *Config) AddPath(path string) error {
if err := c.paths.Add(path); err != nil {
return err
}
return nil
}
// 获取指定文件的绝对路径，默认获取默认的配置文件路径
func (c *Config) GetFilePath(name...string) string {
path := strings.TrimRight(c.path.Val(), gfile.Separator) + gfile.Separator
if len(name) > 0 {
return path + name[0]
func (c *Config) GetFilePath(file...string) string {
name := gDEFAULT_CONFIG_FILE
if len(file) > 0 {
name = file[0]
}
return path + gDEFAULT_CONFIG_FILE
return c.paths.Search(name)
}
// 添加配置文件到配置管理器中，第二个参数为非必须，如果不输入表示添加进入默认的配置名称中
func (c *Config) getJson(file []string) *gjson.Json {
fpath := c.filePath(file)
func (c *Config) getJson(file...string) *gjson.Json {
fpath := c.filePath(file...)
if r := c.jsons.Get(fpath); r != nil {
return r.(*gjson.Json)
}
if j, err := gjson.Load(fpath); err == nil {
c.mu.Lock()
c.addMonitor(fpath)
c.jsons.Set(fpath, j)
c.mu.Unlock()
return j
}
return nil
@ -91,7 +89,7 @@ func (c *Config) getJson(file []string) *gjson.Json {
// 获取配置项，当不存在时返回nil
func (c *Config) Get(pattern string, file...string) interface{} {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.Get(pattern)
}
return nil
@ -100,7 +98,7 @@ func (c *Config) Get(pattern string, file...string) interface{} {
// 获得一个键值对关联数组/哈希表，方便操作，不需要自己做类型转换
// 注意，如果获取的值不存在，或者类型与json类型不匹配，那么将会返回nil
func (c *Config) GetMap(pattern string, file...string) map[string]interface{} {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetMap(pattern)
}
return nil
@ -109,7 +107,7 @@ func (c *Config) GetMap(pattern string, file...string) map[string]interface{} {
// 获得一个数组[]interface{}，方便操作，不需要自己做类型转换
// 注意，如果获取的值不存在，或者类型与json类型不匹配，那么将会返回nil
func (c *Config) GetArray(pattern string, file...string) []interface{} {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetArray(pattern)
}
return nil
@ -117,7 +115,7 @@ func (c *Config) GetArray(pattern string, file...string) []interface{} {
// 返回指定json中的string
func (c *Config) GetString(pattern string, file...string) string {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetString(pattern)
}
return ""
@ -125,7 +123,7 @@ func (c *Config) GetString(pattern string, file...string) string {
// 返回指定json中的bool
func (c *Config) GetBool(pattern string, file...string) bool {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetBool(pattern)
}
return false
@ -133,7 +131,7 @@ func (c *Config) GetBool(pattern string, file...string) bool {
// 返回指定json中的float32
func (c *Config) GetFloat32(pattern string, file...string) float32 {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetFloat32(pattern)
}
return 0
@ -141,7 +139,7 @@ func (c *Config) GetFloat32(pattern string, file...string) float32 {
// 返回指定json中的float64
func (c *Config) GetFloat64(pattern string, file...string) float64 {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetFloat64(pattern)
}
return 0
@ -149,7 +147,7 @@ func (c *Config) GetFloat64(pattern string, file...string) float64 {
// 返回指定json中的float64->int
func (c *Config) GetInt(pattern string, file...string) int {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetInt(pattern)
}
return 0
@ -157,7 +155,7 @@ func (c *Config) GetInt(pattern string, file...string) int {
// 返回指定json中的float64->uint
func (c *Config) GetUint(pattern string, file...string) uint {
if j := c.getJson(file); j != nil {
if j := c.getJson(file...); j != nil {
return j.GetUint(pattern)
}
return 0

75
g/os/gspath/gspath.go Normal file
View File

@ -0,0 +1,75 @@
// Copyright 2018 gf Author(https://gitee.com/johng/gf). All Rights Reserved.
//
// This Source Code Form is subject to the terms of the MIT License.
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://gitee.com/johng/gf.
// 搜索目录管理.
// 可以添加搜索目录，按照添加的优先级进行文件检索，并在内部进行高效缓存处理。
package gspath
import (
"sync"
"errors"
"strings"
"gitee.com/johng/gf/g/os/gfile"
"gitee.com/johng/gf/g/container/gmap"
)
// 文件目录搜索管理对象
type SPath struct {
mu sync.RWMutex
paths []string // 搜索路径，按照优先级进行排序
cache *gmap.StringStringMap // 搜索结果缓存map
}
func New () *SPath {
return &SPath{
paths : make([]string, 0),
cache : gmap.NewStringStringMap(),
}
}
// 设置搜索路径，只保留当前设置项，其他搜索路径被清空
func (sp *SPath) Set(path string) error {
r := gfile.RealPath(path)
if r != "" && gfile.IsDir(r) {
sp.mu.Lock()
sp.paths = []string{strings.TrimRight(r, gfile.Separator)}
sp.mu.Unlock()
sp.cache.Clear()
return nil
}
return errors.New("invalid path:" + path)
}
// 添加搜索路径
func (sp *SPath) Add(path string) error {
r := gfile.RealPath(path)
if r != "" && gfile.IsDir(r) {
sp.mu.Lock()
sp.paths = append(sp.paths, r)
sp.mu.Unlock()
return nil
}
return errors.New("invalid path:" + path)
}
// 按照优先级搜索文件，返回搜索到的文件绝对路径
func (sp *SPath) Search(name string) string {
path := sp.cache.Get(name)
if path == "" {
sp.mu.RLock()
for _, v := range sp.paths {
path = v + gfile.Separator + name
if gfile.Exists(path) {
break
}
}
sp.mu.RUnlock()
if path != "" {
sp.cache.Set(name, path)
}
}
return path
}

11
geg/os/gcfg/gcfg3.go Normal file
View File

@ -0,0 +1,11 @@
package main
import (
"fmt"
"gitee.com/johng/gf/g"
)
func main() {
fmt.Println(g.Config().Get("serverpath"))
}

38
geg/other/test.go
View File

@ -1,19 +1,35 @@
package main
import (
"runtime"
"strconv"
"fmt"
"gitee.com/johng/gf/g"
"gitee.com/johng/gf/g/os/glog"
"gitee.com/johng/gf/g/util/gregx"
"gitee.com/johng/gf/g/os/gfile"
)
func main() {
g.Config().SetPath("/home/john/Workspace/Go/GOPATH/src/gitee.com/johng/gf/geg/frame")
db := g.Database()
if r, err := db.Table("goods").Where("id=?", 1).One(); err == nil {
fmt.Printf("goods id: %d\n", r["id"].Int())
fmt.Printf("goods title: %s\n", r["title"].String())
fmt.Printf("goods proce: %.2f\n", r["price"].Float32())
} else {
glog.Error(err)
func Test() {
backtrace := "Trace:\n"
index := 0
for i := 1; i < 10000; i++ {
if _, cfile, cline, ok := runtime.Caller(i); ok {
// 不打印出go源码路径
if !gregx.IsMatchString("^" + runtime.GOROOT(), cfile) {
fmt.Println(gfile.Dir(cfile))
backtrace += strconv.Itoa(index) + ". " + cfile + ":" + strconv.Itoa(cline) + "\n"
index++
}
} else {
break
}
}
fmt.Println(backtrace)
}
func Test2() {
Test()
}
func main() {
Test2()
}