Fixing bugs

Resolve application installation path errors

main.go

@@ -32,6 +32,7 @@ func init() {
 	//gredis.GetRedisConn(config.RedisInfo),
 	service.MyService = service.NewService(sqliteDB, loger2.NewOLoger())
 	service.Cache = cache.Init()
+	route.InitFunction()
 }
 
 // @title casaOS API

model/sys_common.go

@@ -64,4 +64,6 @@ type SystemConfig struct {
 	ConfigStr  string `json:"config_str"`
 	WidgetList string `json:"widget_list"`
 	ConfigPath string `json:"config_path"`
+	SyncPort   string `json:"sync_port"`
+	SyncKey    string `json:"sync_key"`
 }

model/system_app/sync.go

@@ -0,0 +1,8 @@
+package system_app
+
+import "encoding/xml"
+
+type SyncConfig struct {
+	XMLName xml.Name `xml:"configuration"`
+	Key     string   `xml:"gui>apikey"`
+}

pkg/docker/volumes.go

@@ -10,16 +10,20 @@ func GetDir(id, envName string) string {
 	}
 
 	switch {
-	case strings.Contains(strings.ToLower(envName), "config"):
+	case strings.Contains(strings.ToLower(envName), "config") || strings.Contains(strings.ToLower(envName), "photoprism/storage") || strings.Contains(strings.ToLower(envName), "config"):
 		path = "/DATA/AppData/" + id + "/"
 	case strings.Contains(strings.ToLower(envName), "movie"):
 		path = "/DATA/Media/Movies/"
 	case strings.Contains(strings.ToLower(envName), "music"):
 		path = "/DATA/Media/Music/"
+	case strings.Contains(strings.ToLower(envName), "photoprism/originals"):
+		path = "/DATA/Gallery"
 	case strings.Contains(strings.ToLower(envName), "download"):
 		path = "/DATA/Downloads/"
 	case strings.Contains(strings.ToLower(envName), "photo") || strings.Contains(strings.ToLower(envName), "pictures"):
 		path = "/DATA/Downloads/"
+	case strings.ToLower(envName) == "/srv":
+		path = "/DATA/"
 	default:
 		//path = "/media"
 	}

pkg/utils/file/file.go

@@ -146,3 +146,16 @@ func IsNotExistCreateFile(src string) error {
 
 	return nil
 }
+
+func ReadFullFile(path string) []byte {
+	file, err := os.Open(path)
+	if err != nil {
+		return []byte("")
+	}
+	defer file.Close()
+	content, err := ioutil.ReadAll(file)
+	if err != nil {
+		return []byte("")
+	}
+	return content
+}

route/init.go

@@ -0,0 +1,188 @@
+package route
+
+import (
+	"encoding/json"
+	"encoding/xml"
+	"strconv"
+	"time"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/model/system_app"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/docker"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/env_helper"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/port"
+	"github.com/IceWhaleTech/CasaOS/service"
+	model2 "github.com/IceWhaleTech/CasaOS/service/model"
+	uuid "github.com/satori/go.uuid"
+)
+
+func InitFunction() {
+	go checkSystemApp()
+}
+
+var syncIsExistence = false
+
+func installSyncthing(appId string) {
+
+	var appInfo model.ServerAppList
+	m := model.CustomizationPostData{}
+	var dockerImage string
+	var dockerImageVersion string
+
+	appInfo = service.MyService.OAPI().GetServerAppInfo(appId)
+
+	dockerImage = appInfo.Image
+
+	if len(appInfo.ImageVersion) == 0 {
+		dockerImageVersion = "latest"
+	}
+
+	if appInfo.NetworkModel != "host" {
+		for i := 0; i < len(appInfo.Ports); i++ {
+			if p, _ := strconv.Atoi(appInfo.Ports[i].ContainerPort); port.IsPortAvailable(p, appInfo.Ports[i].Protocol) {
+				appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+			} else {
+				if appInfo.Ports[i].Protocol == "tcp" {
+					if p, err := port.GetAvailablePort("tcp"); err == nil {
+						appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				} else if appInfo.Ports[i].Protocol == "upd" {
+					if p, err := port.GetAvailablePort("udp"); err == nil {
+						appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				}
+			}
+
+			if appInfo.Ports[i].Type == 0 {
+				appInfo.PortMap = appInfo.Ports[i].CommendPort
+			}
+		}
+	}
+
+	for i := 0; i < len(appInfo.Devices); i++ {
+		if !file.CheckNotExist(appInfo.Devices[i].ContainerPath) {
+			appInfo.Devices[i].Path = appInfo.Devices[i].ContainerPath
+		}
+	}
+	if len(appInfo.Tip) > 0 {
+		appInfo.Tip = env_helper.ReplaceStringDefaultENV(appInfo.Tip)
+	}
+
+	for i := 0; i < len(appInfo.Volumes); i++ {
+		appInfo.Volumes[i].Path = docker.GetDir("", appInfo.Volumes[i].ContainerPath)
+	}
+	appInfo.MaxMemory = service.MyService.ZiMa().GetMemInfo().Total >> 20
+
+	id := uuid.NewV4().String()
+
+	installLog := model2.AppNotify{}
+
+	// step：下载镜像
+	err := service.MyService.Docker().DockerPullImage(dockerImage+":"+dockerImageVersion, installLog)
+	if err != nil {
+		//pull image error
+		return
+	}
+
+	for !service.MyService.Docker().IsExistImage(dockerImage + ":" + dockerImageVersion) {
+		time.Sleep(time.Second)
+	}
+
+	m.CpuShares = 50
+	m.Envs = appInfo.Envs
+	m.Memory = int64(appInfo.MaxMemory)
+	m.Origin = "system"
+	m.PortMap = appInfo.PortMap
+	m.Ports = appInfo.Ports
+	m.Restart = ""
+	m.Volumes = appInfo.Volumes
+
+	containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, id, m, appInfo.NetworkModel)
+
+	if err != nil {
+		// create container error
+		return
+	}
+
+	//step：start container
+	err = service.MyService.Docker().DockerContainerStart(id)
+	if err != nil {
+		//start container error
+		return
+	}
+
+	portsStr, _ := json.Marshal(appInfo.Ports)
+	envsStr, _ := json.Marshal(appInfo.Envs)
+	volumesStr, _ := json.Marshal(appInfo.Volumes)
+	devicesStr, _ := json.Marshal(appInfo.Devices)
+	//step: 保存数据到数据库
+	md := model2.AppListDBModel{
+		CustomId: id,
+		Title:    appInfo.Title,
+		//ScreenshotLink: appInfo.ScreenshotLink,
+		Slogan:      appInfo.Tagline,
+		Description: appInfo.Description,
+		//Tags:           appInfo.Tags,
+		Icon:        appInfo.Icon,
+		Version:     dockerImageVersion,
+		ContainerId: containerId,
+		Image:       dockerImage,
+		Index:       appInfo.Index,
+		PortMap:     appInfo.PortMap,
+		Label:       appInfo.Title,
+		EnableUPNP:  false,
+		Ports:       string(portsStr),
+		Envs:        string(envsStr),
+		Volumes:     string(volumesStr),
+		Position:    true,
+		NetModel:    appInfo.NetworkModel,
+		Restart:     m.Restart,
+		CpuShares:   50,
+		Memory:      int64(appInfo.MaxMemory),
+		Devices:     string(devicesStr),
+		Origin:      m.Origin,
+		CreatedAt:   strconv.FormatInt(time.Now().Unix(), 10),
+		UpdatedAt:   strconv.FormatInt(time.Now().Unix(), 10),
+	}
+	service.MyService.App().SaveContainer(md)
+
+	checkSystemApp()
+}
+
+// check if the system application is installed
+func checkSystemApp() {
+	list := service.MyService.App().GetSystemAppList()
+	for _, v := range *list {
+		if v.Image == "linuxserver/syncthing" {
+			syncIsExistence = true
+			if config.SystemConfigInfo.SyncPort != v.Port {
+				config.SystemConfigInfo.SyncPort = v.Port
+			}
+			var paths []model.PathMap
+			json.Unmarshal([]byte(v.Volumes), &paths)
+			path := ""
+			for _, i := range paths {
+				if i.ContainerPath == "/config" {
+					path = docker.GetDir(v.CustomId, i.ContainerPath) + "config.xml"
+					for i := 0; i < 10; i++ {
+						if file.CheckNotExist(path) {
+							time.Sleep(1 * time.Second)
+						} else {
+							break
+						}
+					}
+					break
+				}
+			}
+			content := file.ReadFullFile(path)
+			syncConfig := &system_app.SyncConfig{}
+			xml.Unmarshal(content, &syncConfig)
+			config.SystemConfigInfo.SyncKey = syncConfig.Key
+		}
+	}
+	if !syncIsExistence {
+		installSyncthing("44")
+	}
+}

route/route.go

@@ -37,6 +37,7 @@ func InitRouter() *gin.Engine {
 	r.POST("/v1/user/setusernamepwd", v1.Set_Name_Pwd)
 	//get user info
 	r.GET("/v1/user/info", v1.UserInfo)
+
 	v1Group := r.Group("/v1")
 
 	v1Group.Use(jwt2.JWT(swagHandler))
@@ -265,6 +266,7 @@ func InitRouter() *gin.Engine {
 		{
 			v1SearchGroup.GET("/search", v1.GetSearchList)
 		}
+		v1Group.GET("/sync/*url", v1.SyncToSyncthing)
 	}
 	return r
 }

route/v1/docker.go

@@ -1135,6 +1135,10 @@ func ContainerUpdateInfo(c *gin.Context) {
 	var vol model.PathArray
 	json2.Unmarshal([]byte(appInfo.Volumes), &vol)
 
+	for i := 0; i < len(vol); i++ {
+		vol[i].Path = strings.ReplaceAll(vol[i].Path, "$AppID", appId)
+	}
+
 	var dir model.PathArray
 	json2.Unmarshal([]byte(appInfo.Devices), &dir)
 

route/v1/sync.go

@@ -0,0 +1,22 @@
+package v1
+
+import (
+	"net/http/httputil"
+	"net/url"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/gin-gonic/gin"
+)
+
+func SyncToSyncthing(c *gin.Context) {
+	u := c.Param("url")
+	target := "http://127.0.0.1:" + config.SystemConfigInfo.SyncPort
+	remote, err := url.Parse(target)
+	if err != nil {
+		return
+	}
+	proxy := httputil.NewSingleHostReverseProxy(remote)
+	c.Request.Header.Add("X-API-Key", config.SystemConfigInfo.SyncKey)
+	c.Request.URL.Path = u
+	proxy.ServeHTTP(c.Writer, c.Request)
+}

service/app.go

@@ -27,6 +27,7 @@ type AppService interface {
 	UpdateApp(m model2.AppListDBModel)
 	GetSimpleContainerInfo(name string) (types.Container, error)
 	DelAppConfigDir(id, path string)
+	GetSystemAppList() *[]model2.MyAppList
 }
 
 type appStruct struct {
@@ -52,7 +53,7 @@ func (a *appStruct) GetMyList(index, size int, position bool) *[]model2.MyAppLis
 	//获取本地数据库应用
 
 	var lm []model2.AppListDBModel
-	a.db.Table(model2.CONTAINERTABLENAME).Select("title,icon,port_map,`index`,container_id,position,label,slogan").Find(&lm)
+	a.db.Table(model2.CONTAINERTABLENAME).Select("title,icon,port_map,`index`,container_id,position,label,slogan,image").Find(&lm)
 
 	list := []model2.MyAppList{}
 	lMap := make(map[string]interface{})
@@ -65,6 +66,67 @@ func (a *appStruct) GetMyList(index, size int, position bool) *[]model2.MyAppLis
 			lMap[dbModel.ContainerId] = dbModel
 		}
 	}
+	for _, container := range containers {
+
+		if lMap[container.ID] != nil && container.Labels["origin"] != "system" {
+			var m model2.AppListDBModel
+			m = lMap[container.ID].(model2.AppListDBModel)
+			if len(m.Label) == 0 {
+				m.Label = m.Title
+			}
+
+			info, err := cli.ContainerInspect(context.Background(), container.ID)
+			var tm string
+			if err != nil {
+				tm = time.Now().String()
+			} else {
+				tm = info.State.StartedAt
+			}
+			list = append(list, model2.MyAppList{
+				Name:     m.Label,
+				Icon:     m.Icon,
+				State:    container.State,
+				CustomId: strings.ReplaceAll(container.Names[0], "/", ""),
+				Port:     m.PortMap,
+				Index:    m.Index,
+				UpTime:   tm,
+				Image:    m.Image,
+				Slogan:   m.Slogan,
+				//Rely:     m.Rely,
+			})
+		}
+
+	}
+
+	return &list
+
+}
+
+//system application list
+func (a *appStruct) GetSystemAppList() *[]model2.MyAppList {
+	//获取docker应用
+	cli, err := client2.NewClientWithOpts(client2.FromEnv)
+	if err != nil {
+		a.log.Error("初始化client失败", "app.getmylist", "line:36", err)
+	}
+	defer cli.Close()
+	fts := filters.NewArgs()
+	fts.Add("label", "origin=system")
+	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true, Filters: fts})
+	if err != nil {
+		a.log.Error("获取docker容器失败", "app.getmylist", "line:42", err)
+	}
+
+	//获取本地数据库应用
+
+	var lm []model2.AppListDBModel
+	a.db.Table(model2.CONTAINERTABLENAME).Select("title,icon,port_map,`index`,container_id,position,label,slogan,image,volumes").Find(&lm)
+
+	list := []model2.MyAppList{}
+	lMap := make(map[string]interface{})
+	for _, dbModel := range lm {
+		lMap[dbModel.ContainerId] = dbModel
+	}
 	for _, container := range containers {
 
 		if lMap[container.ID] != nil {
@@ -89,7 +151,9 @@ func (a *appStruct) GetMyList(index, size int, position bool) *[]model2.MyAppLis
 				Port:     m.PortMap,
 				Index:    m.Index,
 				UpTime:   tm,
+				Image:    m.Image,
 				Slogan:   m.Slogan,
+				Volumes:  m.Volumes,
 				//Rely:     m.Rely,
 			})
 		}
@@ -168,6 +232,12 @@ func (a *appStruct) RemoveContainerById(id string) {
 	a.db.Table(model2.CONTAINERTABLENAME).Where("custom_id = ?", id).Delete(&model2.AppListDBModel{})
 }
 
+// init install
+func Init() {
+
+}
+
 func NewAppService(db *gorm.DB, logger loger2.OLog) AppService {
+	Init()
 	return &appStruct{db: db, log: logger}
 }

service/docker.go

@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	json2 "encoding/json"
 	"fmt"
+	"reflect"
 	"regexp"
 	"syscall"
 
@@ -332,10 +333,13 @@ func (ds *dockerService) DockerPullImage(imageName string, m model2.AppNotify) e
 			}
 			break
 		}
-		m.Type = types2.NOTIFY_TYPE_INSTALL_LOG
-		m.State = 0
-		m.Message = string(buf[:n])
-		MyService.Notify().UpdateLog(m)
+		if !reflect.DeepEqual(m, model2.AppNotify{}) {
+			m.Type = types2.NOTIFY_TYPE_INSTALL_LOG
+			m.State = 0
+			m.Message = string(buf[:n])
+			MyService.Notify().UpdateLog(m)
+		}
+
 	}
 	return err
 }

service/model/o_container.go

@@ -61,4 +61,6 @@ type MyAppList struct {
 	UpTime   string           `json:"up_time"`
 	Slogan   string           `json:"slogan"`
 	Rely     model.MapStrings `json:"rely"` //[{"mysql":"id"},{"mysql":"id"}]
+	Image    string           `json:"image"`
+	Volumes  string           `json:"volumes"`
 }

service/service.go

@@ -30,6 +30,7 @@ type Repository interface {
 }
 
 func NewService(db *gorm.DB, log loger2.OLog) Repository {
+
 	return &store{
 		app:    NewAppService(db, log),
 		ddns:   NewDDNSService(db, log),

service/system.go

@@ -39,7 +39,6 @@ func (s *systemService) UpSystemConfig(str string, widget string) {
 	}
 	config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
 }
-
 func (s *systemService) GetCasaOSLogs(lineNumber int) string {
 	file, err := os.Open(s.log.Path())
 	if err != nil {

web/favicon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#363636;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:2;}
+	@media ( prefers-color-scheme: dark ) {
+		.st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:2;}
+	}
+</style>
+<path class="st0" d="M12,22c5.5,0,10-4.5,10-10S17.5,2,12,2S2,6.5,2,12S6.5,22,12,22z"/>
+<path class="st0" d="M12,22c3.9,0,7-3.1,7-7s-3.1-7-7-7s-7,3.1-7,7S8.1,22,12,22z"/>
+<path class="st0" d="M12,22c2.2,0,4-1.8,4-4s-1.8-4-4-4s-4,1.8-4,4S9.8,22,12,22z"/>
+</svg>

web/index.html

@@ -11,18 +11,14 @@
     }
   </script>
   <link rel="apple-touch-icon" sizes="180x180" href="/ui/img/icon/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/ui/img/icon/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/ui/img/icon/favicon-16x16.png">
   <link rel="manifest" href="/ui/site.webmanifest">
-  <link rel="mask-icon" href="/ui/img/icon/safari-pinned-tab.svg" color="#5bbad5">
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="theme-color" content="#ffffff">
-  <link rel="icon" href="/ui/favicon.ico">
+  <link rel="icon" href="/ui/favicon.svg" type="image/svg+xml">
   <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/@mdi/font@6.2.95/css/materialdesignicons.min.css">
   <title>
     CasaOS
   </title>
-
 <link href="/ui/js/0.js" rel="prefetch"><link href="/ui/js/1.js" rel="prefetch"><link href="/ui/js/2.js" rel="prefetch"><link href="/ui/js/3.js" rel="prefetch"><link href="/ui/js/4.js" rel="prefetch"><link href="/ui/js/app.js" rel="preload" as="script"><link href="/ui/js/chunk-vendors.js" rel="preload" as="script"></head>
 
 <body>

web/static.go

@@ -2,5 +2,5 @@ package web
 
 import "embed"
 
-//go:embed index.html favicon.ico img js browserconfig.xml site.webmanifest
+//go:embed index.html favicon.svg img js browserconfig.xml site.webmanifest
 var Static embed.FS