mirror of
https://gitee.com/johng/gf
synced 2026-06-06 16:21:40 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
290 lines
7.5 KiB
Go
290 lines
7.5 KiB
Go
// Copyright GoFrame Author(https://goframe.org). 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://github.com/gogf/gf.
|
|
|
|
package gres
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/gogf/gf/v2/container/gtree"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/os/gfile"
|
|
"github.com/gogf/gf/v2/os/gtime"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
)
|
|
|
|
// Resource is the resource manager for the file system.
|
|
type Resource struct {
|
|
tree *gtree.BTree
|
|
}
|
|
|
|
const (
|
|
defaultTreeM = 100
|
|
)
|
|
|
|
// New creates and returns a new resource object.
|
|
func New() *Resource {
|
|
return &Resource{
|
|
tree: gtree.NewBTree(defaultTreeM, func(v1, v2 any) int {
|
|
return strings.Compare(v1.(string), v2.(string))
|
|
}),
|
|
}
|
|
}
|
|
|
|
// Add unpacks and adds the `content` into current resource object.
|
|
// The unnecessary parameter `prefix` indicates the prefix
|
|
// for each file storing into current resource object.
|
|
func (r *Resource) Add(content string, prefix ...string) error {
|
|
files, err := UnpackContent(content)
|
|
if err != nil {
|
|
intlog.Printf(context.TODO(), "Add resource files failed: %v", err)
|
|
return err
|
|
}
|
|
namePrefix := ""
|
|
if len(prefix) > 0 {
|
|
namePrefix = prefix[0]
|
|
}
|
|
for i := 0; i < len(files); i++ {
|
|
files[i].resource = r
|
|
r.tree.Set(namePrefix+files[i].file.Name, files[i])
|
|
}
|
|
intlog.Printf(context.TODO(), "Add %d files to resource manager", r.tree.Size())
|
|
return nil
|
|
}
|
|
|
|
// Load loads, unpacks and adds the data from `path` into current resource object.
|
|
// The unnecessary parameter `prefix` indicates the prefix
|
|
// for each file storing into current resource object.
|
|
func (r *Resource) Load(path string, prefix ...string) error {
|
|
realPath, err := gfile.Search(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return r.Add(gfile.GetContents(realPath), prefix...)
|
|
}
|
|
|
|
// Get returns the file with given path.
|
|
func (r *Resource) Get(path string) *File {
|
|
if path == "" {
|
|
return nil
|
|
}
|
|
path = strings.ReplaceAll(path, "\\", "/")
|
|
path = strings.ReplaceAll(path, "//", "/")
|
|
if path != "/" {
|
|
for path[len(path)-1] == '/' {
|
|
path = path[:len(path)-1]
|
|
}
|
|
}
|
|
result := r.tree.Get(path)
|
|
if result != nil {
|
|
return result.(*File)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetWithIndex searches file with `path`, if the file is directory
|
|
// it then does index files searching under this directory.
|
|
//
|
|
// GetWithIndex is usually used for http static file service.
|
|
func (r *Resource) GetWithIndex(path string, indexFiles []string) *File {
|
|
// Necessary for double char '/' replacement in prefix.
|
|
path = strings.ReplaceAll(path, "\\", "/")
|
|
path = strings.ReplaceAll(path, "//", "/")
|
|
if path != "/" {
|
|
for path[len(path)-1] == '/' {
|
|
path = path[:len(path)-1]
|
|
}
|
|
}
|
|
if file := r.Get(path); file != nil {
|
|
if len(indexFiles) > 0 && file.FileInfo().IsDir() {
|
|
var f *File
|
|
for _, name := range indexFiles {
|
|
if f = r.Get(path + "/" + name); f != nil {
|
|
return f
|
|
}
|
|
}
|
|
}
|
|
return file
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetContent directly returns the content of `path`.
|
|
func (r *Resource) GetContent(path string) []byte {
|
|
file := r.Get(path)
|
|
if file != nil {
|
|
return file.Content()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Contains checks whether the `path` exists in current resource object.
|
|
func (r *Resource) Contains(path string) bool {
|
|
return r.Get(path) != nil
|
|
}
|
|
|
|
// IsEmpty checks and returns whether the resource manager is empty.
|
|
func (r *Resource) IsEmpty() bool {
|
|
return r.tree.IsEmpty()
|
|
}
|
|
|
|
// ScanDir returns the files under the given path, the parameter `path` should be a folder type.
|
|
//
|
|
// The pattern parameter `pattern` supports multiple file name patterns,
|
|
// using the ',' symbol to separate multiple patterns.
|
|
//
|
|
// It scans directory recursively if given parameter `recursive` is true.
|
|
//
|
|
// Note that the returned files does not contain given parameter `path`.
|
|
func (r *Resource) ScanDir(path string, pattern string, recursive ...bool) []*File {
|
|
isRecursive := false
|
|
if len(recursive) > 0 {
|
|
isRecursive = recursive[0]
|
|
}
|
|
return r.doScanDir(path, pattern, isRecursive, false)
|
|
}
|
|
|
|
// ScanDirFile returns all sub-files with absolute paths of given `path`,
|
|
// It scans directory recursively if given parameter `recursive` is true.
|
|
//
|
|
// Note that it returns only files, exclusive of directories.
|
|
func (r *Resource) ScanDirFile(path string, pattern string, recursive ...bool) []*File {
|
|
isRecursive := false
|
|
if len(recursive) > 0 {
|
|
isRecursive = recursive[0]
|
|
}
|
|
return r.doScanDir(path, pattern, isRecursive, true)
|
|
}
|
|
|
|
// doScanDir is an internal method which scans directory
|
|
// and returns the absolute path list of files that are not sorted.
|
|
//
|
|
// The pattern parameter `pattern` supports multiple file name patterns,
|
|
// using the ',' symbol to separate multiple patterns.
|
|
//
|
|
// It scans directory recursively if given parameter `recursive` is true.
|
|
func (r *Resource) doScanDir(path string, pattern string, recursive bool, onlyFile bool) []*File {
|
|
path = strings.ReplaceAll(path, "\\", "/")
|
|
path = strings.ReplaceAll(path, "//", "/")
|
|
if path != "/" {
|
|
for path[len(path)-1] == '/' {
|
|
path = path[:len(path)-1]
|
|
}
|
|
}
|
|
var (
|
|
name = ""
|
|
files = make([]*File, 0)
|
|
length = len(path)
|
|
patterns = strings.Split(pattern, ",")
|
|
)
|
|
for i := 0; i < len(patterns); i++ {
|
|
patterns[i] = strings.TrimSpace(patterns[i])
|
|
}
|
|
// Used for type checking for first entry.
|
|
first := true
|
|
r.tree.IteratorFrom(path, true, func(key, value any) bool {
|
|
if first {
|
|
if !value.(*File).FileInfo().IsDir() {
|
|
return false
|
|
}
|
|
first = false
|
|
}
|
|
if onlyFile && value.(*File).FileInfo().IsDir() {
|
|
return true
|
|
}
|
|
name = key.(string)
|
|
if len(name) <= length {
|
|
return true
|
|
}
|
|
if path != name[:length] {
|
|
return false
|
|
}
|
|
// To avoid of, eg: /i18n and /i18n-dir
|
|
if !first && name[length] != '/' {
|
|
return true
|
|
}
|
|
if !recursive {
|
|
if strings.IndexByte(name[length+1:], '/') != -1 {
|
|
return true
|
|
}
|
|
}
|
|
for _, p := range patterns {
|
|
if match, err := filepath.Match(p, gfile.Basename(name)); err == nil && match {
|
|
files = append(files, value.(*File))
|
|
return true
|
|
}
|
|
}
|
|
return true
|
|
})
|
|
return files
|
|
}
|
|
|
|
// ExportOption is the option for function Export.
|
|
type ExportOption struct {
|
|
RemovePrefix string // Remove the prefix of file name from resource.
|
|
}
|
|
|
|
// Export exports and saves specified path `srcPath` and all its sub files to specified system path `dstPath` recursively.
|
|
func (r *Resource) Export(src, dst string, option ...ExportOption) error {
|
|
var (
|
|
err error
|
|
name string
|
|
path string
|
|
exportOption ExportOption
|
|
files []*File
|
|
)
|
|
|
|
if r.Get(src).FileInfo().IsDir() {
|
|
files = r.doScanDir(src, "*", true, false)
|
|
} else {
|
|
files = append(files, r.Get(src))
|
|
}
|
|
|
|
if len(option) > 0 {
|
|
exportOption = option[0]
|
|
}
|
|
for _, file := range files {
|
|
name = file.Name()
|
|
if exportOption.RemovePrefix != "" {
|
|
name = gstr.TrimLeftStr(name, exportOption.RemovePrefix)
|
|
}
|
|
name = gstr.Trim(name, `\/`)
|
|
if name == "" {
|
|
continue
|
|
}
|
|
path = gfile.Join(dst, name)
|
|
if file.FileInfo().IsDir() {
|
|
err = gfile.Mkdir(path)
|
|
} else {
|
|
err = gfile.PutBytes(path, file.Content())
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Dump prints the files of current resource object.
|
|
func (r *Resource) Dump() {
|
|
var info os.FileInfo
|
|
r.tree.Iterator(func(key, value any) bool {
|
|
info = value.(*File).FileInfo()
|
|
fmt.Printf(
|
|
"%v %8s %s\n",
|
|
gtime.New(info.ModTime()).ISO8601(),
|
|
gfile.FormatSize(info.Size()),
|
|
key,
|
|
)
|
|
return true
|
|
})
|
|
fmt.Printf("TOTAL FILES: %d\n", r.tree.Size())
|
|
}
|