Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* initial completion of the sharing function

* Adjusting multi-partition disk mounts

* Add file sharing function

* update usb auto mount shell

* update samba config

* add umount disk function

* update change log

* update usb auto mount \

* update usb auto mount

* Update periodical.go

* Update periodical.go

* resolve alpha.1 issues

* Update UI

* update usb show name

* update web

* update image version
  • Loading branch information
LinkLeong authored Aug 22, 2022
1 parent b6f413b commit 34f35bb
Show file tree
Hide file tree
Showing 11 changed files with 421 additions and 426 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ main
CasaOS
github.com
.all-contributorsrc
build
build
dist
.goreleaser.yaml
2 changes: 1 addition & 1 deletion route/v1/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func AppInfo(c *gin.Context) {
// sort.EnvSort(envOrder).Sort(info.Envs)
// sort.VolSort(volOrder).Sort(info.Volumes.([]model.PathMap))
// sort.DevSort(devOrder).Sort(info.Devices)

info.Image += ":" + info.ImageVersion
info.MaxMemory = (service.MyService.System().GetMemInfo()["total"]).(uint64) >> 20

c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: info})
Expand Down
4 changes: 4 additions & 0 deletions route/v1/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package v1
import (
"fmt"
"net/http"
"path/filepath"
"reflect"
"strconv"
"strings"
Expand Down Expand Up @@ -210,6 +211,9 @@ func GetDisksUSBList(c *gin.Context) {
tempChildren.Size, _ = strconv.ParseUint(child.FSSize, 10, 64)
tempChildren.Avail, _ = strconv.ParseUint(child.FSAvail, 10, 64)
tempChildren.Name = child.Label
if len(tempChildren.Name) == 0 {
tempChildren.Name = filepath.Base(child.MountPoint)
}
avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
children = append(children, tempChildren)
temp.Avail += avail
Expand Down
110 changes: 55 additions & 55 deletions web/img/CasaConnect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 34f35bb

Please sign in to comment.