Merge pull request #1 from IceWhaleTech/v0.2.1

add widget

.gitignore

@@ -30,4 +30,3 @@ gen
 /db/
 /docs/
 /conf/conf.ini
-__debug_bin

pkg/utils/oasis_err/e.go

@@ -10,9 +10,7 @@ const (
 	PWD_INVALID = 10001
 
 	//system
-	DIR_ALREADY_EXISTS  = 20001
+	DIR_ALREADY_EXISTS = 20001
-	FILE_ALREADY_EXISTS = 20002
-	FILE_OR_DIR_EXISTS  = 20003
 
 	//zerotier
 	GET_TOKEN_ERROR = 30001
@@ -40,9 +38,8 @@ var MsgFlags = map[int]string{
 	PWD_INVALID: "Password invalid",
 
 	//system
-	DIR_ALREADY_EXISTS:  "Directory already exists",
+	DIR_ALREADY_EXISTS: "Directory already exists",
-	FILE_ALREADY_EXISTS: "File already exists",
+
-	FILE_OR_DIR_EXISTS:  "File or directory already exists",
 
 	//zerotier
 	GET_TOKEN_ERROR: "Get token error,Please log in to zerotier's official website to confirm whether the account is available",

service/zima_info.go

@@ -86,12 +86,7 @@ func (c *zima) GetDirPath(path string) []model.Path {
 
 	if strings.Count(path, "/") > 1 {
 		for _, l := range ls {
-			pathTemp := path + l.Name()
+			dirs = append(dirs, model.Path{Name: l.Name(), Path: path + l.Name() + "/", IsDir: l.IsDir()})
-			if l.IsDir() {
-				pathTemp += "/"
-			}
-
-			dirs = append(dirs, model.Path{Name: l.Name(), Path: pathTemp, IsDir: l.IsDir()})
 		}
 	} else {
 		dirs = append(dirs, model.Path{Name: "DATA", Path: "/DATA/", IsDir: true})
@@ -136,8 +131,6 @@ func (c *zima) MkdirAll(path string) (int, error) {
 		if os.IsNotExist(err) {
 			os.MkdirAll(path, os.ModePerm)
 			return oasis_err.SUCCESS, nil
-		} else if strings.Contains(err.Error(), ": not a directory") {
-			return oasis_err.FILE_OR_DIR_EXISTS, err
 		}
 	}
 	return oasis_err.ERROR, err
@@ -147,7 +140,7 @@ func (c *zima) MkdirAll(path string) (int, error) {
 func (c *zima) CreateFile(path string) (int, error) {
 	_, err := os.Stat(path)
 	if err == nil {
-		return oasis_err.FILE_OR_DIR_EXISTS, nil
+		return oasis_err.DIR_ALREADY_EXISTS, nil
 	} else {
 		if os.IsNotExist(err) {
 			file.CreateFile(path)

types/system.go

@@ -1,4 +1,10 @@
 package types
 
-const CURRENTVERSION = "0.1.6"
+const CURRENTVERSION = "0.1.5"
-const BODY = "<li>Add a file selector for app install.</li> <li>Fixed an issue with the app were it would disappear when the app was modified.</li>"
+const BODY = `
+<li>Add CPU RAM Status with widget</li> 
+<li>Add Disk Info with widget</li>
+<li>Enhance the Docker cli import experience and automatically fill in the folders that need to be mounted</li>
+<li>Realize automatic loading of widgets</li>
+<li>Fix display bugs when windows size less than 1024px</li>
+`