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

2026-01-18 14:35:27 +01:00 · 2025-12-25 22:41:51 +08:00 · 2025-12-25 22:41:51 +08:00 · cfd25e85b6
commit cfd25e85b6
parent 2a418613fb 5db1723bfc
10 changed files with 143 additions and 43 deletions
--- a/README.md
+++ b/README.md
@ -319,19 +319,19 @@ Publish parameters: --accessAuthCode=******(Access authorization code)
 <details>
 <summary>TrueNAS Deployment</summary>

-Note: First run below commands in the TrueNAS Shell. please update Pool_1/Apps_Data/siyuan to match your dataset for Apps
+Note: First run below commands in the TrueNAS Shell. please update `Pool_1/Apps_Data/siyuan to match your dataset for Apps.

-`zfs create Pool_1/Apps_Data/siyuan`
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```

-`chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan`
-
-`chmod 755 /mnt/Pool_1/Apps_Data/siyuan`
-
-Navigate to Apps --> DiscoverApps --> More Options(on top right, besies Custom App) --> Install via YAML
+Navigate to Apps - DiscoverApps - More Options(on top right, besies Custom App) - Install via YAML

 Template reference:

-```
+```yaml
 services:
  siyuan:
    image: b3log/siyuan
--- a/README_ja_JP.md
+++ b/README_ja_JP.md
@ -43,6 +43,7 @@
  * [パッケージマネージャー](#パッケージマネージャー)
  * [Docker ホスティング](#docker-ホスティング)
  * [Unraid ホスティング](#unraid-ホスティング)
+  * [TrueNas ホスティング](#truenas-ホスティング)
  * [インサイダープレビュー](#インサイダープレビュー)
 * [🏘️ コミュニティ](#️-コミュニティ)
 * [🛠️ 開発ガイド](#️-開発ガイド)
@ -312,6 +313,42 @@ Publish parameters: --accessAuthCode=******（アクセス認証コード）

 </details>

+### TrueNas ホスティング
+
+<details>
+<summary>TrueNasデプロイメント</summary>
+
+注意：まず TrueNAS Shell で以下のコマンドを実行してください。`Pool_1/Apps_Data/siyuan` をアプリ用のデータセットパスに合わせて更新してください。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+Apps - DiscoverApps - More Options（右上、Custom App を除く）- YAML でインストール に移動してください
+
+テンプレート例：
+
+```yaml
+services:
+  siyuan:
+    image: b3log/siyuan
+    container_name: siyuan
+    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+    ports:
+      - 6806:6806
+    volumes:
+      - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace  # Adjust to your dataset path 
+    restart: unless-stopped
+    environment:
+      - TZ=America/Los_Angeles  # Replace with your timezone if needed
+      - PUID=1001
+      - PGID=1002
+```
+
+</details>
+
 ### インサイダープレビュー

 主要な更新前にインサイダープレビューをリリースします。詳細は[https://github.com/siyuan-note/insider](https://github.com/siyuan-note/insider)をご覧ください。
--- a/README_tr_TR.md
+++ b/README_tr_TR.md
@ -43,6 +43,7 @@
  * [Paket Yöneticisi](#paket-yöneticisi)
  * [Docker Barındırma](#docker-barındırma)
  * [Unraid Barındırma](#unraid-barındırma)
+  * [TrueNAS Barındırma](#truenas-barındırma)
  * [Erken Önizleme (Insider Preview)](#erken-önizleme-insider-preview)
 * [🏘️ Topluluk](#️-topluluk)
 * [🛠️ Geliştirme Rehberi](#️-geliştirme-rehberi)
@ -313,6 +314,42 @@ Publish parameters: --accessAuthCode=******(Access authorization code)

 </details>

+### TrueNAS Barındırma
+
+<details>
+<summary>TrueNAS Dağıtım Dokümanı</summary>
+
+Not: Önce TrueNAS Shell'te aşağıdaki komutları çalıştırın. Lütfen `Pool_1/Apps_Data/siyuan` yolunu uygulamanızın dataset'ine göre güncelleyin。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+Apps --> DiscoverApps --> More Options (sağ üst, Custom App hariç) --> YAML ile Yükle bölümüne gidin
+
+Şablon örneği：
+
+```yaml
+services:
+  siyuan:
+    image: b3log/siyuan
+    container_name: siyuan
+    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+    ports:
+      - 6806:6806
+    volumes:
+      - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace  # Adjust to your dataset path 
+    restart: unless-stopped
+    environment:
+      - TZ=America/Los_Angeles  # Replace with your timezone if needed
+      - PUID=1001
+      - PGID=1002
+```
+
+</details>
+
 ### Erken Önizleme (Insider Preview)

 Büyük güncellemelerden önce erken erişim (Insider Preview) sürümlerini yayınlıyoruz. Lütfen [https://github.com/siyuan-note/insider](https://github.com/siyuan-note/insider) adresini ziyaret edin.
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@ -43,9 +43,10 @@
  * [包管理器](#包管理器)
  * [Docker 部署](#docker-部署)
  * [Unraid 部署](#unraid-部署)
-  * [宝塔面板 部署](#宝塔面板部署)
-  * [小皮面板 部署](#小皮面板部署)
-  * [1Panel面板 部署](#1Panel面板部署)
+  * [TrueNAS 部署](#trueNAS-部署)
+  * [宝塔面板部署](#宝塔面板部署)
+  * [小皮面板部署](#小皮面板部署)
+  * [1Panel 面板部署](#1Panel-面板部署)
  * [内部预览版](#内部预览版)
 * [🏘️ 社区](#️-社区)
 * [🛠️ 开发指南](#️-开发指南)
@ -318,6 +319,42 @@ Publish parameters: --accessAuthCode=******（访问授权码）

 </details>

+### TrueNAS 部署
+
+<details>
+<summary>TrueNAS 部署文档</summary>
+
+注意：首先在 TrueNAS Shell 中运行下面的命令。请将 `Pool_1/Apps_Data/siyuan` 更新为与你的应用数据集对应的路径。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+进入 Apps - DiscoverApps - More Options（右上，除 Custom App 外）- 通过 YAML 安装
+
+模板参考：
+
+```yaml
+services:
+  siyuan:
+    image: b3log/siyuan
+    container_name: siyuan
+    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+    ports:
+      - 6806:6806
+    volumes:
+      - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace  # Adjust to your dataset path 
+    restart: unless-stopped
+    environment:
+      - TZ=America/Los_Angeles  # Replace with your timezone if needed
+      - PUID=1001
+      - PGID=1002
+```
+
+</details>
+
 ### 宝塔面板部署

 <details>
@ -373,7 +410,7 @@ Publish parameters: --accessAuthCode=******（访问授权码）

 </details>

-### 1Panel面板部署
+### 1Panel 面板部署

 <details>
 <summary>1Panel面板 部署文档</summary>
--- a/kernel/bazaar/icon.go
+++ b/kernel/bazaar/icon.go
@ -85,10 +85,7 @@ func Icons() (icons []*Icon) {
 			return
 		}

-		if disallowDisplayBazaarPackage(icon.Package) {
-			return
-		}
-
+		icon.DisallowInstall = disallowInstallBazaarPackage(icon.Package)
 		icon.URL = strings.TrimSuffix(icon.URL, "/")
 		repoURLHash := strings.Split(repoURL, "@")
 		icon.RepoURL = "https://github.com/" + repoURLHash[0]
--- a/kernel/bazaar/package.go
+++ b/kernel/bazaar/package.go
@ -130,19 +130,20 @@ type Package struct {
 	PreviewURLThumb string `json:"previewURLThumb"`
 	IconURL         string `json:"iconURL"`

-	Installed    bool   `json:"installed"`
-	Outdated     bool   `json:"outdated"`
-	Current      bool   `json:"current"`
-	Updated      string `json:"updated"`
-	Stars        int    `json:"stars"`
-	OpenIssues   int    `json:"openIssues"`
-	Size         int64  `json:"size"`
-	HSize        string `json:"hSize"`
-	InstallSize  int64  `json:"installSize"`
-	HInstallSize string `json:"hInstallSize"`
-	HInstallDate string `json:"hInstallDate"`
-	HUpdated     string `json:"hUpdated"`
-	Downloads    int    `json:"downloads"`
+	Installed       bool   `json:"installed"`
+	Outdated        bool   `json:"outdated"`
+	Current         bool   `json:"current"`
+	Updated         string `json:"updated"`
+	Stars           int    `json:"stars"`
+	OpenIssues      int    `json:"openIssues"`
+	Size            int64  `json:"size"`
+	HSize           string `json:"hSize"`
+	InstallSize     int64  `json:"installSize"`
+	HInstallSize    string `json:"hInstallSize"`
+	HInstallDate    string `json:"hInstallDate"`
+	HUpdated        string `json:"hUpdated"`
+	Downloads       int    `json:"downloads"`
+	DisallowInstall bool   `json:"disallowInstall"`

 	Incompatible bool `json:"incompatible"`
 }
@ -990,7 +991,7 @@ func getBazaarIndex() map[string]*bazaarPackage {
 // Add marketplace package config item `minAppVersion` https://github.com/siyuan-note/siyuan/issues/8330
 const defaultMinAppVersion = "2.9.0"

-func disallowDisplayBazaarPackage(pkg *Package) bool {
+func disallowInstallBazaarPackage(pkg *Package) bool {
 	if "" == pkg.MinAppVersion {
 		pkg.MinAppVersion = defaultMinAppVersion
 	}
--- a/kernel/bazaar/plugin.go
+++ b/kernel/bazaar/plugin.go
@ -87,10 +87,7 @@ func Plugins(frontend string) (plugins []*Plugin) {
 			return
 		}

-		if disallowDisplayBazaarPackage(plugin.Package) {
-			return
-		}
-
+		plugin.DisallowInstall = disallowInstallBazaarPackage(plugin.Package)
 		plugin.Incompatible = isIncompatiblePlugin(plugin, frontend)

 		plugin.URL = strings.TrimSuffix(plugin.URL, "/")
--- a/kernel/bazaar/template.go
+++ b/kernel/bazaar/template.go
@ -86,9 +86,7 @@ func Templates() (templates []*Template) {
 			return
 		}

-		if disallowDisplayBazaarPackage(template.Package) {
-			return
-		}
+		template.DisallowInstall = disallowInstallBazaarPackage(template.Package)

 		template.URL = strings.TrimSuffix(template.URL, "/")
 		repoURLHash := strings.Split(repoURL, "@")
--- a/kernel/bazaar/theme.go
+++ b/kernel/bazaar/theme.go
@ -87,9 +87,7 @@ func Themes() (ret []*Theme) {
 			return
 		}

-		if disallowDisplayBazaarPackage(theme.Package) {
-			return
-		}
+		theme.DisallowInstall = disallowInstallBazaarPackage(theme.Package)

 		theme.URL = strings.TrimSuffix(theme.URL, "/")
 		repoURLHash := strings.Split(repoURL, "@")
--- a/kernel/bazaar/widget.go
+++ b/kernel/bazaar/widget.go
@ -85,9 +85,7 @@ func Widgets() (widgets []*Widget) {
 			return
 		}

-		if disallowDisplayBazaarPackage(widget.Package) {
-			return
-		}
+		widget.DisallowInstall = disallowInstallBazaarPackage(widget.Package)

 		widget.URL = strings.TrimSuffix(widget.URL, "/")
 		repoURLHash := strings.Split(repoURL, "@")