Skip to content

Commit

Permalink
Merge branch 'main' of github.com:siyuan-note/bazaar
Browse files Browse the repository at this point in the history
  • Loading branch information
tangyw committed Oct 18, 2023
2 parents 17ae9c7 + 01b73f9 commit 9c9d8b5
Show file tree
Hide file tree
Showing 10 changed files with 4,778 additions and 1,507 deletions.
5 changes: 4 additions & 1 deletion actions/util/oss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"context"
"fmt"
"os"
"strings"

"github.com/88250/gulu"
"github.com/qiniu/go-sdk/v7/auth/qbox"
Expand All @@ -33,7 +34,9 @@ func UploadOSS(key, contentType string, data []byte) (err error) {
bucketManager := storage.NewBucketManager(mac, &cfg)
stat, err := bucketManager.Stat(bucket, key)
if nil != err {
logger.Warnf("stat [%s] failed: %s", key, err)
if !strings.Contains(err.Error(), "no such file or directory") {
logger.Warnf("stat [%s] failed: %s", key, err)
}
} else {
if "" != stat.Hash {
return
Expand Down
26 changes: 13 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ go 1.17
require (
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd
github.com/google/go-github/v52 v52.0.0
github.com/panjf2000/ants/v2 v2.7.1
github.com/panjf2000/ants/v2 v2.8.2
github.com/parnurzeal/gorequest v0.2.16
github.com/qiniu/go-sdk/v7 v7.17.0
golang.org/x/text v0.11.0 // indirect
github.com/qiniu/go-sdk/v7 v7.17.1
golang.org/x/text v0.13.0 // indirect
)

require (
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/cloudflare/circl v1.1.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/elazarl/goproxy v0.0.0-20210801061803-8e322dfb79c4 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.10.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
moul.io/http2curl v1.0.0 // indirect
)
1,511 changes: 1,490 additions & 21 deletions go.sum
View file

Large diffs are not rendered by default.

36 changes: 35 additions & 1 deletion plugins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
"frostime/sy-export-tree",
"frostime/sy-eye-ease",
"frostime/sy-transfer-refs",
"frostime/sy-docs-flow",
"frostime/sy-run-js",
"frostime/sy-insert-time",
"frostime/sy-time-logger",
"frostime/sy-titled-link",
"frostime/sy-quick-attr",
"frostime/sy-bq-callout",
"terwer/siyuan-plugin-importer",
"terwer/siyuan-plugin-custom-slug",
"terwer/siyuan-plugin-code-block",
Expand All @@ -20,6 +27,7 @@
"zuoez02/siyuan-plugin-card-link",
"zuoez02/siyuan-plugin-more-background",
"zuoez02/siyuan-plugin-webview-flomo",
"zuoez02/siyuan-plugin-picture-library",
"zuoez02/siyuan-plugin-power-mode",
"zuoez02/siyuan-plugin-open-md",
"zuoez02/siyuan-plugin-tts",
Expand All @@ -28,15 +36,25 @@
"zuoez02/siyuan-plugin-noto-color-emoji",
"zuoez02/siyuan-plugin-twitter-emoji",
"zuoez02/siyuan-plugin-background-grid",
"zuoez02/siyuan-plugin-keymap",
"zuoez02/siyuan-plugin-toolbar-plus",
"leolee9086/themeEditor",
"leolee9086/quickSnippets",
"Zuoqiu-Yingyi/siyuan-plugin-open-api",
"Zuoqiu-Yingyi/siyuan-plugin-webview",
"Zuoqiu-Yingyi/siyuan-plugin-custom-fonts",
"Zuoqiu-Yingyi/siyuan-plugin-custom-block",
"Zuoqiu-Yingyi/siyuan-plugin-monaco-editor",
"Zuoqiu-Yingyi/siyuan-plugin-wakatime",
"Zuoqiu-Yingyi/siyuan-plugin-opencc",
"Zuoqiu-Yingyi/siyuan-plugin-jupyter-client",
"Zuoqiu-Yingyi/siyuan-plugin-typewriter",
"zxhd863943427/siyuan-plugin-flash-enhance",
"leolee9086/browserTab",
"leolee9086/headingIndex",
"leolee9086/modemkiller",
"leolee9086/importHelper",
"leolee9086/quickRefactor",
"svtardust/Calendar-heatmap",
"MarkMindCkm/siyuan-markmind",
"OpaqueGlass/syplugin-hierarchyNavigate",
Expand All @@ -46,14 +64,30 @@
"zxhd863943427/siyuan-plugin-block-history",
"zxhd863943427/siyuan-plugin-pdf-annotate-enhance",
"mdzz2048/siyuan-plugin-weread",
"mdzz2048/siyuan-plugin-fold-list-preview",
"mdzz2048/siyuan-plugin-export-revlog",
"zxhd863943427/siyuan-plugin-pomodoro",
"zxhd863943427/siyuan-plugin-pdf-annotate-view-enhance",
"zxhd863943427/siyuan-plugin-workflow",
"zxhd863943427/siyuan-plugin-memo",
"HowcanoeWang/siyuan-plugin-background-cover",
"HowcanoeWang/siyuan-genshin-launcher",
"WingDr/siyuan-plugin-citation",
"WingDr/siyuan-plugin-sidebar-memo",
"WingDr/siyuan-plugin-zettelkasten",
"etchnight/siyuanPlugin-networkCustom",
"etchnight/siyuanPlugin-list2table",
"etchnight/siyuanPlugin-svgBlockEdit",
"choyy/simple-search",
"LinuaBio/GeogebraE"
"choyy/small-window",
"LinuaBio/GeogebraE",
"suka233/siyuan-kmind-plugin",
"caohongliang92/siyuan-plugin-more-cover",
"taotaochen86/siyuan-plugin-jsrunner",
"chenshinshi/link-icon",
"AirParty/siyuan-plugin-fold-button",
"RogerHuHu/siyuan-plugin-schedule-manager",
"shenjinglei/siyuan-plugin-graph-enhance",
"2234839/OceanPress_siyuan_plugin"
]
}
130 changes: 65 additions & 65 deletions stage/icons.json
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,16 @@
{
"repos": [
{
"url": "mozhux/Fluent-UI-System-icon@c369b1a7604841bf2e990bd3448b1300f2907f20",
"updated": "2023-07-10T16:23:48Z",
"url": "royc01/Savor-icon@db23c9bcbf0ed66d3da1dae51af9f637fae4bb82",
"updated": "2023-10-12T13:12:23Z",
"stars": 0,
"openIssues": 0,
"size": 144611,
"package": {
"name": "Fluent-UI-System-icon",
"author": "mozhux",
"url": "https://github.com/mozhux/Fluent-UI-System-icon",
"version": "1.1",
"minAppVersion": "",
"backends": null,
"frontends": null,
"displayName": {
"default": "Fluent-UI-System-icon",
"zh_CN": "微软流畅图标",
"en_US": ""
},
"description": {
"default": "Fluent UI System Icons are a collection of familiar, friendly and modern icons from Microsoft.",
"zh_CN": "流畅的UI系统图标是来自Microsoft的熟悉，友好和现代图标的集合。",
"en_US": ""
},
"readme": {
"default": "README.md",
"zh_CN": "README_zh_CN.md",
"en_US": ""
},
"funding": {
"openCollective": "b3log",
"patreon": "",
"github": "",
"custom": [
"https://ld246.com/sponsor"
]
}
}
},
{
"url": "royc01/Savor-icon@b5ec21f66074f23b234c82c143676e84d9796662",
"updated": "2023-06-24T08:07:24Z",
"stars": 0,
"openIssues": 0,
"size": 468697,
"size": 469913,
"package": {
"name": "Savor-icon",
"author": "Roy",
"url": "https://github.com/royc01/Savor-icon",
"version": "1.0.0",
"version": "1.0.1",
"minAppVersion": "",
"backends": null,
"frontends": null,
Expand Down Expand Up @@ -79,27 +40,27 @@
}
},
{
"url": "siyuan-note/icon-sample@41df2e8eb11a3fec26318a625cf5adf08e710075",
"updated": "2023-05-30T03:39:40Z",
"stars": 1,
"url": "mozhux/Fluent-UI-System-icon@659dc70d6f942b2de97698917b695438b918f89a",
"updated": "2023-10-06T10:28:52Z",
"stars": 0,
"openIssues": 0,
"size": 13034,
"size": 147738,
"package": {
"name": "icon-sample",
"author": "Vanessa",
"url": "https://github.com/siyuan-note/icon-sample",
"version": "0.0.3",
"minAppVersion": "2.8.8",
"name": "Fluent-UI-System-icon",
"author": "mozhux",
"url": "https://github.com/mozhux/Fluent-UI-System-icon",
"version": "2.0",
"minAppVersion": "",
"backends": null,
"frontends": null,
"displayName": {
"default": "Icon Sample",
"zh_CN": "图标示例",
"default": "Fluent-UI-System-icon",
"zh_CN": "微软流畅图标",
"en_US": ""
},
"description": {
"default": "This is a icon sample",
"zh_CN": "这是一个图标示例",
"default": "Fluent UI System Icons are a collection of familiar, friendly and modern icons from Microsoft.",
"zh_CN": "流畅的UI系统图标是来自Microsoft的熟悉，友好和现代图标的集合。",
"en_US": ""
},
"readme": {
Expand All @@ -108,7 +69,7 @@
"en_US": ""
},
"funding": {
"openCollective": "",
"openCollective": "b3log",
"patreon": "",
"github": "",
"custom": [
Expand All @@ -118,16 +79,16 @@
}
},
{
"url": "mozhux/Lucide-icon@eecefe69de033a9d9e1c33e0da458cf27d782f35",
"updated": "2023-05-13T14:44:40Z",
"url": "mozhux/Lucide-icon@2c613cb839c8e9e5eb85abd24898c025a9963d2e",
"updated": "2023-10-06T07:56:33Z",
"stars": 0,
"openIssues": 0,
"size": 157608,
"size": 159424,
"package": {
"name": "Lucide-icon",
"author": "mozhux",
"url": "https://github.com/mozhux/Lucide-icon",
"version": "2.0.1",
"version": "2.1",
"minAppVersion": "",
"backends": null,
"frontends": null,
Expand Down Expand Up @@ -157,16 +118,16 @@
}
},
{
"url": "mozhux/Remix-icon@a6f06c511bb5e7f3105eddd19c36ba78861039c7",
"updated": "2023-05-13T12:47:38Z",
"url": "mozhux/Remix-icon@23722cb545d6048a6007d69a3debe1d5343d44fc",
"updated": "2023-10-02T01:08:54Z",
"stars": 4,
"openIssues": 0,
"size": 139602,
"size": 141882,
"package": {
"name": "Remix-icon",
"author": "mozhux",
"url": "https://github.com/mozhux/Remix-icon",
"version": "3.0.1",
"version": "3.1",
"minAppVersion": "",
"backends": null,
"frontends": null,
Expand Down Expand Up @@ -194,6 +155,45 @@
]
}
}
},
{
"url": "siyuan-note/icon-sample@41df2e8eb11a3fec26318a625cf5adf08e710075",
"updated": "2023-05-30T03:39:40Z",
"stars": 1,
"openIssues": 0,
"size": 13034,
"package": {
"name": "icon-sample",
"author": "Vanessa",
"url": "https://github.com/siyuan-note/icon-sample",
"version": "0.0.3",
"minAppVersion": "2.8.8",
"backends": null,
"frontends": null,
"displayName": {
"default": "Icon Sample",
"zh_CN": "图标示例",
"en_US": ""
},
"description": {
"default": "This is a icon sample",
"zh_CN": "这是一个图标示例",
"en_US": ""
},
"readme": {
"default": "README.md",
"zh_CN": "README_zh_CN.md",
"en_US": ""
},
"funding": {
"openCollective": "",
"patreon": "",
"github": "",
"custom": [
"https://ld246.com/sponsor"
]
}
}
}
]
}
Loading

0 comments on commit 9c9d8b5

Please sign in to comment.