feat(setting): add site version information (#859)

* feat(setting): add site version information

* feat(conf): update conf.WebVersion to rolling

* fix(static): update condition to check conf.Version instead of conf.WebVersion

* fix(build.sh): use rolling release for web frontend in dev and beta builds

* chore(build.sh): update GitAuthor to The OpenList Projects Contributors

* fix(static): update condition to check conf.WebVersion

.github/workflows/beta_release.yml

@@ -105,10 +105,10 @@ jobs:
           musl-base-url: "https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
           x-flags: |
             github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList
+            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
             github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
             github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev
+            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
 
       - name: Compress
         run: |

.github/workflows/build.yml

@@ -49,10 +49,10 @@ jobs:
           out-dir: build
           x-flags: |
             github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at
-            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList
+            github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>
             github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit
             github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag
-            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev
+            github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=rolling
           output: openlist$ext
 
       - name: Upload artifact

build.sh

@@ -17,10 +17,10 @@ fi
 
 if [ "$1" = "dev" ]; then
   version="dev"
-  webVersion="dev"
+  webVersion="rolling"
 elif [ "$1" = "beta" ]; then
   version="beta"
-  webVersion="dev"
+  webVersion="rolling"
 else
   git tag -d beta || true
   # Always true if there's no tag
@@ -45,26 +45,17 @@ ldflags="\
 -X 'github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=$webVersion' \
 "
 
-FetchWebDev() {
-  pre_release_tag=$(eval "curl -fsSL --max-time 2 $githubAuthArgs https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases" | jq -r 'map(select(.prerelease)) | first | .tag_name')
-  if [ -z "$pre_release_tag" ] || [ "$pre_release_tag" == "null" ]; then
-    # fall back to latest release
-    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
-  else
-    pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/$pre_release_tag\"")
-  fi
+FetchWebRolling() {
+  pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/rolling\"")
   pre_release_assets=$(echo "$pre_release_json" | jq -r '.assets[].browser_download_url')
   
-  if [ "$useLite" = true ]; then
-    pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist-lite" | grep "\.tar\.gz$")
-  else
+  # There is no lite for rolling
   pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep -v "lite" | grep "\.tar\.gz$")
-  fi
 
-  curl -fsSL "$pre_release_tar_url" -o web-dist-dev.tar.gz
+  curl -fsSL "$pre_release_tar_url" -o dist.tar.gz
   rm -rf public/dist && mkdir -p public/dist
-  tar -zxvf web-dist-dev.tar.gz -C public/dist
-  rm -rf web-dist-dev.tar.gz
+  tar -zxvf dist.tar.gz -C public/dist
+  rm -rf dist.tar.gz
 }
 
 FetchWebRelease() {
@@ -590,7 +581,7 @@ for arg in "$@"; do
 done
 
 if [ "$buildType" = "dev" ]; then
-  FetchWebDev
+  FetchWebRolling
   if [ "$dockerType" = "docker" ]; then
     BuildDocker
   elif [ "$dockerType" = "docker-multiplatform" ]; then
@@ -602,7 +593,7 @@ if [ "$buildType" = "dev" ]; then
   fi
 elif [ "$buildType" = "release" -o "$buildType" = "beta" ]; then
   if [ "$buildType" = "beta" ]; then
-    FetchWebDev
+    FetchWebRolling
   else
     FetchWebRelease
   fi

internal/bootstrap/data/setting.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"fmt"
 	"sort"
 	"strconv"
 
@@ -92,9 +93,10 @@ func InitialSettings() []model.SettingItem {
 	} else {
 		token = random.Token()
 	}
+	siteVersion := fmt.Sprintf("%s (Commit: %s) - Frontend: %s - Build at: %s", conf.Version, conf.GitCommit, conf.WebVersion, conf.BuiltAt)
 	initialSettingItems := []model.SettingItem{
 		// site settings
-		{Key: conf.VERSION, Value: conf.Version, Type: conf.TypeString, Group: model.SITE, Flag: model.READONLY},
+		{Key: conf.VERSION, Value: siteVersion, Type: conf.TypeString, Group: model.SITE, Flag: model.READONLY},
 		//{Key: conf.ApiUrl, Value: "", Type: conf.TypeString, Group: model.SITE},
 		//{Key: conf.BasePath, Value: "", Type: conf.TypeString, Group: model.SITE},
 		{Key: conf.SiteTitle, Value: "OpenList", Type: conf.TypeString, Group: model.SITE},

internal/conf/var.go

@@ -6,11 +6,11 @@ import (
 )
 
 var (
-	BuiltAt    string
-	GitAuthor  string
-	GitCommit  string
+	BuiltAt    string = "unknown"
+	GitAuthor  string = "unknown"
+	GitCommit  string = "unknown"
 	Version    string = "dev"
-	WebVersion string
+	WebVersion string = "rolling"
 )
 
 var (

server/static/static.go

@@ -43,9 +43,9 @@ func replaceStrings(content string, replacements map[string]string) string {
 
 func initIndex(siteConfig SiteConfig) {
 	utils.Log.Debug("Initializing index.html...")
-	// dist_dir is empty and cdn is not empty add web_version is empty or beta or dev
-	if conf.Conf.DistDir == "" && conf.Conf.Cdn != "" && (conf.WebVersion == "" || conf.WebVersion == "beta" || conf.WebVersion == "dev") {
-		utils.Log.Infof("Fetching index.html from CDN: %s/index.html...", conf.Conf.Cdn)
+	// dist_dir is empty and cdn is not empty, and web_version is empty or beta or dev or rolling
+	if conf.Conf.DistDir == "" && conf.Conf.Cdn != "" && (conf.WebVersion == "" || conf.WebVersion == "beta" || conf.WebVersion == "dev" || conf.WebVersion == "rolling") {
+		utils.Log.Infof("Fetching index.html from CDN: %s/index.html...", siteConfig.Cdn)
 		resp, err := base.RestyClient.R().
 			SetHeader("Accept", "text/html").
 			Get(fmt.Sprintf("%s/index.html", siteConfig.Cdn))