github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-25 18:07:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

util: Convert suffix added with AppendBackupSuffix() to simple constant

Browse Source
This commit is contained in:
Jöran Karl
2025-10-13 20:50:35 +02:00
parent 78d2c617ed
commit 1ce2202d9a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/micro/micro.go
View File

@@ -250,7 +250,7 @@ func LoadInput(args []string) []*buffer.Buffer {
func checkBackup(name string) error { func checkBackup(name string) error {
target := filepath.Join(config.ConfigDir, name) target := filepath.Join(config.ConfigDir, name)
backup := util.AppendBackupSuffix(target) backup := target + util.BackupSuffix
if info, err := os.Stat(backup); err == nil { if info, err := os.Stat(backup); err == nil {
input, err := os.ReadFile(backup) input, err := os.ReadFile(backup)
if err == nil { if err == nil {

2
internal/buffer/backup.go
View File

@@ -104,7 +104,7 @@ func (b *SharedBuffer) writeBackup(path string) (string, error) {
} }
name := util.DetermineEscapePath(backupdir, path) name := util.DetermineEscapePath(backupdir, path)
tmp := util.AppendBackupSuffix(name) tmp := name + util.BackupSuffix
_, err := b.overwriteFile(tmp) _, err := b.overwriteFile(tmp)
if err != nil { if err != nil {

10
internal/util/util.go
View File

@@ -54,6 +54,8 @@ var (
// To be used for file writes before umask is applied // To be used for file writes before umask is applied
const FileMode os.FileMode = 0666 const FileMode os.FileMode = 0666
const BackupSuffix = ".micro-backup"
const OverwriteFailMsg = `An error occurred while writing to the file: const OverwriteFailMsg = `An error occurred while writing to the file:
%s %s
@@ -447,10 +449,6 @@ func GetModTime(path string) (time.Time, error) {
return info.ModTime(), nil return info.ModTime(), nil
} }
func AppendBackupSuffix(path string) string {
return path + ".micro-backup"
}
func HashStringMd5(str string) string { func HashStringMd5(str string) string {
return fmt.Sprintf("%x", md5.Sum([]byte(str))) return fmt.Sprintf("%x", md5.Sum([]byte(str)))
} }
@@ -487,7 +485,7 @@ func DetermineEscapePath(dir string, path string) string {
return legacy return legacy
} }
if len(url)+len(".micro-backup") > 255 { if len(url)+len(BackupSuffix) > 255 {
return filepath.Join(dir, HashStringMd5(path)) return filepath.Join(dir, HashStringMd5(path))
} }
@@ -708,7 +706,7 @@ func SafeWrite(path string, bytes []byte, rename bool) error {
defer file.Close() defer file.Close()
} }
tmp := AppendBackupSuffix(path) tmp := path + BackupSuffix
err = os.WriteFile(tmp, bytes, FileMode) err = os.WriteFile(tmp, bytes, FileMode)
if err != nil { if err != nil {
os.Remove(tmp) os.Remove(tmp)