self-hosted/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-07-15 23:54:17 +02:00
Code Issues Releases Activity

Merge pull request #77 from IceWhaleTech/dev

Browse Source 
update disk
This commit is contained in:
link
2022-01-24 11:19:47 +08:00
committed by GitHub
parent 229d94cae7 3f472f1864
commit f1ce8bfd99
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
route/v1/disk.go
View File

@ -38,7 +38,6 @@ func GetDiskList(c *gin.Context) {
disks := []model.Drive{} disks := []model.Drive{}
storage := []model.Storage{} storage := []model.Storage{}
avail := []model.Drive{} avail := []model.Drive{}
for i := 0; i < len(list); i++ { for i := 0; i < len(list); i++ {
disk := model.Drive{} disk := model.Drive{}
if list[i].Rota { if list[i].Rota {
@ -51,6 +50,7 @@ func GetDiskList(c *gin.Context) {
disk.Size = list[i].Size disk.Size = list[i].Size
disk.Path = list[i].Path disk.Path = list[i].Path
disk.Model = list[i].Model disk.Model = list[i].Model
if len(list[i].Children) > 0 && findSystem == 0 { if len(list[i].Children) > 0 && findSystem == 0 {
for j := 0; j < len(list[i].Children); j++ { for j := 0; j < len(list[i].Children); j++ {
if list[i].Children[j].MountPoint == "/" { if list[i].Children[j].MountPoint == "/" {
@ -63,9 +63,9 @@ func GetDiskList(c *gin.Context) {
stor.Type = list[i].Children[j].FsType stor.Type = list[i].Children[j].FsType
stor.DriveName = "System" stor.DriveName = "System"
disk.Model = "System" disk.Model = "System"
if strings.Contains(list[i].Children[i].SubSystems, "mmc") { if strings.Contains(list[i].Children[j].SubSystems, "mmc") {
disk.DiskType = "MMC" disk.DiskType = "MMC"
} else if strings.Contains(list[i].Children[i].SubSystems, "usb") { } else if strings.Contains(list[i].Children[j].SubSystems, "usb") {
disk.DiskType = "USB" disk.DiskType = "USB"
} }
disk.Health = "true" disk.Health = "true"
@ -81,13 +81,12 @@ func GetDiskList(c *gin.Context) {
findSystem += 1 findSystem += 1
continue continue
} }
if list[i].Tran == "sata" { if list[i].Tran == "sata" {
temp := service.MyService.Disk().SmartCTL(list[i].Path) temp := service.MyService.Disk().SmartCTL(list[i].Path)
if reflect.DeepEqual(temp, model.SmartctlA{}) { if reflect.DeepEqual(temp, model.SmartctlA{}) {
continue continue
} }
if len(list[i].Children) == 1 && len(list[i].Children[0].MountPoint) > 0 { if len(list[i].Children) == 1 && len(list[i].Children[0].MountPoint) > 0 {
stor := model.Storage{} stor := model.Storage{}
stor.MountPoint = list[i].Children[0].MountPoint stor.MountPoint = list[i].Children[0].MountPoint
@ -105,7 +104,8 @@ func GetDiskList(c *gin.Context) {
} }
storage = append(storage, stor) storage = append(storage, stor)
} else { } else {
if list[i].Children[0].FsType == "ext4" { //todo 长度有问题
if len(list[i].Children) == 1 && list[i].Children[0].FsType == "ext4" {
disk.NeedFormat = false disk.NeedFormat = false
avail = append(avail, disk) avail = append(avail, disk)
} else { } else {