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

This commit is contained in:
Vanessa 2022-07-11 14:46:29 +08:00
commit 8fff141c1a
16 changed files with 482 additions and 169 deletions

2
.gitattributes vendored
View file

@ -1 +1 @@
stage/** linguist-vendored
app/stage/protyle/** linguist-vendored

View file

@ -944,6 +944,7 @@
"168": "Uploading data repo snapshot %s",
"169": "Uploading data repo file %v",
"170": "Uploading data repo chunk %v",
"171": "Uploading data repo reference %s"
"171": "Uploading data repo reference %s",
"172": "Data repo key does not match, data cannot be decrypted"
}
}

View file

@ -944,6 +944,7 @@
"168": "Cargando instantánea de repositorio de datos %s",
"169": "Cargando archivo de repositorio de datos %v",
"170": "Cargando fragmento de repositorio de datos %v",
"171": "Cargando referencia de repositorio de datos %s"
"171": "Cargando referencia de repositorio de datos %s",
"172": "La clave del repositorio de datos no coincide, los datos no se pueden descifrar"
}
}

View file

@ -944,6 +944,7 @@
"168": "Téléchargement de l'instantané du référentiel de données %s",
"169": "Téléchargement du fichier de référentiel de données %v",
"170": "Téléchargement du bloc de dépôt de données %v",
"171": "Téléchargement de la référence de référentiel de données %s"
"171": "Téléchargement de la référence de référentiel de données %s",
"172": "La clé du référentiel de données ne correspond pas, les données ne peuvent pas être déchiffrées"
}
}

View file

@ -943,6 +943,7 @@
"168": "正在上傳數據倉庫快照 %s",
"169": "正在上傳數據倉庫文件 %v",
"170": "正在上傳數據倉庫分塊 %v",
"171": "正在上傳數據倉庫引用 %s"
"171": "正在上傳數據倉庫引用 %s",
"172": "數據倉庫密鑰不匹配,無法解密數據"
}
}

View file

@ -945,6 +945,7 @@
"168": "正在上传数据仓库快照 %s",
"169": "正在上传数据仓库文件 %v",
"170": "正在上传数据仓库分块 %v",
"171": "正在上传数据仓库引用 %s"
"171": "正在上传数据仓库引用 %s",
"172": "数据仓库密钥不匹配,无法解密数据"
}
}

View file

@ -5,7 +5,7 @@
"id": "20200924100744-br924ar",
"title": "Assets",
"type": "doc",
"updated": "20220503122616"
"updated": "20220711122005"
},
"Children": [
{
@ -32,12 +32,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210503095710-1vp1uxw",
"updated": "20210615102935"
"updated": "20220711121739"
},
"Children": [
{
"Type": "NodeText",
"Data": "Attachments inserted through the editor will be regarded as asset files and will be placed in the workspace data/assets folder by default."
"Data": "Attachments inserted through the editor will be regarded as asset files and will be placed in the "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "workspace/data/assets/"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " folder by default."
}
]
},
@ -295,7 +315,8 @@
"Num": 1
},
"Properties": {
"id": "20210115224203-r3mwskz"
"id": "20210115224203-r3mwskz",
"updated": "20220711122005"
},
"Children": [
{
@ -312,19 +333,54 @@
"Num": 1
},
"Properties": {
"id": "20210115224203-1g8zvdg"
"id": "20210115224203-1g8zvdg",
"updated": "20220711122005"
},
"Children": [
{
"ID": "20210204172630-7rtyepg",
"Type": "NodeParagraph",
"Properties": {
"id": "20210204172630-7rtyepg"
"id": "20210204172630-7rtyepg",
"updated": "20220711122005"
},
"Children": [
{
"Type": "NodeText",
"Data": "Reference to a specific asset file, such as a picture or a file"
"Data": "Reference to a specific asset file, such as a picture or a file. If the asset file is a PDF and is "
},
{
"Type": "NodeBlockRef",
"Data": "span",
"Children": [
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeBlockRefID",
"Data": "20210923104413-csbeop3"
},
{
"Type": "NodeBlockRefSpace"
},
{
"Type": "NodeBlockRefText",
"Data": "annotated"
},
{
"Type": "NodeCloseParen"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ", it will not count towards cleanup whether it is referenced or not"
}
]
}
@ -344,14 +400,16 @@
"Num": 2
},
"Properties": {
"id": "20210115224203-xb0ycqg"
"id": "20210115224203-xb0ycqg",
"updated": "20220711121811"
},
"Children": [
{
"ID": "20210204172630-kq680iv",
"Type": "NodeParagraph",
"Properties": {
"id": "20210204172630-kq680iv"
"id": "20210204172630-kq680iv",
"updated": "20220711121811"
},
"Children": [
{
@ -360,19 +418,17 @@
},
{
"Type": "NodeCodeSpan",
"CodeMarkerLen": 1,
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker",
"Data": "`"
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "/"
},
{
"Type": "NodeCodeSpanCloseMarker",
"Data": "`"
"Type": "NodeCodeSpanCloseMarker"
}
]
},
@ -382,21 +438,23 @@
},
{
"Type": "NodeCodeSpan",
"CodeMarkerLen": 1,
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker",
"Data": "`"
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "[foo](assets/bar/)"
},
{
"Type": "NodeCodeSpanCloseMarker",
"Data": "`"
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": ". If a asset folder is referenced, all the following asset files will be counted as already referenced regardless of whether they are individually referenced."
}
]
}
@ -404,19 +462,6 @@
}
]
},
{
"ID": "20210115224203-hb1ykk2",
"Type": "NodeParagraph",
"Properties": {
"id": "20210115224203-hb1ykk2"
},
"Children": [
{
"Type": "NodeText",
"Data": "The second case is special: if a asset folder is referenced, all the following asset files will be counted as already referenced regardless of whether they are individually referenced."
}
]
},
{
"ID": "20210115224203-e03wglt",
"Type": "NodeParagraph",

View file

@ -6,7 +6,7 @@
"id": "20200923234731-h3zkwm2",
"title": "FAQ",
"type": "doc",
"updated": "20220709130711"
"updated": "20220711123705"
},
"Children": [
{
@ -1562,6 +1562,75 @@
}
]
},
{
"ID": "20220711123529-bjd0rvv",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220711123529-bjd0rvv",
"updated": "20220711123529"
},
"Children": [
{
"Type": "NodeText",
"Data": "Why can't some online pictures be viewed?"
}
]
},
{
"ID": "20220711123529-xgrcde0",
"Type": "NodeParagraph",
"Properties": {
"id": "20220711123529-xgrcde0",
"updated": "20220711123705"
},
"Children": [
{
"Type": "NodeText",
"Data": "In order to avoid some potential security problems, SiYuan will not bypass the security header verification (such as security policy header and anti-leech verification) of the target site when initiating Internet service requests. You can try the "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "Convert network images to local images"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " function in the "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "..."
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " in the upper right corner of the editor to pull the network image to the local, so that even if the target site changes the security policy or the local image is unavailable later, it will not be affected."
}
]
},
{
"ID": "20220615153446-i8gpnt2",
"Type": "NodeHeading",

View file

@ -5,7 +5,7 @@
"id": "20200915214115-42b8zma",
"title": "资源文件",
"type": "doc",
"updated": "20220503121834"
"updated": "20220711122042"
},
"Children": [
{
@ -32,12 +32,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210503095358-zr3uijl",
"updated": "20210615102655"
"updated": "20220711121657"
},
"Children": [
{
"Type": "NodeText",
"Data": "通过编辑器插入的附件会被认为是资源文件,默认放置在工作空间 data/assets 文件夹下。"
"Data": "通过编辑器插入的附件会被认为是资源文件,默认放置在 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "工作空间/data/assets/"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 文件夹下。"
}
]
},
@ -255,7 +275,8 @@
"Num": 1
},
"Properties": {
"id": "20210115222514-tqfsawm"
"id": "20210115222514-tqfsawm",
"updated": "20220711121929"
},
"Children": [
{
@ -272,19 +293,29 @@
"Num": 1
},
"Properties": {
"id": "20210115222515-47r5lop"
"id": "20210115222515-47r5lop",
"updated": "20220711121929"
},
"Children": [
{
"ID": "20210204172443-a8xpkb9",
"Type": "NodeParagraph",
"Properties": {
"id": "20210204172443-a8xpkb9"
"id": "20210204172443-a8xpkb9",
"updated": "20220711121929"
},
"Children": [
{
"Type": "NodeText",
"Data": "引用具体的资源文件,比如图片或者文件"
"Data": "引用具体的资源文件,比如图片或者文件。如果资源文件是 PDF 且做过"
},
{
"Type": "NodeText",
"Data": "标注"
},
{
"Type": "NodeText",
"Data": ",那么无论它是否被引用都不会计入清理"
}
]
}
@ -304,14 +335,16 @@
"Num": 2
},
"Properties": {
"id": "20210115222545-nilj84d"
"id": "20210115222545-nilj84d",
"updated": "20220711121528"
},
"Children": [
{
"ID": "20210204172443-zyll68d",
"Type": "NodeParagraph",
"Properties": {
"id": "20210204172443-zyll68d"
"id": "20210204172443-zyll68d",
"updated": "20220711121528"
},
"Children": [
{
@ -320,19 +353,17 @@
},
{
"Type": "NodeCodeSpan",
"CodeMarkerLen": 1,
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker",
"Data": "`"
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "/"
},
{
"Type": "NodeCodeSpanCloseMarker",
"Data": "`"
"Type": "NodeCodeSpanCloseMarker"
}
]
},
@ -342,21 +373,23 @@
},
{
"Type": "NodeCodeSpan",
"CodeMarkerLen": 1,
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker",
"Data": "`"
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "[foo](assets/bar/)"
},
{
"Type": "NodeCodeSpanCloseMarker",
"Data": "`"
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "。一个资源文件夹如果被引用,则下面所有资源文件无论是否被单独引用,都会被算作已经引用"
}
]
}
@ -364,25 +397,12 @@
}
]
},
{
"ID": "20210115223119-4mzx5a8",
"Type": "NodeParagraph",
"Properties": {
"id": "20210115223119-4mzx5a8"
},
"Children": [
{
"Type": "NodeText",
"Data": "第二种情况比较特殊:一个资源文件夹如果被引用,则下面所有资源文件无论是否被单独引用,都会被算作已经引用。"
}
]
},
{
"ID": "20210115223610-ffnxstf",
"Type": "NodeParagraph",
"Properties": {
"id": "20210115223610-ffnxstf",
"updated": "20210512160443"
"updated": "20220711122042"
},
"Children": [
{
@ -391,6 +411,7 @@
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
@ -410,6 +431,7 @@
},
{
"Type": "NodeKbd",
"Data": "kbd",
"Children": [
{
"Type": "NodeKbdOpenMarker"
@ -425,35 +447,19 @@
},
{
"Type": "NodeText",
"Data": " 中可以一键清理未引用资源,如果需要找回被误删的文件,请通过"
"Data": " 中可以一键"
},
{
"Type": "NodeBlockRef",
"Children": [
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeBlockRefID",
"Data": "20210104090742-hjfornp"
},
{
"Type": "NodeBlockRefSpace"
},
{
"Type": "NodeBlockRefText",
"Data": "回滚"
},
{
"Type": "NodeCloseParen"
},
{
"Type": "NodeCloseParen"
}
]
"Type": "NodeText",
"Data": "清理未引用资源"
},
{
"Type": "NodeText",
"Data": ",如果需要找回被误删的文件,请通过"
},
{
"Type": "NodeText",
"Data": "回滚"
},
{
"Type": "NodeText",

View file

@ -6,7 +6,7 @@
"id": "20200813093015-u6bopdt",
"title": "常见问题",
"type": "doc",
"updated": "20220709130624"
"updated": "20220711123431"
},
"Children": [
{
@ -1664,6 +1664,75 @@
}
]
},
{
"ID": "20220711122412-g3avmxt",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220711122412-g3avmxt",
"updated": "20220711122436"
},
"Children": [
{
"Type": "NodeText",
"Data": "有的网络图片为什么无法查看?"
}
]
},
{
"ID": "20220711122438-j161jkx",
"Type": "NodeParagraph",
"Properties": {
"id": "20220711122438-j161jkx",
"updated": "20220711123431"
},
"Children": [
{
"Type": "NodeText",
"Data": "为了避免一些潜在的安全问题,思源在发起互联网服务请求时不会绕过目标站点的安全标头校验(比如安全策略标头和防盗链校验)。可以试一下编辑器右上角 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "..."
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 中的 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "网络图片转换为本地图片"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 功能将网络图片拉取到本地,这样即使以后目标站点改变安全策略或者不可用本地图片也不受影响。"
}
]
},
{
"ID": "20220615152404-l82qznd",
"Type": "NodeHeading",

View file

@ -5,7 +5,7 @@
"icon": "2753",
"id": "20211226115227-r1rty9v",
"title": "常見問題",
"updated": "20220709130743"
"updated": "20220711123511"
},
"Children": [
{
@ -1559,6 +1559,75 @@
}
]
},
{
"ID": "20220711123511-bzzrzif",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20220711123511-bzzrzif",
"updated": "20220711123511"
},
"Children": [
{
"Type": "NodeText",
"Data": "有的網絡圖片為什麼無法查看?"
}
]
},
{
"ID": "20220711123511-7kicy5w",
"Type": "NodeParagraph",
"Properties": {
"id": "20220711123511-7kicy5w",
"updated": "20220711123511"
},
"Children": [
{
"Type": "NodeText",
"Data": "為了避免一些潛在的安全問題,思源在發起互聯網服務請求時不會繞過目標站點的安全標頭校驗(比如安全策略標頭和防盜鏈校驗)。可以試一下編輯器右上角 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "..."
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 中的 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "網絡圖片轉換為本地圖片"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 功能將網絡圖片拉取到本地,這樣即使以後目標站點改變安全策略或者不可用本地圖片也不受影響。"
}
]
},
{
"ID": "20220615153430-zg69bjz",
"Type": "NodeHeading",

View file

@ -4,7 +4,7 @@
"Properties": {
"id": "20211226123038-4umgpxy",
"title": "資料文件",
"updated": "20220503122338"
"updated": "20220711122031"
},
"Children": [
{
@ -27,12 +27,32 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-wvk5a7h",
"updated": "20211228132912"
"updated": "20220711121751"
},
"Children": [
{
"Type": "NodeText",
"Data": "通過編輯器插入的附件會被認為是資料文件,預設放置在工作空間 data/assets 文件夾下。"
"Data": "通過編輯器插入的附件會被認為是資料文件,預設放置在 "
},
{
"Type": "NodeCodeSpan",
"Data": "code",
"Children": [
{
"Type": "NodeCodeSpanOpenMarker"
},
{
"Type": "NodeCodeSpanContent",
"Data": "工作空間/data/assets/"
},
{
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": " 文件夾下。"
}
]
},
@ -222,7 +242,7 @@
},
"Properties": {
"id": "20211226123051-1qp7a9g",
"updated": "20211228104718"
"updated": "20220711121953"
},
"Children": [
{
@ -236,7 +256,7 @@
},
"Properties": {
"id": "20211226123051-mmn60x5",
"updated": "20211228104716"
"updated": "20220711121953"
},
"Children": [
{
@ -244,12 +264,45 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-p8dr1dy",
"updated": "20211228104716"
"updated": "20220711121953"
},
"Children": [
{
"Type": "NodeText",
"Data": "引用具體的資料文件,比如圖片或者文件"
"Data": "引用具體的資料文件,比如圖片或者文件。如果資源文件是 PDF 且做過"
},
{
"Type": "NodeBlockRef",
"Data": "span",
"Children": [
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeBlockRefID",
"Data": "20211226122955-ganeraz"
},
{
"Type": "NodeBlockRefSpace"
},
{
"Type": "NodeBlockRefText",
"Data": "標註"
},
{
"Type": "NodeCloseParen"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ",那麼無論它是否被引用都不會計入清理"
}
]
}
@ -266,7 +319,7 @@
},
"Properties": {
"id": "20211226123051-0az1yw2",
"updated": "20211228104718"
"updated": "20220711121803"
},
"Children": [
{
@ -274,7 +327,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-heoyfe2",
"updated": "20211228104718"
"updated": "20220711121803"
},
"Children": [
{
@ -316,6 +369,10 @@
"Type": "NodeCodeSpanCloseMarker"
}
]
},
{
"Type": "NodeText",
"Data": "。一個資料文件夾如果被引用,則下面所有資料文件無論是否被單獨引用,都會被算作已經引用"
}
]
}
@ -323,26 +380,12 @@
}
]
},
{
"ID": "20211226123051-8ftluwy",
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-8ftluwy",
"updated": "20211228104725"
},
"Children": [
{
"Type": "NodeText",
"Data": "第二種情況比較特殊:一個資料文件夾如果被引用,則下面所有資料文件無論是否被單獨引用,都會被算作已經引用。"
}
]
},
{
"ID": "20211226123051-tkps9jc",
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123051-tkps9jc",
"updated": "20211228104732"
"updated": "20220711122031"
},
"Children": [
{
@ -387,7 +430,15 @@
},
{
"Type": "NodeText",
"Data": " 中可以一鍵清理未引用資料,如果需要找回被誤刪的文件,請通過"
"Data": " 中可以一鍵"
},
{
"Type": "NodeText",
"Data": "清理未引用資料"
},
{
"Type": "NodeText",
"Data": ",如果需要找回被誤刪的文件,請通過"
},
{
"Type": "NodeBlockRef",
@ -408,7 +459,7 @@
},
{
"Type": "NodeBlockRefText",
"Data": "回滾(rollback)"
"Data": "回滾Rollback"
},
{
"Type": "NodeCloseParen"

View file

@ -25,10 +25,10 @@ require (
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
github.com/flopp/go-findfont v0.1.0
github.com/fsnotify/fsnotify v1.5.4
github.com/gabriel-vasile/mimetype v1.4.0
github.com/gabriel-vasile/mimetype v1.4.1
github.com/getsentry/sentry-go v0.13.0
github.com/gin-contrib/cors v1.3.1
github.com/gin-contrib/gzip v0.0.5
github.com/gin-contrib/cors v1.4.0
github.com/gin-contrib/gzip v0.0.6
github.com/gin-contrib/sessions v0.0.5
github.com/gin-gonic/gin v1.8.1
github.com/imroc/req/v3 v3.13.2
@ -41,14 +41,14 @@ require (
github.com/qiniu/go-sdk/v7 v7.13.0
github.com/radovskyb/watcher v1.0.7
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/siyuan-note/dejavu v0.0.0-20220709102942-5f25f8253474
github.com/siyuan-note/dejavu v0.0.0-20220711060744-3fec84096399
github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676
github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f
github.com/siyuan-note/filelock v0.0.0-20220704090116-54dfb035283f
github.com/siyuan-note/httpclient v0.0.0-20220709030145-2bfb50f28e73
github.com/vmihailenco/msgpack/v5 v5.3.5
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd
golang.org/x/image v0.0.0-20220617043117-41969df76e82
golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd
golang.org/x/text v0.3.7
)
@ -67,7 +67,7 @@ require (
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/goccy/go-json v0.9.8 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
@ -83,7 +83,7 @@ require (
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/errors v0.0.0-20220331221717-b38fca44723b // indirect
github.com/juju/errors v0.0.0-20220622220526-54a94488269b // indirect
github.com/klauspost/compress v1.15.7 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect

View file

@ -140,21 +140,19 @@ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA=
github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
github.com/gin-contrib/gzip v0.0.5 h1:mhnVU32YnnBh2LPH2iqRqsA/eR7SAqRaD388jL2s/j0=
github.com/gin-contrib/gzip v0.0.5/go.mod h1:OPIK6HR0Um2vNmBUTlayD7qle4yVVRZT0PyhdUigrKk=
github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
@ -163,20 +161,19 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk=
github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-json v0.9.8 h1:DxXB6MLd6yyel7CLph8EwNIonUtVZd3Ue5iRcL4DQCE=
github.com/goccy/go-json v0.9.8/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@ -306,8 +303,6 @@ github.com/imroc/req/v3 v3.13.2/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCf
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@ -316,8 +311,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/juju/errors v0.0.0-20170703010042-c7d06af17c68/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
github.com/juju/errors v0.0.0-20220331221717-b38fca44723b h1:AxFeSQJfcm2O3ov1wqAkTKYFsnMw2g1B4PkYujfAdkY=
github.com/juju/errors v0.0.0-20220331221717-b38fca44723b/go.mod h1:jMGj9DWF/qbo91ODcfJq6z/RYc3FX3taCBZMCcpI4Ls=
github.com/juju/errors v0.0.0-20220622220526-54a94488269b h1:RDqhIF4b2LKv1CHVw5AKASru2kJ1gnTMJJGhpUNo0LQ=
github.com/juju/errors v0.0.0-20220622220526-54a94488269b/go.mod h1:B5x9thDqx0wIMH3+aLIMP9HjItInYWObRovoCFM5Qe8=
github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
github.com/juju/testing v0.0.0-20191001232224-ce9dec17d28b/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@ -336,15 +331,11 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
@ -382,6 +373,7 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
@ -424,8 +416,8 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/siyuan-note/dejavu v0.0.0-20220709102942-5f25f8253474 h1:cFdtB2NHdAQ47/kUdIpw2IzG3VDydAHWhMFTDZHnEsE=
github.com/siyuan-note/dejavu v0.0.0-20220709102942-5f25f8253474/go.mod h1:cri+XyZAqmK5fJ98En9aOHB+YkuU8+XQcJdQ31EUhis=
github.com/siyuan-note/dejavu v0.0.0-20220711060744-3fec84096399 h1:kg4BZwxn4A5d9YD9sx6GnyZ6o+Rn1IiuhrZ5qYrVXV0=
github.com/siyuan-note/dejavu v0.0.0-20220711060744-3fec84096399/go.mod h1:cri+XyZAqmK5fJ98En9aOHB+YkuU8+XQcJdQ31EUhis=
github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 h1:QB9TjJQFhXhZ6dAtPpY02DlzHAQm1C+WqZq6OadG8mI=
github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7AqaKKyEK+WeWFhix/2TDQXgPZDajU00IybU=
@ -448,18 +440,19 @@ github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
@ -520,8 +513,8 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20190823064033-3a9bac650e44/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd h1:9NbNcTg//wfC5JskFW4Z3sqwVnjmJKHxLAol1bW2qgw=
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
golang.org/x/image v0.0.0-20220617043117-41969df76e82 h1:KpZB5pUSBvrHltNEdK/tw0xlPeD13M6M6aGP32gKqiw=
golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@ -585,11 +578,11 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@ -628,14 +621,12 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -669,9 +660,11 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I=
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.0.0-20180302201248-b7ef84aaf62a/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -857,8 +850,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

View file

@ -516,11 +516,11 @@ func UnusedAssets() (ret []string) {
}
}
// 排除文件注解
// 排除文件注解和对应文件
var toRemoves []string
for asset, _ := range assetsPathMap {
if strings.HasSuffix(asset, ".sya") {
toRemoves = append(toRemoves, asset)
toRemoves = append(toRemoves, asset, strings.TrimSuffix(asset, ".sya"))
}
}
for _, toRemove := range toRemoves {

View file

@ -449,7 +449,13 @@ func incReindex(upserts, removes []string) {
if strings.HasPrefix(upsertFile, "/") {
upsertFile = upsertFile[1:]
}
box := upsertFile[:strings.Index(upsertFile, "/")]
idx := strings.Index(upsertFile, "/")
if 0 > idx {
// .sy 直接出现在 data 文件夹下,没有出现在笔记本文件夹下的情况
continue
}
box := upsertFile[:idx]
p := strings.TrimPrefix(upsertFile, box)
tree, err0 := LoadTree(box, p)
if nil != err0 {
@ -1260,6 +1266,8 @@ func formatErrorMsg(err error) string {
msg = Conf.Language(33)
} else if strings.Contains(msg, "Device or resource busy") {
msg = Conf.Language(85)
} else if strings.Contains(msg, "cipher: message authentication failed") {
msg = Conf.Language(172)
}
msg = msg + " v" + util.Ver
return msg