Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/16156

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-10-25 17:24:24 +08:00
parent a8f56e55e3
commit 957a928959
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
6 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/config/bazaar.ts
View file

@ -704,7 +704,8 @@ export const bazaar = {
fetchPost("/api/petal/setPetalEnabled", {
packageName: dataObj.name,
enabled: true,
frontend: getFrontend()
frontend: getFrontend(),
app: Constants.SIYUAN_APPID,
}, (response) => {
loadPlugin(app, response.data);
bazaar._genMyHTML(bazaarType, app, false);
@ -946,7 +947,8 @@ export const bazaar = {
fetchPost("/api/petal/setPetalEnabled", {
packageName: dataObj.name,
enabled,
frontend: getFrontend()
frontend: getFrontend(),
app: Constants.SIYUAN_APPID,
}, (response) => {
target.removeAttribute("disabled");
if (enabled) {

13
kernel/api/petal.go
View file

@ -20,6 +20,7 @@ import (
"net/http"
"github.com/88250/gulu"
"github.com/emirpasic/gods/sets/hashset"
"github.com/gin-gonic/gin"
"github.com/siyuan-note/siyuan/kernel/model"
"github.com/siyuan-note/siyuan/kernel/util"
@ -60,4 +61,16 @@ func setPetalEnabled(c *gin.Context) {
}
ret.Data = data
var app string
if nil != arg["app"] {
app = arg["app"].(string)
}
if enabled {
upsertPluginSet := hashset.New(packageName)
model.PushReloadPlugin(upsertPluginSet, nil, app)
} else {
removePluginSet := hashset.New(packageName)
model.PushReloadPlugin(nil, removePluginSet, app)
}
}

4
kernel/model/bazzar.go
View file

@ -26,6 +26,7 @@ import (
"time"
"github.com/88250/gulu"
"github.com/emirpasic/gods/sets/hashset"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/bazaar"
"github.com/siyuan-note/siyuan/kernel/task"
@ -254,6 +255,9 @@ func UninstallBazaarPlugin(pluginName, frontend string) error {
}
petals = tmp
savePetals(petals)
removePluginSet := hashset.New(pluginName)
pushReloadPlugin(nil, removePluginSet, "")
return nil
}

37
kernel/model/push_reload.go
View file

@ -29,6 +29,7 @@ import (
"github.com/88250/lute/parse"
"github.com/88250/lute/render"
"github.com/emirpasic/gods/sets/hashset"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/av"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/siyuan/kernel/sql"
@ -37,6 +38,42 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func PushReloadPlugin(upsertPluginSet, removePluginNameSet *hashset.Set, excludeApp string) {
pushReloadPlugin(upsertPluginSet, removePluginNameSet, excludeApp)
}
func pushReloadPlugin(upsertPluginSet, removePluginNameSet *hashset.Set, excludeApp string) {
upsertPlugins, removePlugins := []string{}, []string{}
if nil != upsertPluginSet {
for _, n := range upsertPluginSet.Values() {
upsertPlugins = append(upsertPlugins, n.(string))
}
}
if nil != removePluginNameSet {
for _, n := range removePluginNameSet.Values() {
removePlugins = append(removePlugins, n.(string))
}
}
pushReloadPlugin0(upsertPlugins, removePlugins, excludeApp)
}
func pushReloadPlugin0(upsertPlugins, removePlugins []string, excludeApp string) {
logging.LogInfof("reload plugins [upserts=%v, removes=%v]", upsertPlugins, removePlugins)
if "" == excludeApp {
util.BroadcastByType("main", "reloadPlugin", 0, "", map[string]interface{}{
"upsertPlugins": upsertPlugins,
"removePlugins": removePlugins,
})
return
}
util.BroadcastByTypeAndExcludeApp(excludeApp, "main", "reloadPlugin", 0, "", map[string]interface{}{
"upsertPlugins": upsertPlugins,
"removePlugins": removePlugins,
})
}
func refreshDocInfo(tree *parse.Tree) {
if nil == tree {
return

18
kernel/model/repository.go
View file

@ -1690,7 +1690,7 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
}
if needReloadPlugin {
pushReloadPlugin(upsertPluginSet, removePluginSet)
pushReloadPlugin(upsertPluginSet, removePluginSet, "")
}
for _, widgetDir := range removeWidgetDirSet.Values() {
@ -2258,19 +2258,3 @@ func getCloudSpace() (stat *cloud.Stat, err error) {
}
return
}
func pushReloadPlugin(upsertPluginSet, removePluginNameSet *hashset.Set) {
upsertPlugins, removePlugins := []string{}, []string{}
for _, n := range upsertPluginSet.Values() {
upsertPlugins = append(upsertPlugins, n.(string))
}
for _, n := range removePluginNameSet.Values() {
removePlugins = append(removePlugins, n.(string))
}
logging.LogInfof("reload plugins [upserts=%v, removes=%v]", upsertPlugins, removePlugins)
util.BroadcastByType("main", "reloadPlugin", 0, "", map[string]interface{}{
"upsertPlugins": upsertPlugins,
"removePlugins": removePlugins,
})
}

23
kernel/util/websocket.go
View file

@ -32,6 +32,29 @@ var (
sessions = sync.Map{} // {appId, {sessionId, session}}
)
func BroadcastByTypeAndExcludeApp(excludeApp, typ, cmd string, code int, msg string, data interface{}) {
sessions.Range(func(key, value interface{}) bool {
appSessions := value.(*sync.Map)
if key == excludeApp {
return true
}
appSessions.Range(func(key, value interface{}) bool {
session := value.(*melody.Session)
if t, ok := session.Get("type"); ok && typ == t {
event := NewResult()
event.Cmd = cmd
event.Code = code
event.Msg = msg
event.Data = data
session.Write(event.Bytes())
}
return true
})
return true
})
}
func BroadcastByTypeAndApp(typ, app, cmd string, code int, msg string, data interface{}) {
appSessions, ok := sessions.Load(app)
if !ok {