diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 2715b52f9..5351bb15c 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -96,6 +96,7 @@ "releaseDate": "Release Date", "pkgSize": "Package size", "installSize": "Install Size", + "installDate": "Install Date", "optimizeTypography": "Optimize typography", "dragPosition": "Drag image to reposition", "exportPDF0": "Page Size", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index d6f703766..2de0a1e0d 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -96,6 +96,7 @@ "releaseDate": "Fecha de lanzamiento", "pkgSize": "Tamaño del paquete", "installSize": "Tamaño de instalación", + "installDate": "Fecha de instalación", "optimizeTypography": "Insertar un espacio entre el chino y el occidental", "dragPosition": "Arrastrar imagen para reposicionarla", "exportPDF0": "Tamaño de la página", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 483270a34..4341373d5 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -96,6 +96,7 @@ "releaseDate": "Date de sortie", "pkgSize": "Taille du package", "installSize": "Taille d'installation", + "installDate": "Date d'installation", "optimizeTypography": "Optimiser la typographie", "dragPosition": "Faites glisser l'image pour la repositionner", "exportPDF0": "Taille de la page", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 10865b6da..77dd74c44 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -96,6 +96,7 @@ "releaseDate": "發布日期", "pkgSize": "包大小", "installSize": "安裝大小", + "installDate": "安裝日期", "optimizeTypography": "優化排版", "dragPosition": "拖動圖像重新定位", "exportPDF0": "頁面大小", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 31a8ad3c7..5072ac245 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -96,6 +96,7 @@ "releaseDate": "发布日期", "pkgSize": "包大小", "installSize": "安装大小", + "installDate": "安装日期", "optimizeTypography": "优化排版", "dragPosition": "上下拖动图片以调整位置", "exportPDF0": "页面大小", diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index c844344ba..efd9336d8 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -264,7 +264,7 @@ export const bazaar = {
${window.siyuan.languages.currentVer}
v${data.version}
-
${window.siyuan.languages.releaseDate}
${data.hUpdated}
+
${isDownloaded ? window.siyuan.languages.installDate : window.siyuan.languages.releaseDate}
${isDownloaded ? data.hInstallDate : data.hUpdated}
${isDownloaded ? window.siyuan.languages.installSize : window.siyuan.languages.pkgSize}
${isDownloaded ? data.hInstallSize : data.hSize}
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index afeb9238b..75a4fda70 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -496,5 +496,6 @@ declare interface IBazaarItem { modes: string[] hSize: string hInstallSize: string + hInstallDate: string hUpdated: string } diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index e0ce0f1c4..6f7adb7b0 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -135,8 +135,12 @@ func InstalledIcons() (ret []*Icon) { icon.RepoURL = icon.URL icon.PreviewURL = "/appearance/icons/" + dirName + "/preview.png" icon.PreviewURLThumb = "/appearance/icons/" + dirName + "/preview.png" - icon.Updated = iconDir.ModTime().Format("2006-01-02 15:04:05") - icon.HUpdated = formatUpdated(icon.Updated) + info, statErr := os.Stat(filepath.Join(installPath, "README.md")) + if nil != statErr { + logging.LogWarnf("stat install theme README.md failed: %s", statErr) + continue + } + icon.HInstallDate = info.ModTime().Format("2006-01-02") installSize, _ := util.SizeOfDirectory(installPath) icon.InstallSize = installSize icon.HInstallSize = humanize.Bytes(uint64(installSize)) diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index 27fcf52a0..aac7d3316 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -60,6 +60,7 @@ type Package struct { HSize string `json:"hSize"` InstallSize int64 `json:"installSize"` HInstallSize string `json:"hInstallSize"` + HInstallDate string `json:"hInstallDate"` HUpdated string `json:"hUpdated"` Downloads int `json:"downloads"` } diff --git a/kernel/bazaar/template.go b/kernel/bazaar/template.go index 6fd9185a7..3e9875452 100644 --- a/kernel/bazaar/template.go +++ b/kernel/bazaar/template.go @@ -135,8 +135,12 @@ func InstalledTemplates() (ret []*Template) { template.RepoURL = template.URL template.PreviewURL = "/templates/" + dirName + "/preview.png" template.PreviewURLThumb = "/templates/" + dirName + "/preview.png" - template.Updated = templateDir.ModTime().Format("2006-01-02 15:04:05") - template.HUpdated = formatUpdated(template.Updated) + info, statErr := os.Stat(filepath.Join(installPath, "README.md")) + if nil != statErr { + logging.LogWarnf("stat install theme README.md failed: %s", statErr) + continue + } + template.HInstallDate = info.ModTime().Format("2006-01-02") installSize, _ := util.SizeOfDirectory(installPath) template.InstallSize = installSize template.HInstallSize = humanize.Bytes(uint64(installSize)) diff --git a/kernel/bazaar/theme.go b/kernel/bazaar/theme.go index be03908d9..25329ed0d 100644 --- a/kernel/bazaar/theme.go +++ b/kernel/bazaar/theme.go @@ -138,8 +138,12 @@ func InstalledThemes() (ret []*Theme) { theme.RepoURL = theme.URL theme.PreviewURL = "/appearance/themes/" + dirName + "/preview.png" theme.PreviewURLThumb = "/appearance/themes/" + dirName + "/preview.png" - theme.Updated = themeDir.ModTime().Format("2006-01-02 15:04:05") - theme.HUpdated = formatUpdated(theme.Updated) + info, statErr := os.Stat(filepath.Join(installPath, "README.md")) + if nil != statErr { + logging.LogWarnf("stat install theme README.md failed: %s", statErr) + continue + } + theme.HInstallDate = info.ModTime().Format("2006-01-02") installSize, _ := util.SizeOfDirectory(installPath) theme.InstallSize = installSize theme.HInstallSize = humanize.Bytes(uint64(installSize)) diff --git a/kernel/bazaar/widget.go b/kernel/bazaar/widget.go index 2b176acc8..6904e8e03 100644 --- a/kernel/bazaar/widget.go +++ b/kernel/bazaar/widget.go @@ -133,8 +133,12 @@ func InstalledWidgets() (ret []*Widget) { widget.RepoURL = widget.URL widget.PreviewURL = "/widgets/" + dirName + "/preview.png" widget.PreviewURLThumb = "/widgets/" + dirName + "/preview.png" - widget.Updated = widgetDir.ModTime().Format("2006-01-02 15:04:05") - widget.HUpdated = formatUpdated(widget.Updated) + info, statErr := os.Stat(filepath.Join(installPath, "README.md")) + if nil != statErr { + logging.LogWarnf("stat install theme README.md failed: %s", statErr) + continue + } + widget.HInstallDate = info.ModTime().Format("2006-01-02") installSize, _ := util.SizeOfDirectory(installPath) widget.InstallSize = installSize widget.HInstallSize = humanize.Bytes(uint64(installSize))