Skip to content

Commit

Permalink
Dev (#275)
Browse files Browse the repository at this point in the history
* 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](#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](#214))
### Fixed

- [System] Fixed the problem that sync data cannot submit the device ID ([#68](#68))
- [Files] Fixed the code editor center alignment display problem.([#210](#210))
- [Files] Fixed the problem of wrong name when downloading files.([#240](#240))
- [System] Fixed the network display as a negative number problem.([#224](#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
  • Loading branch information
LinkLeong authored Jun 10, 2022
1 parent 9d47874 commit c33af66
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
22 changes: 12 additions & 10 deletions route/v1/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ func GetDownloadFile(c *gin.Context) {
defer ar.Close()
commonDir := file.CommonPrefix(filepath.Separator, list...)


currentPath := filepath.Base(commonDir)

name := "_" + currentPath
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion service/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit c33af66

Please sign in to comment.