beenull/CasaOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update create file and dir api

Browse source
This commit is contained in:
link 2021-10-18 18:24:18 +08:00
parent fb15695dab
commit 8a28d3c589
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

2
UI

@ -1 +1 @@
Subproject commit f2a5429db57171af5f1e47df7042a6181a4b25d7 Subproject commit 0a78d55a82dbeb10e617189358f8747629045377

BIN
__debug_bin
View file

Binary file not shown.

9
pkg/utils/oasis_err/e.go
View file

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

11
service/zima_info.go
View file

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

10
types/system.go
View file

@ -1,10 +1,4 @@
package types package types
const CURRENTVERSION = "0.1.5" const CURRENTVERSION = "0.1.6"
const BODY = ` 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>"
<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>
`