mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

change the atomic write functions to work with readers

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-22 15:01:19 +05:30
parent d31c48092a
commit c906314974
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kittens/unicode_input/main.go
View File

@@ -3,6 +3,7 @@
package unicode_input package unicode_input
import ( import (
"bytes"
"errors" "errors"
"fmt" "fmt"
"os" "os"
@@ -442,7 +443,7 @@ func (self *handler) handle_favorites_key_event(event *loop.KeyEvent) {
self.lp.Quit(1) self.lp.Quit(1)
return return
} }
err = utils.AtomicUpdateFile(fp, utils.UnsafeStringToBytes(raw), 0o600) err = utils.AtomicUpdateFile(fp, bytes.NewReader(utils.UnsafeStringToBytes(raw)), 0o600)
if err != nil { if err != nil {
self.err = fmt.Errorf("Failed to write to favorites file %s with error: %w", fp, err) self.err = fmt.Errorf("Failed to write to favorites file %s with error: %w", fp, err)
self.lp.Quit(1) self.lp.Quit(1)

3
tools/cmd/edit_in_kitty/main.go
View File

@@ -3,6 +3,7 @@
package edit_in_kitty package edit_in_kitty
import ( import (
"bytes"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"io" "io"
@@ -212,7 +213,7 @@ func edit_in_kitty(path string, opts *Options) (err error) {
add_encoded("file_data", utils.UnsafeBytesToString(file_data)) add_encoded("file_data", utils.UnsafeBytesToString(file_data))
fmt.Println("Waiting for editing to be completed, press Esc to abort...") fmt.Println("Waiting for editing to be completed, press Esc to abort...")
write_data := func(data_type string, rdata []byte) (err error) { write_data := func(data_type string, rdata []byte) (err error) {
err = utils.AtomicWriteFile(path, rdata, fs.FileMode(s.Mode).Perm()) err = utils.AtomicWriteFile(path, bytes.NewReader(rdata), fs.FileMode(s.Mode).Perm())
if err != nil { if err != nil {
err = fmt.Errorf("Failed to write data to %s with error: %w", path, err) err = fmt.Errorf("Failed to write data to %s with error: %w", path, err)
} }

2
tools/config/api.go
View File

@@ -344,7 +344,7 @@ func (self Patcher) Patch(path, sentinel, content string, settings_to_comment_ou
_ = os.WriteFile(backup_path+".bak", raw, self.Mode) _ = os.WriteFile(backup_path+".bak", raw, self.Mode)
} }
return true, utils.AtomicUpdateFile(path, nraw, self.Mode) return true, utils.AtomicUpdateFile(path, bytes.NewReader(nraw), self.Mode)
} }
return false, nil return false, nil
} }

6
tools/themes/collection.go
View File

@@ -344,7 +344,7 @@ func set_comment_in_zip_file(path string, comment string) error {
} }
} }
dest.Close() dest.Close()
return utils.AtomicUpdateFile(path, buf.Bytes(), 0o644) return utils.AtomicUpdateFile(path, bytes.NewReader(buf.Bytes()), 0o644)
} }
func fetch_cached(name, url, cache_path string, max_cache_age time.Duration) (string, error) { func fetch_cached(name, url, cache_path string, max_cache_age time.Duration) (string, error) {
@@ -584,7 +584,7 @@ func (self *Theme) SaveInDir(dirpath string) (err error) {
if err != nil { if err != nil {
return err return err
} }
return utils.AtomicUpdateFile(path, utils.UnsafeStringToBytes(code), 0o644) return utils.AtomicUpdateFile(path, bytes.NewReader(utils.UnsafeStringToBytes(code)), 0o644)
} }
func (self *Theme) SaveInConf(config_dir, reload_in, config_file_name string) (err error) { func (self *Theme) SaveInConf(config_dir, reload_in, config_file_name string) (err error) {
@@ -594,7 +594,7 @@ func (self *Theme) SaveInConf(config_dir, reload_in, config_file_name string) (e
if err != nil { if err != nil {
return err return err
} }
err = utils.AtomicUpdateFile(path, utils.UnsafeStringToBytes(code), 0o644) err = utils.AtomicUpdateFile(path, bytes.NewReader(utils.UnsafeStringToBytes(code)), 0o644)
if err != nil { if err != nil {
return err return err
} }

2
tools/tui/shell_integration/api.go
View File

@@ -50,7 +50,7 @@ func extract_files(match, dest_dir string) (err error) {
if existing, rerr := os.ReadFile(dest); rerr == nil && bytes.Equal(existing, entry.Data) { if existing, rerr := os.ReadFile(dest); rerr == nil && bytes.Equal(existing, entry.Data) {
continue continue
} }
if err = utils.AtomicWriteFile(dest, entry.Data, 0o644); err != nil { if err = utils.AtomicWriteFile(dest, bytes.NewReader(entry.Data), 0o644); err != nil {
return return
} }
} }

7
tools/utils/atomic-write.go
View File

@@ -5,6 +5,7 @@ package utils
import ( import (
"errors" "errors"
"fmt" "fmt"
"io"
"io/fs" "io/fs"
"os" "os"
"path/filepath" "path/filepath"
@@ -39,7 +40,7 @@ func AtomicCreateSymlink(oldname, newname string) (err error) {
} }
} }
func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) { func AtomicWriteFile(path string, data io.Reader, perm os.FileMode) (err error) {
npath, err := filepath.EvalSymlinks(path) npath, err := filepath.EvalSymlinks(path)
if errors.Is(err, fs.ErrNotExist) { if errors.Is(err, fs.ErrNotExist) {
err = nil err = nil
@@ -60,7 +61,7 @@ func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) {
removed = true removed = true
} }
}() }()
_, err = f.Write(data) _, err = io.Copy(f, data)
if err == nil { if err == nil {
err = f.Chmod(perm) err = f.Chmod(perm)
if err == nil { if err == nil {
@@ -76,7 +77,7 @@ func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) {
return return
} }
func AtomicUpdateFile(path string, data []byte, perms ...fs.FileMode) (err error) { func AtomicUpdateFile(path string, data io.Reader, perms ...fs.FileMode) (err error) {
perm := fs.FileMode(0o644) perm := fs.FileMode(0o644)
if len(perms) > 0 { if len(perms) > 0 {
perm = perms[0] perm = perms[0]

3
tools/utils/cached_values.go
View File

@@ -3,6 +3,7 @@
package utils package utils
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
@@ -31,7 +32,7 @@ func (self *CachedValues[T]) Load() T {
func (self *CachedValues[T]) Save() { func (self *CachedValues[T]) Save() {
raw, err := json.Marshal(self.Opts) raw, err := json.Marshal(self.Opts)
if err == nil { if err == nil {
AtomicUpdateFile(self.Path(), raw, 0o600) AtomicUpdateFile(self.Path(), bytes.NewReader(raw), 0o600)
} }
} }