Fix export

rusq · Feb 22, 2025 · 7a4912d · 7a4912d
1 parent ba7a064
commit 7a4912d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmd/slackdump/internal/export/v3.go b/cmd/slackdump/internal/export/v3.go
@@ -49,7 +49,7 @@ func export(ctx context.Context, sess *slackdump.Session, fsa fsadapter.FS, list
 			return fn(m)
 		}
 	}
-	src := source.NewChunkDir(chunkdir, false)
+	src := source.NewChunkDir(chunkdir, true)
 	conv := transform.NewExpConverter(src, fsa, transform.ExpWithMsgUpdateFunc(updFn()))
 	tf := transform.NewExportCoordinator(ctx, conv, transform.WithBufferSize(1000))
 	defer tf.Close()

diff --git a/internal/chunk/directory.go b/internal/chunk/directory.go
@@ -242,6 +242,7 @@ func (d *Directory) Walk(fn func(name string, f *File, err error) error) error {
 		}
 		f, err := d.openRAW(path)
 		if err != nil {
+			slog.Warn("unable to open file", "path", path, "err", err)
 			return fn(path, nil, err)
 		}
 		cf, err := cachedFromReader(f, d.wantCache)

diff --git a/internal/chunk/file.go b/internal/chunk/file.go
@@ -97,7 +97,7 @@ func fromReaderWithIndex(rs io.ReadSeeker, idx index) (*File, error) {
 
 // Close closes the underlying reader if it implements io.Closer.
 func (f *File) Close() error {
-	if c, ok := f.rs.(io.Closer); ok {
+	if c, ok := f.rs.(io.Closer); f.rs != nil && ok {
 		return c.Close()
 	}
 	return nil