Skip to content

Commit 6266973

Browse files
lovehunter9lovehunter9
committed
all src/dst type to enum instead of magic value
1 parent 79a4a87 commit 6266973

File tree

8 files changed

+166
-177
lines changed

8 files changed

+166
-177
lines changed

‎pkg/common/buffer.go

-139
This file was deleted.

‎pkg/common/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const (
155155
maxReasonableSpace = 1000 * 1e12 // 1000T
156156
)
157157

158-
func checkDiskSpace(filePath string, newContentSize int64) (bool, int64, int64, int64, error) {
158+
func CheckDiskSpace(filePath string, newContentSize int64) (bool, int64, int64, int64, error) {
159159
reservedSpaceStr := os.Getenv("RESERVED_SPACE") // env is MB, default is 10000MB
160160
if reservedSpaceStr == "" {
161161
reservedSpaceStr = "10000"
@@ -197,7 +197,7 @@ func checkDiskSpace(filePath string, newContentSize int64) (bool, int64, int64,
197197
return false, requiredSpace, availableSpace, reservedSpace, nil
198198
}
199199

200-
func formatBytes(bytes int64) string {
200+
func FormatBytes(bytes int64) string {
201201
const (
202202
KB = 1024
203203
MB = KB * 1024

‎pkg/drives/cache.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,16 @@ func (rs *CacheResourceService) PasteFileFrom(fs afero.Fs, srcType, src, dstType
182182
var bufferPath string
183183

184184
var err error
185-
_, err = common.CheckBufferDiskSpace(diskSize)
185+
_, err = CheckBufferDiskSpace(diskSize)
186186
if err != nil {
187187
return err
188188
}
189-
bufferPath, err = common.GenerateBufferFileName(src, bflName, extRemains)
189+
bufferPath, err = GenerateBufferFileName(src, bflName, extRemains)
190190
if err != nil {
191191
return err
192192
}
193193

194-
err = common.MakeDiskBuffer(bufferPath, diskSize, false)
194+
err = MakeDiskBuffer(bufferPath, diskSize, false)
195195
if err != nil {
196196
return err
197197
}
@@ -202,7 +202,7 @@ func (rs *CacheResourceService) PasteFileFrom(fs afero.Fs, srcType, src, dstType
202202

203203
defer func() {
204204
klog.Infoln("Begin to remove buffer")
205-
common.RemoveDiskBuffer(bufferPath, srcType)
205+
RemoveDiskBuffer(bufferPath, srcType)
206206
}()
207207

208208
handler, err := GetResourceService(dstType)

‎pkg/drives/cloud_drive.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -1143,20 +1143,20 @@ func (rs *CloudDriveResourceService) PasteFileFrom(fs afero.Fs, srcType, src, ds
11431143
var bufferPath string
11441144

11451145
var err error
1146-
_, err = common.CheckBufferDiskSpace(diskSize)
1146+
_, err = CheckBufferDiskSpace(diskSize)
11471147
if err != nil {
11481148
return err
11491149
}
11501150

11511151
srcInfo, err := GetCloudDriveFocusedMetaInfos(src, w, r)
1152-
bufferFilePath, err := common.GenerateBufferFolder(srcInfo.Path, bflName)
1152+
bufferFilePath, err := GenerateBufferFolder(srcInfo.Path, bflName)
11531153
if err != nil {
11541154
return err
11551155
}
11561156
bufferPath = filepath.Join(bufferFilePath, srcInfo.Name)
11571157
klog.Infoln("Buffer file path: ", bufferFilePath)
11581158
klog.Infoln("Buffer path: ", bufferPath)
1159-
err = common.MakeDiskBuffer(bufferPath, diskSize, true)
1159+
err = MakeDiskBuffer(bufferPath, diskSize, true)
11601160
if err != nil {
11611161
return err
11621162
}
@@ -1167,7 +1167,7 @@ func (rs *CloudDriveResourceService) PasteFileFrom(fs afero.Fs, srcType, src, ds
11671167

11681168
defer func() {
11691169
klog.Infoln("Begin to remove buffer")
1170-
common.RemoveDiskBuffer(bufferPath, srcType)
1170+
RemoveDiskBuffer(bufferPath, srcType)
11711171
}()
11721172

11731173
handler, err := GetResourceService(dstType)
@@ -1371,19 +1371,19 @@ func createPreviewCloudDrive(w http.ResponseWriter, r *http.Request, src string,
13711371

13721372
var err error
13731373
diskSize := file.Size
1374-
_, err = common.CheckBufferDiskSpace(diskSize)
1374+
_, err = CheckBufferDiskSpace(diskSize)
13751375
if err != nil {
13761376
return nil, err
13771377
}
13781378

1379-
bufferFilePath, err := common.GenerateBufferFolder(file.Path, bflName)
1379+
bufferFilePath, err := GenerateBufferFolder(file.Path, bflName)
13801380
if err != nil {
13811381
return nil, err
13821382
}
13831383
bufferPath := filepath.Join(bufferFilePath, file.Name)
13841384
klog.Infoln("Buffer file path: ", bufferFilePath)
13851385
klog.Infoln("Buffer path: ", bufferPath)
1386-
err = common.MakeDiskBuffer(bufferPath, diskSize, true)
1386+
err = MakeDiskBuffer(bufferPath, diskSize, true)
13871387
if err != nil {
13881388
return nil, err
13891389
}
@@ -1430,26 +1430,26 @@ func createPreviewCloudDrive(w http.ResponseWriter, r *http.Request, src string,
14301430
}()
14311431

14321432
klog.Infoln("Begin to remove buffer")
1433-
common.RemoveDiskBuffer(bufferPath, SrcTypeCloud)
1433+
RemoveDiskBuffer(bufferPath, SrcTypeCloud)
14341434
return buf.Bytes(), nil
14351435
}
14361436

14371437
func RawFileHandlerCloudDrive(src string, w http.ResponseWriter, r *http.Request, file *CloudDriveMetaResponseData, bflName string) (int, error) {
14381438
var err error
14391439
diskSize := file.Size
1440-
_, err = common.CheckBufferDiskSpace(diskSize)
1440+
_, err = CheckBufferDiskSpace(diskSize)
14411441
if err != nil {
14421442
return common.ErrToStatus(err), err
14431443
}
14441444

1445-
bufferFilePath, err := common.GenerateBufferFolder(file.Path, bflName)
1445+
bufferFilePath, err := GenerateBufferFolder(file.Path, bflName)
14461446
if err != nil {
14471447
return common.ErrToStatus(err), err
14481448
}
14491449
bufferPath := filepath.Join(bufferFilePath, file.Name)
14501450
klog.Infoln("Buffer file path: ", bufferFilePath)
14511451
klog.Infoln("Buffer path: ", bufferPath)
1452-
err = common.MakeDiskBuffer(bufferPath, diskSize, true)
1452+
err = MakeDiskBuffer(bufferPath, diskSize, true)
14531453
if err != nil {
14541454
return common.ErrToStatus(err), err
14551455
}
@@ -1470,7 +1470,7 @@ func RawFileHandlerCloudDrive(src string, w http.ResponseWriter, r *http.Request
14701470
http.ServeContent(w, r, file.Name, ParseTimeString(file.Modified), fd)
14711471

14721472
klog.Infoln("Begin to remove buffer")
1473-
common.RemoveDiskBuffer(bufferPath, SrcTypeCloud)
1473+
RemoveDiskBuffer(bufferPath, SrcTypeCloud)
14741474
return 0, nil
14751475
}
14761476

‎pkg/drives/drive.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@ func (rs *DriveResourceService) PasteFileFrom(fs afero.Fs, srcType, src, dstType
118118
return err
119119
}
120120
diskSize = fileInfo.Size
121-
_, err = common.CheckBufferDiskSpace(diskSize)
121+
_, err = CheckBufferDiskSpace(diskSize)
122122
if err != nil {
123123
return err
124124
}
125-
bufferPath, err = common.GenerateBufferFileName(src, bflName, extRemains)
125+
bufferPath, err = GenerateBufferFileName(src, bflName, extRemains)
126126
if err != nil {
127127
return err
128128
}
129129

130-
err = common.MakeDiskBuffer(bufferPath, diskSize, false)
130+
err = MakeDiskBuffer(bufferPath, diskSize, false)
131131
if err != nil {
132132
return err
133133
}
@@ -138,7 +138,7 @@ func (rs *DriveResourceService) PasteFileFrom(fs afero.Fs, srcType, src, dstType
138138

139139
defer func() {
140140
klog.Infoln("Begin to remove buffer")
141-
common.RemoveDiskBuffer(bufferPath, srcType)
141+
RemoveDiskBuffer(bufferPath, srcType)
142142
}()
143143

144144
handler, err := GetResourceService(dstType)

0 commit comments

Comments
 (0)