Skip to content

Commit 5003bea

Browse files
committed
update
1 parent d0bfc3b commit 5003bea

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

file.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ func Copy(src, dest string) error {
121121
if _, err = io.Copy(dw, sr); err != nil {
122122
return fmt.Errorf("writing to output file failed: %w", err)
123123
}
124+
dw.Sync()
124125

125126
// Set back file information.
126127
if err = os.Chtimes(dest, si.ModTime(), si.ModTime()); err != nil {
@@ -134,12 +135,14 @@ func Copy(src, dest string) error {
134135
Rename(source, destination) will work moving file between folders
135136
*/
136137
func Rename(src, dest string) error {
137-
if err := os.Rename(src, dest); err != nil {
138-
if !strings.HasSuffix(err.Error(), `invalid cross-device link`) {
139-
return err
140-
}
138+
err := os.Rename(src, dest)
139+
if err == nil {
140+
return nil
141+
}
142+
if !strings.HasSuffix(err.Error(), `invalid cross-device link`) {
143+
return err
141144
}
142-
err := Copy(src, dest)
145+
err = Copy(src, dest)
143146
if err != nil {
144147
if !strings.HasSuffix(err.Error(), `operation not permitted`) {
145148
return err

http.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ func HTTPGetToFile(client *http.Client, url string, header http.Header, fileName
8989
}
9090
defer f.Close()
9191
_, err = io.Copy(f, rc)
92+
if err != nil {
93+
return err
94+
}
95+
err = f.Sync()
9296
return err
9397
}
9498

range_downloader.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ func assembleChunk(filename string, outfile *os.File) error {
144144
return err
145145
}
146146
defer chunkFile.Close()
147-
io.Copy(outfile, chunkFile)
147+
_, err = io.Copy(outfile, chunkFile)
148+
if err != nil {
149+
return err
150+
}
148151
return os.Remove(filename)
149152
}
150153

0 commit comments

Comments
 (0)