From ca8bef4966c28c13ebe0fe56c00451ebb0abb8fa Mon Sep 17 00:00:00 2001 From: pangdogs Date: Sat, 21 Dec 2024 16:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extension/addinmanager.go | 72 +++++++++++++++++++------------------- runtime/context_options.go | 4 +-- service/context_options.go | 4 +-- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/extension/addinmanager.go b/extension/addinmanager.go index 9b13132..d61ec96 100644 --- a/extension/addinmanager.go +++ b/extension/addinmanager.go @@ -66,30 +66,30 @@ type _AddInManager struct { } // GetAddInManager 获取插件管理器 -func (bundle *_AddInManager) GetAddInManager() AddInManager { - return bundle +func (mgr *_AddInManager) GetAddInManager() AddInManager { + return mgr } // Install 安装插件，不设置插件名称时，将会使用插件实例名称作为插件名称 -func (bundle *_AddInManager) Install(addInFace iface.FaceAny, name ...string) { - bundle.installCB.Exec(bundle.install(addInFace, name...)) +func (mgr *_AddInManager) Install(addInFace iface.FaceAny, name ...string) { + mgr.installCB.Exec(mgr.install(addInFace, name...)) } // Uninstall 卸载插件 -func (bundle *_AddInManager) Uninstall(name string) { - status, ok := bundle.uninstall(name) +func (mgr *_AddInManager) Uninstall(name string) { + status, ok := mgr.uninstall(name) if !ok { return } - bundle.uninstallCB.Exec(status) + mgr.uninstallCB.Exec(status) } // Get 获取插件 -func (bundle *_AddInManager) Get(name string) (AddInStatus, bool) { - bundle.RLock() - defer bundle.RUnlock() +func (mgr *_AddInManager) Get(name string) (AddInStatus, bool) { + mgr.RLock() + defer mgr.RUnlock() - status, ok := bundle.addInIdx[name] + status, ok := mgr.addInIdx[name] if !ok { return nil, false } @@ -98,10 +98,10 @@ func (bundle *_AddInManager) Get(name string) (AddInStatus, bool) { } // Range 遍历所有已注册的插件 -func (bundle *_AddInManager) Range(fun generic.Func1[AddInStatus, bool]) { - bundle.RLock() - copied := slices.Clone(bundle.addInList) - bundle.RUnlock() +func (mgr *_AddInManager) Range(fun generic.Func1[AddInStatus, bool]) { + mgr.RLock() + copied := slices.Clone(mgr.addInList) + mgr.RUnlock() for i := range copied { if !fun.Exec(copied[i]) { @@ -111,10 +111,10 @@ func (bundle *_AddInManager) Range(fun generic.Func1[AddInStatus, bool]) { } // ReversedRange 反向遍历所有已注册的插件 -func (bundle *_AddInManager) ReversedRange(fun generic.Func1[AddInStatus, bool]) { - bundle.RLock() - copied := slices.Clone(bundle.addInList) - bundle.RUnlock() +func (mgr *_AddInManager) ReversedRange(fun generic.Func1[AddInStatus, bool]) { + mgr.RLock() + copied := slices.Clone(mgr.addInList) + mgr.RUnlock() for i := len(copied) - 1; i >= 0; i-- { if !fun.Exec(copied[i]) { @@ -123,28 +123,28 @@ func (bundle *_AddInManager) ReversedRange(fun generic.Func1[AddInStatus, bool]) } } -func (bundle *_AddInManager) setCallback(installCB, uninstallCB generic.Action1[AddInStatus]) { - bundle.Lock() - defer bundle.Unlock() +func (mgr *_AddInManager) setCallback(installCB, uninstallCB generic.Action1[AddInStatus]) { + mgr.Lock() + defer mgr.Unlock() - bundle.installCB = installCB - bundle.uninstallCB = uninstallCB + mgr.installCB = installCB + mgr.uninstallCB = uninstallCB } -func (bundle *_AddInManager) install(addInFace iface.FaceAny, name ...string) *_AddInStatus { +func (mgr *_AddInManager) install(addInFace iface.FaceAny, name ...string) *_AddInStatus { if addInFace.IsNil() { exception.Panicf("%w: %w: addInFace is nil", ErrExtension, exception.ErrArgs) } - bundle.Lock() - defer bundle.Unlock() + mgr.Lock() + defer mgr.Unlock() addInName := pie.First(name) if addInName == "" { addInName = types.FullName(addInFace.Iface) } - if _, ok := bundle.addInIdx[addInName]; ok { + if _, ok := mgr.addInIdx[addInName]; ok { exception.Panicf("%w: addIn %q is already installed", ErrExtension, addInName) } @@ -155,24 +155,24 @@ func (bundle *_AddInManager) install(addInFace iface.FaceAny, name ...string) *_ } status.state.Store(int32(AddInState_Loaded)) - bundle.addInList = append(bundle.addInList, status) - bundle.addInIdx[addInName] = status + mgr.addInList = append(mgr.addInList, status) + mgr.addInIdx[addInName] = status return status } -func (bundle *_AddInManager) uninstall(name string) (*_AddInStatus, bool) { - bundle.Lock() - defer bundle.Unlock() +func (mgr *_AddInManager) uninstall(name string) (*_AddInStatus, bool) { + mgr.Lock() + defer mgr.Unlock() - status, ok := bundle.addInIdx[name] + status, ok := mgr.addInIdx[name] if !ok { return nil, false } - delete(bundle.addInIdx, name) + delete(mgr.addInIdx, name) - bundle.addInList = slices.DeleteFunc(bundle.addInList, func(status *_AddInStatus) bool { + mgr.addInList = slices.DeleteFunc(mgr.addInList, func(status *_AddInStatus) bool { return status.name == name }) diff --git a/runtime/context_options.go b/runtime/context_options.go index 40cb0d5..12529b6 100644 --- a/runtime/context_options.go +++ b/runtime/context_options.go @@ -96,9 +96,9 @@ func (_ContextOption) PersistId(id uid.Id) option.Setting[ContextOptions] { } // AddInManager 插件管理器 -func (_ContextOption) AddInManager(bundle extension.AddInManager) option.Setting[ContextOptions] { +func (_ContextOption) AddInManager(mgr extension.AddInManager) option.Setting[ContextOptions] { return func(o *ContextOptions) { - o.AddInManager = bundle + o.AddInManager = mgr } } diff --git a/service/context_options.go b/service/context_options.go index b40b1db..ad176b3 100644 --- a/service/context_options.go +++ b/service/context_options.go @@ -108,9 +108,9 @@ func (_Option) EntityLib(lib pt.EntityLib) option.Setting[ContextOptions] { } // AddInManager 插件管理器 -func (_Option) AddInManager(bundle extension.AddInManager) option.Setting[ContextOptions] { +func (_Option) AddInManager(mgr extension.AddInManager) option.Setting[ContextOptions] { return func(o *ContextOptions) { - o.AddInManager = bundle + o.AddInManager = mgr } }