Skip to content

Commit aff7264

Browse files
committed
fix: close file
1 parent 405f4bf commit aff7264

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

service/bot/proto2mirai.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package bot
22

33
import (
44
"bytes"
5+
"io/ioutil"
56
"os"
67
"path"
78
"strconv"
@@ -105,12 +106,12 @@ func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
105106
}
106107
elem.Stream = bytes.NewReader(b)
107108
} else {
108-
imageFile, err := os.Open(url)
109+
imageBytes, err := ioutil.ReadFile(url)
109110
if err != nil {
110111
log.Errorf("failed to open local image, %+v", err)
111112
return EmptyText()
112113
}
113-
elem.Stream = imageFile
114+
elem.Stream = bytes.NewReader(imageBytes)
114115
}
115116

116117
elem.Tp = data["type"] // show或flash
@@ -351,12 +352,12 @@ func ProtoVideoToMiraiVideo(cli *client.QQClient, data map[string]string) (m mes
351352
}
352353
elem.UploadingCover = bytes.NewReader(coverBytes)
353354
} else {
354-
coverFile, err := os.Open(coverUrl)
355+
coverBytes, err := ioutil.ReadFile(coverUrl)
355356
if err != nil {
356357
log.Errorf("failed to open file, err: %+v", err)
357358
return EmptyText()
358359
}
359-
elem.UploadingCover = coverFile
360+
elem.UploadingCover = bytes.NewReader(coverBytes)
360361
}
361362

362363
videoFilePath := path.Join("video", util.MustMd5(url)+".mp4")
@@ -384,12 +385,12 @@ func ProtoVideoToMiraiVideo(cli *client.QQClient, data map[string]string) (m mes
384385
videoFilePath = url
385386
}
386387

387-
videoFile, err := os.Open(videoFilePath)
388+
videoBytes, err := ioutil.ReadFile(videoFilePath)
388389
if err != nil {
389390
log.Errorf("failed to open local video file, %+v", err)
390391
return EmptyText()
391392
}
392-
elem.UploadingVideo = videoFile
393+
elem.UploadingVideo = bytes.NewReader(videoBytes)
393394
elem.Url = url // 仅用于发送日志展示
394395
elem.CoverUrl = coverUrl // 仅用于发送日志展示
395396
return elem

0 commit comments

Comments
 (0)