From 6bf59ff981343693867d011b574dc5a928fa26fc Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 17 Sep 2024 11:21:15 +0200 Subject: [PATCH] address PR feedback --- libs/notebook/detect.go | 15 +++------------ libs/template/renderer.go | 1 + 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/libs/notebook/detect.go b/libs/notebook/detect.go index 480fae212..0d49b3da6 100644 --- a/libs/notebook/detect.go +++ b/libs/notebook/detect.go @@ -141,8 +141,7 @@ func Detect(name string) (notebook bool, language workspace.Language, err error) } type inMemoryFile struct { - content []byte - readIndex int64 + buffer bytes.Buffer } type inMemoryFS struct { @@ -158,20 +157,12 @@ func (f *inMemoryFile) Stat() (fs.FileInfo, error) { } func (f *inMemoryFile) Read(b []byte) (n int, err error) { - if f.readIndex >= int64(len(f.content)) { - err = io.EOF - return - } - - n = copy(b, f.content[f.readIndex:]) - f.readIndex += int64(n) - return + return f.buffer.Read(b) } func (fs inMemoryFS) Open(name string) (fs.File, error) { return &inMemoryFile{ - content: fs.content, - readIndex: 0, + buffer: *bytes.NewBuffer(fs.content), }, nil } diff --git a/libs/template/renderer.go b/libs/template/renderer.go index 30b4db0c9..c464df3f6 100644 --- a/libs/template/renderer.go +++ b/libs/template/renderer.go @@ -153,6 +153,7 @@ func (r *renderer) computeFile(relPathTemplate string) (file, error) { return nil, err } + // we need the absolute path in case we need to write notebooks using the REST API rootPath, err := filepath.Abs(r.instanceRoot) if err != nil { return nil, err