Merge pull request #127 from eatmoreapple/update-HotReloadStorage

This commit is contained in:
多吃点苹果 2022-11-14 11:17:07 +08:00 committed by GitHub
commit 28652aa6ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions

4
bot.go
View File

@ -85,7 +85,7 @@ func (b *Bot) HotLogin(storage HotReloadStorage, retry ...bool) error {
return b.Login()
}
if err = b.hotLoginInit(*item); err != nil {
if err = b.hotLoginInit(item); err != nil {
return err
}
@ -98,7 +98,7 @@ func (b *Bot) HotLogin(storage HotReloadStorage, retry ...bool) error {
}
// 热登陆初始化
func (b *Bot) hotLoginInit(item HotReloadStorageItem) error {
func (b *Bot) hotLoginInit(item *HotReloadStorageItem) error {
cookies := item.Cookies
for u, ck := range cookies {
path, err := url.Parse(u)

View File

@ -11,7 +11,7 @@ var (
emojiRegexp = regexp.MustCompile(`<span class="emoji emoji(.*?)"></span>`)
)
// emoji 表情
// Emoji 表情
// 字段太多了,污染命名空间,封装成struct返回
var Emoji = struct {
Smile string

View File

@ -28,7 +28,6 @@ type HotReloadStorage io.ReadWriter
// JsonFileHotReloadStorage 实现HotReloadStorage接口
// 默认以json文件的形式存储
// Deprecated
type JsonFileHotReloadStorage struct {
FileName string
file *os.File
@ -45,21 +44,21 @@ func (j *JsonFileHotReloadStorage) Read(p []byte) (n int, err error) {
}
func (j *JsonFileHotReloadStorage) Write(p []byte) (n int, err error) {
j.file, err = os.Create(j.FileName)
if err != nil {
return 0, err
if j.file == nil {
j.file, err = os.Create(j.FileName)
if err != nil {
return 0, err
}
}
return j.file.Write(p)
}
// NewJsonFileHotReloadStorage 创建JsonFileHotReloadStorage
// Deprecated
// use os.File instead
func NewJsonFileHotReloadStorage(filename string) HotReloadStorage {
return &JsonFileHotReloadStorage{FileName: filename}
}
var _ HotReloadStorage = &JsonFileHotReloadStorage{}
var _ HotReloadStorage = (*JsonFileHotReloadStorage)(nil)
func NewHotReloadStorageItem(storage HotReloadStorage) (*HotReloadStorageItem, error) {
if storage == nil {