mirror of
https://github.com/zyedidia/micro.git
synced 2026-03-30 14:47:16 +09:00
save+util: Provide a meaningful error message for safe (over-)write fails
This commit is contained in:
@@ -45,11 +45,44 @@ var (
|
||||
Stdout *bytes.Buffer
|
||||
// Sigterm is a channel where micro exits when written
|
||||
Sigterm chan os.Signal
|
||||
|
||||
// To be used for fails on (over-)write with safe writes
|
||||
ErrOverwrite = OverwriteError{}
|
||||
)
|
||||
|
||||
// To be used for file writes before umask is applied
|
||||
const FileMode os.FileMode = 0666
|
||||
|
||||
const OverwriteFailMsg = `An error occurred while writing to the file:
|
||||
|
||||
%s
|
||||
|
||||
The file may be corrupted now. The good news is that it has been
|
||||
successfully backed up. Next time you open this file with Micro,
|
||||
Micro will ask if you want to recover it from the backup.
|
||||
|
||||
The backup path is:
|
||||
|
||||
%s`
|
||||
|
||||
// OverwriteError is a custom error to add additional information
|
||||
type OverwriteError struct {
|
||||
What error
|
||||
BackupName string
|
||||
}
|
||||
|
||||
func (e OverwriteError) Error() string {
|
||||
return fmt.Sprintf(OverwriteFailMsg, e.What, e.BackupName)
|
||||
}
|
||||
|
||||
func (e OverwriteError) Is(target error) bool {
|
||||
return target == ErrOverwrite
|
||||
}
|
||||
|
||||
func (e OverwriteError) Unwrap() error {
|
||||
return e.What
|
||||
}
|
||||
|
||||
func init() {
|
||||
var err error
|
||||
SemVersion, err = semver.Make(Version)
|
||||
@@ -685,6 +718,8 @@ func SafeWrite(path string, bytes []byte, rename bool) error {
|
||||
if err != nil {
|
||||
if rename {
|
||||
os.Remove(tmp)
|
||||
} else {
|
||||
err = OverwriteError{err, tmp}
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user