Skip to content

Commit dcb8580

Browse files
committed
improve code
1 parent b555176 commit dcb8580

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

services/dev/editor.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ func DefaultEditorsNames() string {
7474

7575
func GetDefaultEditors() ([]*Editor, error) {
7676
defaultNames, err := system.GetSetting(KeyDevDefaultEditors)
77-
if err != nil && !system.IsErrSettingIsNotExist(err) {
77+
if err != nil {
78+
if system.IsErrSettingIsNotExist(err) {
79+
return nil, nil
80+
}
7881
return nil, err
7982
}
8083
names := strings.Split(defaultNames, ",")
@@ -95,17 +98,12 @@ func SetDefaultEditors(names []string) error {
9598
})
9699
}
97100

98-
type ErrUnknownEditor struct {
99-
editorName string
100-
}
101-
102-
func (e ErrUnknownEditor) Error() string {
103-
return "Unknown editor: " + e.editorName
104-
}
105-
106101
func GetUserDefaultEditors(userID int64) ([]*Editor, error) {
107102
defaultNames, err := user_model.GetSetting(userID, KeyDevDefaultEditors)
108103
if err != nil {
104+
if user_model.IsErrUserSettingIsNotExist(err) {
105+
return nil, nil
106+
}
109107
return nil, err
110108
}
111109
names := strings.Split(defaultNames, ",")
@@ -131,10 +129,6 @@ func GetUserDefaultEditorsWithFallback(user *user_model.User) ([]*Editor, error)
131129
return editor, nil
132130
}
133131

134-
if theErr, ok := err.(ErrUnknownEditor); ok {
135-
log.Error("Unknown editor for user %d: %s, fallback to system default", user.ID, theErr.editorName)
136-
return GetDefaultEditors()
137-
}
138132
if user_model.IsErrUserSettingIsNotExist(err) {
139133
return GetDefaultEditors()
140134
}

0 commit comments

Comments
 (0)