X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/baf7a940be8927278e3b4b87e7366cebfc16532f..6c7859cfea123479aba046614ee81028651ddaf5:/journal.go

diff --git a/journal.go b/journal.go
index c12f7d0..d048913 100644
--- a/journal.go
+++ b/journal.go
@@ -38,13 +38,13 @@ type Journal struct {
 func (j *Journal) Write(day string, line []byte) (Position, error) {
 	number, err := journalDayNumber(day)
 	if err != nil {
-		return Position{}, err
+		return Position{}, fmt.Errorf("parse journal day: %w", err)
 	}
 
 	if number != j.day {
 		err = j.closeWriter()
 		if err != nil {
-			return Position{}, err
+			return Position{}, fmt.Errorf("close previous day writer: %w", err)
 		}
 
 		j.file, err = os.OpenFile(filepath.Join(j.dir, day+".jsonl"), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
@@ -71,16 +71,33 @@ func (j *Journal) Write(day string, line []byte) (Position, error) {
 		offset: j.size,
 		length: uint32(len(line)),
 	}
+
 	j.size += uint64(len(line))
 
 	return place, nil
 }
 
+func (j *Journal) closeWriter() error {
+	if j.file == nil {
+		return nil
+	}
+
+	err := j.file.Close()
+	j.file = nil
+	j.day = 0
+	if err != nil {
+		return fmt.Errorf("close day file: %w", err)
+	}
+
+	return nil
+}
+
 // Read returns the line at place without its newline.
 func (j *Journal) Read(place Position) ([]byte, error) {
 	reader, open := j.readers[place.day]
 	if !open {
 		var err error
+
 		reader, err = os.Open(filepath.Join(j.dir, journalDayName(place.day)+".jsonl"))
 		if err != nil {
 			return nil, fmt.Errorf("open day file: %w", err)
@@ -111,6 +128,7 @@ func (j *Journal) Close() error {
 	err := j.closeWriter()
 	for day, reader := range j.readers {
 		err = errors.Join(err, reader.Close())
+
 		delete(j.readers, day)
 	}
 
@@ -128,10 +146,11 @@ func (j *Journal) Scan(ctx context.Context, place Position, add func([]byte, Pos
 	}
 
 	slices.Sort(paths)
+
 	for n, path := range paths {
 		day, err := journalDayNumber(strings.TrimSuffix(filepath.Base(path), ".jsonl"))
 		if err != nil {
-			return err
+			return fmt.Errorf("parse day filename: %w", err)
 		}
 
 		if day < place.day {
@@ -145,28 +164,13 @@ func (j *Journal) Scan(ctx context.Context, place Position, add func([]byte, Pos
 
 		err = journalScanFile(ctx, path, day, offset, n == len(paths)-1, add)
 		if err != nil {
-			return err
+			return fmt.Errorf("scan day file: %w", err)
 		}
 	}
 
 	return nil
 }
 
-func (j *Journal) closeWriter() error {
-	if j.file == nil {
-		return nil
-	}
-
-	err := j.file.Close()
-	j.file = nil
-	j.day = 0
-	if err != nil {
-		return fmt.Errorf("close day file: %w", err)
-	}
-
-	return nil
-}
-
 // journalDayNumber returns the day YYYY-MM-DD as the number YYYYMMDD.
 func journalDayNumber(day string) (uint32, error) {
 	number, err := strconv.ParseUint(strings.ReplaceAll(day, "-", ""), 10, 32)
@@ -211,7 +215,12 @@ func journalScanFile(ctx context.Context, path string, day uint32, offset uint64
 		}
 
 		if errors.Is(err, io.EOF) && last {
-			return journalCutFile(path, offset)
+			err = journalCutFile(path, offset)
+			if err != nil {
+				return fmt.Errorf("cut incomplete day line: %w", err)
+			}
+
+			return nil
 		}
 
 		if errors.Is(err, io.EOF) {