Skip to content

Commit f025ad7

Browse files
committed
change: use panic instead of log.Fatalf;
1 parent bbddd0c commit f025ad7

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

core/options.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func ParseOptions() (Options, string) {
6767
}
6868

6969
if len(opts.DictPaths) == 0 {
70-
log.Fatalf("未指定词典文件,请检查配置文件[%s]或通过 -d 指定词典文件", configPath)
70+
panic(fmt.Sprintf("未指定词典文件,请检查配置文件[%s]或通过 -d 指定词典文件\n", configPath))
7171
}
7272

7373
for i := range opts.DictPaths {
@@ -84,22 +84,22 @@ func initConfigFile(filePath string) {
8484
if os.IsNotExist(err) {
8585
err = os.MkdirAll(dirPath, os.ModePerm)
8686
if err != nil {
87-
log.Fatalf("mkdir [%s] err : %s", dirPath, err)
87+
panic(fmt.Sprintf("mkdir [%s] err : %s", dirPath, err))
8888
}
8989
} else {
90-
log.Fatalf("open [%s] err : %s", dirPath, err)
90+
panic(fmt.Sprintf("open [%s] err : %s", dirPath, err))
9191
}
9292
}
9393
file, err := os.Create(filePath)
9494
if err != nil {
95-
log.Fatalf("create [%s] err : %s", filePath, err)
95+
panic(fmt.Sprintf("create [%s] err : %s", filePath, err))
9696
}
9797
defer func() {
9898
_ = file.Close()
9999
}()
100100
_, err = file.WriteString(initConfigTemplate())
101101
if err != nil {
102-
log.Fatalf("write [%s] err : %s", filePath, err)
102+
panic(fmt.Sprintf("write [%s] err : %s", filePath, err))
103103
}
104104
}
105105

@@ -213,25 +213,25 @@ func parseFromFile(path string) Options {
213213
initConfigFile(path)
214214
file, err = os.Open(path)
215215
if err != nil {
216-
log.Fatalf("init config file [%s] err : %s", path, err)
216+
panic(fmt.Sprintf("init config file [%s] err : %s", path, err))
217217
}
218218
} else {
219-
log.Fatalf("open [%s] err : %s", path, err)
219+
panic(fmt.Sprintf("open [%s] err : %s", path, err))
220220
}
221221
}
222222
defer func() {
223223
_ = file.Close()
224224
}()
225225
stat, err := file.Stat()
226226
if err != nil {
227-
log.Fatalf("file stat [%s] err : %s", path, err)
227+
panic(fmt.Sprintf("file stat [%s] err : %s", path, err))
228228
}
229229
bs := make([]byte, stat.Size())
230230
_, _ = file.Read(bs)
231231
var opts Options
232232
err = yaml.Unmarshal(bs, &opts)
233233
if err != nil {
234-
log.Fatalf("parse config [%s] err : %s", path, err)
234+
panic(fmt.Sprintf("parse config [%s] err : %s", path, err))
235235
}
236236
return opts
237237
}

dict/loader.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func loadFromFile(path string, ch chan<- *FileEntries, wg *sync.WaitGroup) {
104104
if exist {
105105
raw, err := io.ReadAll(head)
106106
if err != nil {
107-
log.Fatal("cant readAll bytes from head buffer")
107+
panic("cant readAll bytes from head buffer")
108108
}
109109
seek = size
110110
config, _ := parseYAML(raw)
@@ -217,9 +217,6 @@ type YAML map[string]any
217217
func parseYAML(raw []byte) (YAML, error) {
218218
config := make(YAML)
219219
err := yaml.Unmarshal(raw, &config)
220-
// if err != nil {
221-
// log.Fatalf("parse [%s] yaml error: %s", path, err)
222-
// }
223220
return config, err
224221
}
225222

@@ -230,7 +227,7 @@ func parseExtendPaths(path string, config *YAML) []string {
230227
pathFixed := filepath.Dir(path) + string(os.PathSeparator)
231228
typeOf := reflect.TypeOf(importTables)
232229
if typeOf.Kind() == reflect.Slice {
233-
for _, extendDict := range importTables.([]interface{}) {
230+
for _, extendDict := range importTables.([]any) {
234231
extends = append(extends, fmt.Sprintf("%s%s.dict.yaml", pathFixed, extendDict))
235232
}
236233
}

dict/output.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dict
22

33
import (
4+
"fmt"
45
"log"
56
"os"
67
"sort"
@@ -49,15 +50,15 @@ func output(fes []*FileEntries) (changed bool) {
4950
return changed
5051
}
5152

52-
func tryFatalf(err error, format string, args ...any) {
53+
func tryPanic(err error, format string, args ...any) {
5354
if err != nil {
54-
log.Fatalf(format, args...)
55+
panic(fmt.Sprintf(format, args...))
5556
}
5657
}
5758

5859
func outputFile(rawBs *[]byte, path string, entries []*Entry) (changed bool) {
5960
file, err := os.OpenFile(path, os.O_RDWR, 0666)
60-
tryFatalf(err, "open File failed, Err:%v", err)
61+
tryPanic(err, "open File failed, Err:%v", err)
6162
defer func() { _ = file.Close() }()
6263
bs := *rawBs
6364
willAddEntries := make([]*Entry, 0)
@@ -110,8 +111,8 @@ func outputFile(rawBs *[]byte, path string, entries []*Entry) (changed bool) {
110111
}
111112
*rawBs = bs
112113
l, err := file.Write(bs)
113-
tryFatalf(err, "write File failed, Err:%v", err)
114+
tryPanic(err, "write File failed, Err:%v", err)
114115
err = file.Truncate(int64(l))
115-
tryFatalf(err, "truncate File failed, Err:%v", err)
116+
tryPanic(err, "truncate File failed, Err:%v", err)
116117
return
117118
}

0 commit comments

Comments
 (0)