From c33af66c6e50cbd44e1f585b4899fb093f6bae5b Mon Sep 17 00:00:00 2001
From: link <a624669980@163.com>
Date: Fri, 10 Jun 2022 14:47:50 +0800
Subject: [PATCH] Dev (#275)

* fix bug

* updata UI

* 0.3.2

### Added

- [Files] Files can now be selected multiple files and downloaded, deleted, moved, etc.
- [Apps] Support to modify the application opening address.([#204](https://github.com/IceWhaleTech/CasaOS/issues/204))

### Changed

- [Apps] Hide the display of non-essential environment variables in the application.
- [System] Network, disk, cpu, memory, etc. information is modified to be pushed via socket.
- [System] Optimize opening speed.([#214](https://github.com/IceWhaleTech/CasaOS/issues/214))
### Fixed

- [System] Fixed the problem that sync data cannot submit the device ID ([#68](https://github.com/IceWhaleTech/CasaOS/issues/68))
- [Files] Fixed the code editor center alignment display problem.([#210](https://github.com/IceWhaleTech/CasaOS/issues/210))
- [Files] Fixed the problem of wrong name when downloading files.([#240](https://github.com/IceWhaleTech/CasaOS/issues/240))
- [System] Fixed the network display as a negative number problem.([#224](https://github.com/IceWhaleTech/CasaOS/issues/224))

* Modify log help class

* Fix some bugs in 0.3.2

* Solve the operation file queue problem

* Exclude web folders

* update UI

* add cancel file operate

* Update UI

* Merge sockets to transfer data

* Conflict Resolution

* Update send data interval
---
 CHANGELOG.md     |  2 +-
 main.go          |  2 +-
 route/v1/file.go | 22 ++++++++++++----------
 service/disk.go  |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b1c23c..cf858c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-## [0.3.2-pre] - 2022-06-08
+## [0.3.2] - 2022-06-10
 
 ### Added
 
diff --git a/main.go b/main.go
index 132264f..3f9e366 100644
--- a/main.go
+++ b/main.go
@@ -100,7 +100,7 @@ func main() {
 	if err != nil {
 		fmt.Println(err)
 	}
-	err = cron2.AddFunc("0/3 * * * * *", func() {
+	err = cron2.AddFunc("0/5 * * * * *", func() {
 		if service.ClientCount > 0 {
 			// route.SendNetINfoBySocket()
 			// route.SendCPUBySocket()
diff --git a/route/v1/file.go b/route/v1/file.go
index 93670db..076e132 100644
--- a/route/v1/file.go
+++ b/route/v1/file.go
@@ -199,7 +199,6 @@ func GetDownloadFile(c *gin.Context) {
 	defer ar.Close()
 	commonDir := file.CommonPrefix(filepath.Separator, list...)
 
-
 	currentPath := filepath.Base(commonDir)
 
 	name := "_" + currentPath
@@ -278,17 +277,20 @@ func DirPath(c *gin.Context) {
 
 	//Hide the files or folders in operation
 	fileQueue := make(map[string]string)
-	for _, v := range service.OpStrArr {
-		v, ok := service.FileQueue.Load(v)
-		if !ok {
-			continue
-		}
-		vt := v.(model.FileOperate)
-		for _, i := range vt.Item {
-			lastPath := i.From[strings.LastIndex(i.From, "/")+1:]
-			fileQueue[vt.To+"/"+lastPath] = i.From
+	if len(service.OpStrArr) > 0 {
+		for _, v := range service.OpStrArr {
+			v, ok := service.FileQueue.Load(v)
+			if !ok {
+				continue
+			}
+			vt := v.(model.FileOperate)
+			for _, i := range vt.Item {
+				lastPath := i.From[strings.LastIndex(i.From, "/")+1:]
+				fileQueue[vt.To+"/"+lastPath] = i.From
+			}
 		}
 	}
+
 	pathList := []model.Path{}
 	for i := 0; i < len(info); i++ {
 		if _, ok := fileQueue[info[i].Path]; !ok {
diff --git a/service/disk.go b/service/disk.go
index 55ca9af..cca835a 100644
--- a/service/disk.go
+++ b/service/disk.go
@@ -67,7 +67,7 @@ func (d *diskService) SmartCTL(path string) model.SmartctlA {
 		loger.Error("Failed to unmarshal json", zap.Any("err", err))
 	}
 	if !reflect.DeepEqual(m, model.SmartctlA{}) {
-		Cache.Add(key, m, time.Second*10)
+		Cache.Add(key, m, time.Hour*24)
 	}
 	return m
 }