mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +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.
241 lines
6.8 KiB
Go
241 lines
6.8 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 gfsnotify
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/gogf/gf/v2/container/glist"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
)
|
|
|
|
// watchLoop starts the loop for event listening from underlying inotify monitor.
|
|
func (w *Watcher) watchLoop() {
|
|
for {
|
|
select {
|
|
// close event.
|
|
case <-w.closeChan:
|
|
return
|
|
|
|
// event listening.
|
|
case ev, ok := <-w.watcher.Events:
|
|
if !ok {
|
|
return
|
|
}
|
|
// filter the repeated event in custom duration.
|
|
var cacheFunc = func(ctx context.Context) (value any, err error) {
|
|
w.events.Push(&Event{
|
|
event: ev,
|
|
Path: ev.Name,
|
|
Op: Op(ev.Op),
|
|
Watcher: w,
|
|
})
|
|
return struct{}{}, nil
|
|
}
|
|
_, err := w.cache.SetIfNotExist(
|
|
context.Background(),
|
|
ev.String(),
|
|
cacheFunc,
|
|
repeatEventFilterDuration,
|
|
)
|
|
if err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
|
|
// error occurs in underlying watcher.
|
|
case err := <-w.watcher.Errors:
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// eventLoop is the core event handler.
|
|
func (w *Watcher) eventLoop() {
|
|
var (
|
|
err error
|
|
ctx = context.TODO()
|
|
)
|
|
for {
|
|
if v := w.events.Pop(); v != nil {
|
|
event := v.(*Event)
|
|
// If there's no any callback of this path, it removes it from monitor,
|
|
// as a path watching without callback is meaningless.
|
|
callbacks := w.getCallbacksForPath(event.Path)
|
|
if len(callbacks) == 0 {
|
|
_ = w.watcher.Remove(event.Path)
|
|
continue
|
|
}
|
|
|
|
switch {
|
|
case event.IsRemove():
|
|
// It should check again the existence of the path.
|
|
// It adds it back to the monitor if it still exists.
|
|
if fileExists(event.Path) {
|
|
// A watch will be automatically removed if the watched path is deleted or
|
|
// renamed.
|
|
//
|
|
// It here adds the path back to monitor.
|
|
// We need no worry about the repeat adding.
|
|
if err = w.watcher.Add(event.Path); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"fake remove event, watcher re-adds monitor for: %s",
|
|
event.Path,
|
|
)
|
|
}
|
|
// Change the event to RENAME, which means it renames itself to its origin name.
|
|
event.Op = RENAME
|
|
}
|
|
|
|
case event.IsRename():
|
|
// It should check again the existence of the path.
|
|
// It adds it back to the monitor if it still exists.
|
|
// Especially Some editors might do RENAME and then CHMOD when it's editing file.
|
|
if fileExists(event.Path) {
|
|
// A watch will be automatically removed if the watched path is deleted or
|
|
// renamed.
|
|
//
|
|
// It might lose the monitoring for the path, so we add the path back to monitor.
|
|
// We need no worry about the repeat adding.
|
|
if err = w.watcher.Add(event.Path); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"fake rename event, watcher re-adds monitor for: %s",
|
|
event.Path,
|
|
)
|
|
}
|
|
// Change the event to CHMOD.
|
|
event.Op = CHMOD
|
|
}
|
|
|
|
case event.IsCreate():
|
|
// =================================================================================
|
|
// Note that it here just adds the path to monitor without any callback registering,
|
|
// because its parent already has the callbacks.
|
|
// =================================================================================
|
|
if w.checkRecursiveWatchingInCreatingEvent(event.Path) {
|
|
// It handles only folders, watching folders also watching its sub files.
|
|
for _, subPath := range fileAllDirs(event.Path) {
|
|
if fileIsDir(subPath) {
|
|
if err = w.watcher.Add(subPath); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"folder creation event, watcher adds monitor for: %s",
|
|
subPath,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Calling the callbacks in multiple goroutines.
|
|
for _, callback := range callbacks {
|
|
go w.doCallback(event, callback)
|
|
}
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// checkRecursiveWatchingInCreatingEvent checks and returns whether recursive adding given `path` to watcher
|
|
// in creating event.
|
|
func (w *Watcher) checkRecursiveWatchingInCreatingEvent(path string) bool {
|
|
if !fileIsDir(path) {
|
|
return false
|
|
}
|
|
var (
|
|
parentDirPath string
|
|
dirPath = path
|
|
)
|
|
for {
|
|
parentDirPath = fileDir(dirPath)
|
|
if parentDirPath == dirPath {
|
|
break
|
|
}
|
|
if callbackItem := w.callbacks.Get(parentDirPath); callbackItem != nil {
|
|
for _, node := range callbackItem.(*glist.List).FrontAll() {
|
|
callback := node.(*Callback)
|
|
if callback.recursive {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
dirPath = parentDirPath
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (w *Watcher) doCallback(event *Event, callback *Callback) {
|
|
defer func() {
|
|
if exception := recover(); exception != nil {
|
|
switch exception {
|
|
case callbackExitEventPanicStr:
|
|
w.RemoveCallback(callback.Id)
|
|
default:
|
|
if e, ok := exception.(error); ok {
|
|
panic(gerror.WrapCode(gcode.CodeInternalPanic, e))
|
|
}
|
|
panic(exception)
|
|
}
|
|
}
|
|
}()
|
|
callback.Func(event)
|
|
}
|
|
|
|
// getCallbacksForPath searches and returns all callbacks with given `path`.
|
|
//
|
|
// It also searches its parents for callbacks if they're recursive.
|
|
func (w *Watcher) getCallbacksForPath(path string) (callbacks []*Callback) {
|
|
// Firstly add the callbacks of itself.
|
|
if item := w.callbacks.Get(path); item != nil {
|
|
for _, node := range item.(*glist.List).FrontAll() {
|
|
callback := node.(*Callback)
|
|
callbacks = append(callbacks, callback)
|
|
}
|
|
}
|
|
// ============================================================================================================
|
|
// Secondly searches its direct parent for callbacks.
|
|
//
|
|
// Note that it is SPECIAL handling here, which is the different between `recursive` and `not recursive` logic
|
|
// for direct parent folder of `path` that events are from.
|
|
// ============================================================================================================
|
|
dirPath := fileDir(path)
|
|
if item := w.callbacks.Get(dirPath); item != nil {
|
|
for _, node := range item.(*glist.List).FrontAll() {
|
|
callback := node.(*Callback)
|
|
callbacks = append(callbacks, callback)
|
|
}
|
|
}
|
|
|
|
// Lastly searches all the parents of directory of `path` recursively for callbacks.
|
|
for {
|
|
parentDirPath := fileDir(dirPath)
|
|
if parentDirPath == dirPath {
|
|
break
|
|
}
|
|
if item := w.callbacks.Get(parentDirPath); item != nil {
|
|
for _, node := range item.(*glist.List).FrontAll() {
|
|
callback := node.(*Callback)
|
|
if callback.recursive {
|
|
callbacks = append(callbacks, callback)
|
|
}
|
|
}
|
|
}
|
|
dirPath = parentDirPath
|
|
}
|
|
return
|
|
}
|