Skip to content

Commit

Permalink
feat(init): add support for international language pack initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
ssongliu committed Dec 10, 2024
1 parent 88b70eb commit d86ae24
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 0 deletions.
1 change: 1 addition & 0 deletions backend/app/service/snapshot_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func snapPanel(snap snapHelper, targetDir string) {
if err := common.CopyFile("/usr/local/bin/1pctl", targetDir); err != nil {
status = err.Error()
}
_, _ = cmd.Execf("cp -r /usr/local/bin/lang %s", targetDir)

if err := common.CopyFile("/etc/systemd/system/1panel.service", targetDir); err != nil {
status = err.Error()
Expand Down
1 change: 1 addition & 0 deletions backend/app/service/snapshot_recover.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func (u *SnapshotService) HandleSnapshotRecover(snap model.Snapshot, isRecover b
updateRecoverStatus(snap.ID, isRecover, "1PctlBinary", constant.StatusFailed, err.Error())
return
}
_, _ = cmd.Execf("cp -r %s %s", path.Join(snapFileDir, "1panel/lang"), "/usr/local/bin/")
global.LOG.Debug("recover 1pctl from snapshot file successful!")
req.IsNew = true
}
Expand Down
4 changes: 4 additions & 0 deletions backend/app/service/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
u.handleRollback(originalDir, 2)
return
}
_, _ = cmd.Execf("cp -r %s /usr/local/bin", path.Join(tmpDir, "lang"))
if _, err := cmd.Execf("sed -i -e 's#BASE_DIR=.*#BASE_DIR=%s#g' /usr/local/bin/1pctl", global.CONF.System.BaseDir); err != nil {
global.LOG.Errorf("upgrade basedir in 1pctl failed, err: %v", err)
u.handleRollback(originalDir, 2)
Expand Down Expand Up @@ -175,6 +176,7 @@ func (u *UpgradeService) handleBackup(fileOp files.FileOp, originalDir string) e
if err := fileOp.Copy("/etc/systemd/system/1panel.service", originalDir); err != nil {
return err
}
_, _ = cmd.Execf("cp -r /usr/local/bin/lang %s", originalDir)
checkPointOfWal()
if err := handleTar(path.Join(global.CONF.System.BaseDir, "1panel/db"), originalDir, "db.tar.gz", "db/1Panel.db-*", ""); err != nil {
return err
Expand Down Expand Up @@ -205,6 +207,8 @@ func (u *UpgradeService) handleRollback(originalDir string, errStep int) {
if err := common.CopyFile(path.Join(originalDir, "1pctl"), "/usr/local/bin"); err != nil {
global.LOG.Errorf("rollback 1panel failed, err: %v", err)
}
_, _ = cmd.Execf("cp -r %s /usr/local/bin", path.Join(originalDir, "lang"))

if errStep == 2 {
return
}
Expand Down
74 changes: 74 additions & 0 deletions backend/init/hook/hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package hook
import (
"encoding/base64"
"encoding/json"
"fmt"
"os"
"path"
"sort"
"strings"

"github.com/1Panel-dev/1Panel/backend/app/dto"
Expand All @@ -15,6 +17,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/utils/cmd"
"github.com/1Panel-dev/1Panel/backend/utils/common"
"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
"github.com/1Panel-dev/1Panel/backend/utils/files"
"github.com/1Panel-dev/1Panel/backend/utils/xpack"
)

Expand Down Expand Up @@ -85,6 +88,8 @@ func Init() {
handleSnapStatus()
loadLocalDir()
initDir()

go initLang()
}

func handleSnapStatus() {
Expand Down Expand Up @@ -260,3 +265,72 @@ func handleCronJobAlert(cronjob *model.Cronjob) {
return
}
}

func initLang() {
fileOp := files.NewFileOp()
upgradePath := path.Join(global.CONF.System.BaseDir, "1panel/tmp/upgrade")
if fileOp.Stat("/usr/local/bin/lang/zh.sh") {
return
}
tmpPath, err := loadRestorePath(upgradePath)
files, _ := os.ReadDir(path.Join(upgradePath, tmpPath, "downloads"))
if len(files) == 0 {
tmpPath = "no such file"
} else {
for _, item := range files {
if item.IsDir() && strings.HasPrefix(item.Name(), "1panel-") {
tmpPath = path.Join(upgradePath, tmpPath, "downloads", item.Name(), "lang")
break
}
}
}

if err != nil || tmpPath == "no such file" || !fileOp.Stat(tmpPath) {
path := fmt.Sprintf("%s/language/lang.tar.gz", global.CONF.System.RepoUrl)
if err := fileOp.DownloadFileWithProxy(path, "/usr/local/bin/lang.tar.gz"); err != nil {
global.LOG.Errorf("download lang.tar.gz failed, err: %v", err)
return
}
if !fileOp.Stat("/usr/local/bin/lang.tar.gz") {
global.LOG.Errorf("download lang.tar.gz failed, no such file, err: %v", err)
return
}
std, err := cmd.Execf("tar zxvfC %s %s", "/usr/local/bin/lang.tar.gz", "/usr/local/bin/")
if err != nil {
fmt.Printf("decompress lang.tar.gz failed, std: %s, err: %v", std, err)
return
}
_ = os.Remove("/usr/local/bin/lang.tar.gz")
global.LOG.Info("init lang for 1pctl successful")
return
}
std, err := cmd.Execf("cp -r %s %s", tmpPath, "/usr/local/bin/")
if err != nil {
fmt.Printf("load lang from package failed, std: %s, err: %v", std, err)
return
}
global.LOG.Info("init lang for 1pctl successful")
}

func loadRestorePath(upgradeDir string) (string, error) {
if _, err := os.Stat(upgradeDir); err != nil && os.IsNotExist(err) {
return "no such file", nil
}
files, err := os.ReadDir(upgradeDir)
if err != nil {
return "", err
}
var folders []string
for _, file := range files {
if file.IsDir() {
folders = append(folders, file.Name())
}
}
if len(folders) == 0 {
return "no such file", nil
}
sort.Slice(folders, func(i, j int) bool {
return folders[i] > folders[j]
})
return folders[0], nil
}

0 comments on commit d86ae24

Please sign in to comment.