summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKeuin <[email protected]>2022-09-10 16:05:10 +0800
committerKeuin <[email protected]>2022-09-10 16:05:10 +0800
commite999937d75d8e8c40b06add376ebac423b0c2079 (patch)
tree8a30abaa5fc8fc68d283e0be52a73ee83bdaf3a2 /common
parentf028bff042f471a68dff681af9c79ef96bc952e5 (diff)
Fix task is not properly restarted when the live is closed and started again.
Use more friendly log format to replace golang's default `log.Logger`. (not completed) Cleaner task status management.
Diffstat (limited to 'common')
-rw-r--r--common/bytesize.go19
-rw-r--r--common/copy.go32
2 files changed, 36 insertions, 15 deletions
diff --git a/common/bytesize.go b/common/bytesize.go
new file mode 100644
index 0000000..9b3aa97
--- /dev/null
+++ b/common/bytesize.go
@@ -0,0 +1,19 @@
+package common
+
+import "fmt"
+
+func PrettyBytes(b uint64) string {
+ if b < 1000 {
+ return fmt.Sprintf("%d Byte", b)
+ }
+ if b < 1000_000 {
+ return fmt.Sprintf("%.2f KiB", float64(b)/1024)
+ }
+ if b < 1000_000_000 {
+ return fmt.Sprintf("%.2f MiB", float64(b)/1024/1024)
+ }
+ if b < 1000_000_000_000 {
+ return fmt.Sprintf("%.2f GiB", float64(b)/1024/1024/1024)
+ }
+ return fmt.Sprintf("%.2f TiB", float64(b)/1024/1024/1024/1024)
+}
diff --git a/common/copy.go b/common/copy.go
index bee6515..1d273dc 100644
--- a/common/copy.go
+++ b/common/copy.go
@@ -36,29 +36,31 @@ func CopyToFileWithBuffer(
}()
for {
- if err = ctx.Err(); err != nil {
+ select {
+ case <-ctx.Done():
return
- }
- nRead, err = in.Read(buffer[off:Min[int](off+chunkSize, bufSize)])
- if err != nil {
- return
- }
- off += nRead
- if off == bufSize {
- // buffer is full
- var nWritten int
- nWritten, err = out.Write(buffer)
+ default:
+ nRead, err = in.Read(buffer[off:Min[int](off+chunkSize, bufSize)])
if err != nil {
return
}
- if syncFile {
- err = out.Sync()
+ off += nRead
+ if off == bufSize {
+ // buffer is full
+ var nWritten int
+ nWritten, err = out.Write(buffer)
if err != nil {
return
}
+ if syncFile {
+ err = out.Sync()
+ if err != nil {
+ return
+ }
+ }
+ written += int64(nWritten)
+ off = 0
}
- written += int64(nWritten)
- off = 0
}
}
}