0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-09-05 23:07:47 +08:00
commit 0557040064
4 changed files with 64 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

70
kernel/api/bazaar.go
View file

@ -124,6 +124,11 @@ func installBazaarPlugin(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
repoURL := arg["repoURL"].(string)
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
@ -138,7 +143,7 @@ func installBazaarPlugin(c *gin.Context) {
util.PushMsg(model.Conf.Language(69), 3000)
ret.Data = map[string]interface{}{
"packages": model.BazaarPlugins(frontend, ""),
"packages": model.BazaarPlugins(frontend, keyword),
}
}
@ -151,6 +156,11 @@ func uninstallBazaarPlugin(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
frontend := arg["frontend"].(string)
packageName := arg["packageName"].(string)
err := model.UninstallBazaarPlugin(packageName, frontend)
@ -161,7 +171,7 @@ func uninstallBazaarPlugin(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarPlugins(frontend, ""),
"packages": model.BazaarPlugins(frontend, keyword),
}
}
@ -212,6 +222,11 @@ func installBazaarWidget(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
repoURL := arg["repoURL"].(string)
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
@ -224,7 +239,7 @@ func installBazaarWidget(c *gin.Context) {
util.PushMsg(model.Conf.Language(69), 3000)
ret.Data = map[string]interface{}{
"packages": model.BazaarWidgets(""),
"packages": model.BazaarWidgets(keyword),
}
}
@ -237,6 +252,11 @@ func uninstallBazaarWidget(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
packageName := arg["packageName"].(string)
err := model.UninstallBazaarWidget(packageName)
if err != nil {
@ -246,7 +266,7 @@ func uninstallBazaarWidget(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarWidgets(""),
"packages": model.BazaarWidgets(keyword),
}
}
@ -297,6 +317,11 @@ func installBazaarIcon(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
repoURL := arg["repoURL"].(string)
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
@ -309,7 +334,7 @@ func installBazaarIcon(c *gin.Context) {
util.PushMsg(model.Conf.Language(69), 3000)
ret.Data = map[string]interface{}{
"packages": model.BazaarIcons(""),
"packages": model.BazaarIcons(keyword),
"appearance": model.Conf.Appearance,
}
}
@ -323,6 +348,11 @@ func uninstallBazaarIcon(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
packageName := arg["packageName"].(string)
err := model.UninstallBazaarIcon(packageName)
if err != nil {
@ -332,7 +362,7 @@ func uninstallBazaarIcon(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarIcons(""),
"packages": model.BazaarIcons(keyword),
"appearance": model.Conf.Appearance,
}
}
@ -384,6 +414,11 @@ func installBazaarTemplate(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
repoURL := arg["repoURL"].(string)
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
@ -395,7 +430,7 @@ func installBazaarTemplate(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarTemplates(""),
"packages": model.BazaarTemplates(keyword),
}
util.PushMsg(model.Conf.Language(69), 3000)
@ -410,6 +445,11 @@ func uninstallBazaarTemplate(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
packageName := arg["packageName"].(string)
err := model.UninstallBazaarTemplate(packageName)
if err != nil {
@ -419,7 +459,7 @@ func uninstallBazaarTemplate(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarTemplates(""),
"packages": model.BazaarTemplates(keyword),
}
}
@ -470,6 +510,11 @@ func installBazaarTheme(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
repoURL := arg["repoURL"].(string)
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
@ -491,7 +536,7 @@ func installBazaarTheme(c *gin.Context) {
util.PushMsg(model.Conf.Language(69), 3000)
ret.Data = map[string]interface{}{
"packages": model.BazaarThemes(""),
"packages": model.BazaarThemes(keyword),
"appearance": model.Conf.Appearance,
}
}
@ -505,6 +550,11 @@ func uninstallBazaarTheme(c *gin.Context) {
return
}
var keyword string
if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string)
}
packageName := arg["packageName"].(string)
err := model.UninstallBazaarTheme(packageName)
if err != nil {
@ -514,7 +564,7 @@ func uninstallBazaarTheme(c *gin.Context) {
}
ret.Data = map[string]interface{}{
"packages": model.BazaarThemes(""),
"packages": model.BazaarThemes(keyword),
"appearance": model.Conf.Appearance,
}
}

2
kernel/go.mod
View file

@ -10,7 +10,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02
github.com/88250/lute v1.7.7-0.20240902084057-310b8e466f54
github.com/88250/lute v1.7.7-0.20240905144001-51e2202b5bb2
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4

4
kernel/go.sum
View file

@ -12,8 +12,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02 h1:3e5+yobj655pTeKOYMbJrnc1mE51ZkbXIxquTYZuYCY=
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
github.com/88250/lute v1.7.7-0.20240902084057-310b8e466f54 h1:CxfSJz8DQsiOhStNCNcx30tzte3dLlGQTX8rtgqJWxI=
github.com/88250/lute v1.7.7-0.20240902084057-310b8e466f54/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/lute v1.7.7-0.20240905144001-51e2202b5bb2 h1:myd1qXwSD9xr+sbWHga1IOrIdimx1aS3KMOQa5OIRHk=
github.com/88250/lute v1.7.7-0.20240905144001-51e2202b5bb2/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=