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

util: Improve and rename EscapePath() to DetermineEscapePath()

Browse Source 
If the new URL encoded path is found then it has precedence over the '%' escaped
path. In case none of both is found the new URL approach is used.
This commit is contained in:
Jöran Karl
2024-05-24 20:41:58 +02:00
parent e828027cc0
commit 69064cf808
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/buffer/backup.go
View File

@@ -79,7 +79,7 @@ func (b *Buffer) Backup() error {
os.Mkdir(backupdir, os.ModePerm)
}
name := filepath.Join(backupdir, util.EscapePath(b.AbsPath))
name := util.DetermineEscapePath(backupdir, b.AbsPath)
err = overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
b.Lock()
@@ -123,7 +123,7 @@ func (b *Buffer) RemoveBackup() {
if !b.Settings["backup"].(bool) || b.Settings["permbackup"].(bool) || b.Path == "" || b.Type != BTDefault {
return
}
f := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
f := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
os.Remove(f)
}
@@ -131,13 +131,13 @@ func (b *Buffer) RemoveBackup() {
// Returns true if a backup was applied
func (b *Buffer) ApplyBackup(fsize int64) (bool, bool) {
if b.Settings["backup"].(bool) && !b.Settings["permbackup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
backupfile := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
backupfile := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "backups"), b.AbsPath)
if info, err := os.Stat(backupfile); err == nil {
backup, err := os.Open(backupfile)
if err == nil {
defer backup.Close()
t := info.ModTime()
msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), util.EscapePath(b.AbsPath))
msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), backupfile)
choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
if choice%3 == 0 {

4
internal/buffer/serialize.go
View File

@@ -31,7 +31,7 @@ func (b *Buffer) Serialize() error {
return nil
}
name := filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath))
name := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
err := gob.NewEncoder(file).Encode(SerializedBuffer{
@@ -50,7 +50,7 @@ func (b *Buffer) Unserialize() error {
if b.Path == "" {
return nil
}
file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
file, err := os.Open(util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath))
if err == nil {
defer file.Close()
var buffer SerializedBuffer