From a43fb4faea167b7a94ef7714ce9e69c18ca06b01 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Thu, 20 Jul 2023 10:19:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20storage=20=E4=B8=AD=E7=9A=84=20Dele?= =?UTF-8?q?te=20=E8=A6=81=E6=B1=82=E8=BF=94=E5=9B=9E=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/storage/index_data_storage.go | 4 ++-- utils/storage/storages/index_data_file.go | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/utils/storage/index_data_storage.go b/utils/storage/index_data_storage.go index f3a1160..1f72925 100644 --- a/utils/storage/index_data_storage.go +++ b/utils/storage/index_data_storage.go @@ -16,7 +16,7 @@ type IndexDataStorage[I generic.Ordered, T IndexDataItem[I]] interface { // SaveAll 保存所有数据 SaveAll(name string, data map[I]T) error // Delete 删除特定索引数据 - Delete(name string, index I) + Delete(name string, index I) error // DeleteAll 删除所有数据 - DeleteAll(name string) + DeleteAll(name string) error } diff --git a/utils/storage/storages/index_data_file.go b/utils/storage/storages/index_data_file.go index d2ab42a..f634a6c 100644 --- a/utils/storage/storages/index_data_file.go +++ b/utils/storage/storages/index_data_file.go @@ -109,19 +109,22 @@ func (slf *IndexDataFileStorage[I, T]) SaveAll(name string, data map[I]T) error return nil } -func (slf *IndexDataFileStorage[I, T]) Delete(name string, index I) { - _ = os.Remove(filepath.Join(slf.dir, fmt.Sprintf(indexNameFormat, name, index, slf.suffix))) +func (slf *IndexDataFileStorage[I, T]) Delete(name string, index I) error { + return os.Remove(filepath.Join(slf.dir, fmt.Sprintf(indexNameFormat, name, index, slf.suffix))) } -func (slf *IndexDataFileStorage[I, T]) DeleteAll(name string) { +func (slf *IndexDataFileStorage[I, T]) DeleteAll(name string) error { files, err := os.ReadDir(slf.dir) if err != nil { - return + return err } for _, entry := range files { if entry.IsDir() || !strings.HasPrefix(entry.Name(), name) || !strings.HasSuffix(entry.Name(), slf.suffix) { continue } - _ = os.Remove(filepath.Join(slf.dir, entry.Name())) + if err := os.Remove(filepath.Join(slf.dir, entry.Name())); err != nil { + return err + } } + return nil }