mirror of
https://github.com/ivuorinen/gibidify.git
synced 2026-02-06 02:45:53 +00:00
chore: modernize workflows, security scanning, and linting configuration (#50)
* build: update Go 1.25, CI workflows, and build tooling - Upgrade to Go 1.25 - Add benchmark targets to Makefile - Implement parallel gosec execution - Lock tool versions for reproducibility - Add shellcheck directives to scripts - Update CI workflows with improved caching * refactor: migrate from golangci-lint to revive - Replace golangci-lint with revive for linting - Configure comprehensive revive rules - Fix all EditorConfig violations - Add yamllint and yamlfmt support - Remove deprecated .golangci.yml * refactor: rename utils to shared and deduplicate code - Rename utils package to shared - Add shared constants package - Deduplicate constants across packages - Address CodeRabbit review feedback * fix: resolve SonarQube issues and add safety guards - Fix all 73 SonarQube OPEN issues - Add nil guards for resourceMonitor, backpressure, metricsCollector - Implement io.Closer for headerFileReader - Propagate errors from processing helpers - Add metrics and templates packages - Improve error handling across codebase * test: improve test infrastructure and coverage - Add benchmarks for cli, fileproc, metrics - Improve test coverage for cli, fileproc, config - Refactor tests with helper functions - Add shared test constants - Fix test function naming conventions - Reduce cognitive complexity in benchmark tests * docs: update documentation and configuration examples - Update CLAUDE.md with current project state - Refresh README with new features - Add usage and configuration examples - Add SonarQube project configuration - Consolidate config.example.yaml * fix: resolve shellcheck warnings in scripts - Use ./*.go instead of *.go to prevent dash-prefixed filenames from being interpreted as options (SC2035) - Remove unreachable return statement after exit (SC2317) - Remove obsolete gibidiutils/ directory reference * chore(deps): upgrade go dependencies * chore(lint): megalinter fixes * fix: improve test coverage and fix file descriptor leaks - Add defer r.Close() to fix pipe file descriptor leaks in benchmark tests - Refactor TestProcessorConfigureFileTypes with helper functions and assertions - Refactor TestProcessorLogFinalStats with output capture and keyword verification - Use shared constants instead of literal strings (TestFilePNG, FormatMarkdown, etc.) - Reduce cognitive complexity by extracting helper functions * fix: align test comments with function names Remove underscores from test comments to match actual function names: - benchmark/benchmark_test.go (2 fixes) - fileproc/filetypes_config_test.go (4 fixes) - fileproc/filetypes_registry_test.go (6 fixes) - fileproc/processor_test.go (6 fixes) - fileproc/resource_monitor_types_test.go (4 fixes) - fileproc/writer_test.go (3 fixes) * fix: various test improvements and bug fixes - Remove duplicate maxCacheSize check in filetypes_registry_test.go - Shorten long comment in processor_test.go to stay under 120 chars - Remove flaky time.Sleep in collector_test.go, use >= 0 assertion - Close pipe reader in benchmark_test.go to fix file descriptor leak - Use ContinueOnError in flags_test.go to match ResetFlags behavior - Add nil check for p.ui in processor_workers.go before UpdateProgress - Fix resource_monitor_validation_test.go by setting hardMemoryLimitBytes directly * chore(yaml): add missing document start markers Add --- document start to YAML files to satisfy yamllint: - .github/workflows/codeql.yml - .github/workflows/build-test-publish.yml - .github/workflows/security.yml - .github/actions/setup/action.yml * fix: guard nil resourceMonitor and fix test deadlock - Guard resourceMonitor before CreateFileProcessingContext call - Add ui.UpdateProgress on emergency stop and path error returns - Fix potential deadlock in TestProcessFile using wg.Go with defer close
This commit is contained in:
@@ -9,21 +9,11 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/ivuorinen/gibidify/config"
|
||||
"github.com/ivuorinen/gibidify/gibidiutils"
|
||||
)
|
||||
|
||||
const (
|
||||
// StreamChunkSize is the size of chunks when streaming large files (64KB).
|
||||
StreamChunkSize = 65536
|
||||
// StreamThreshold is the file size above which we use streaming (1MB).
|
||||
StreamThreshold = 1048576
|
||||
// MaxMemoryBuffer is the maximum memory to use for buffering content (10MB).
|
||||
MaxMemoryBuffer = 10485760
|
||||
"github.com/ivuorinen/gibidify/shared"
|
||||
)
|
||||
|
||||
// WriteRequest represents the content to be written.
|
||||
@@ -32,26 +22,7 @@ type WriteRequest struct {
|
||||
Content string
|
||||
IsStream bool
|
||||
Reader io.Reader
|
||||
}
|
||||
|
||||
// multiReaderCloser wraps an io.Reader with a Close method that closes underlying closers.
|
||||
type multiReaderCloser struct {
|
||||
reader io.Reader
|
||||
closers []io.Closer
|
||||
}
|
||||
|
||||
func (m *multiReaderCloser) Read(p []byte) (n int, err error) {
|
||||
return m.reader.Read(p)
|
||||
}
|
||||
|
||||
func (m *multiReaderCloser) Close() error {
|
||||
var firstErr error
|
||||
for _, c := range m.closers {
|
||||
if err := c.Close(); err != nil && firstErr == nil {
|
||||
firstErr = err
|
||||
}
|
||||
}
|
||||
return firstErr
|
||||
Size int64 // File size for streaming files
|
||||
}
|
||||
|
||||
// FileProcessor handles file processing operations.
|
||||
@@ -65,7 +36,7 @@ type FileProcessor struct {
|
||||
func NewFileProcessor(rootPath string) *FileProcessor {
|
||||
return &FileProcessor{
|
||||
rootPath: rootPath,
|
||||
sizeLimit: config.GetFileSizeLimit(),
|
||||
sizeLimit: config.FileSizeLimit(),
|
||||
resourceMonitor: NewResourceMonitor(),
|
||||
}
|
||||
}
|
||||
@@ -74,45 +45,19 @@ func NewFileProcessor(rootPath string) *FileProcessor {
|
||||
func NewFileProcessorWithMonitor(rootPath string, monitor *ResourceMonitor) *FileProcessor {
|
||||
return &FileProcessor{
|
||||
rootPath: rootPath,
|
||||
sizeLimit: config.GetFileSizeLimit(),
|
||||
sizeLimit: config.FileSizeLimit(),
|
||||
resourceMonitor: monitor,
|
||||
}
|
||||
}
|
||||
|
||||
// checkContextCancellation checks if context is cancelled and logs an error if so.
|
||||
// Returns true if context is cancelled, false otherwise.
|
||||
func (p *FileProcessor) checkContextCancellation(ctx context.Context, filePath, stage string) bool {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
// Format stage with leading space if provided
|
||||
stageMsg := stage
|
||||
if stage != "" {
|
||||
stageMsg = " " + stage
|
||||
}
|
||||
gibidiutils.LogErrorf(
|
||||
gibidiutils.NewStructuredError(
|
||||
gibidiutils.ErrorTypeValidation,
|
||||
gibidiutils.CodeResourceLimitTimeout,
|
||||
fmt.Sprintf("file processing cancelled%s", stageMsg),
|
||||
filePath,
|
||||
nil,
|
||||
),
|
||||
"File processing cancelled%s: %s",
|
||||
stageMsg,
|
||||
filePath,
|
||||
)
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// ProcessFile reads the file at filePath and sends a formatted output to outCh.
|
||||
// It automatically chooses between loading the entire file or streaming based on file size.
|
||||
func ProcessFile(filePath string, outCh chan<- WriteRequest, rootPath string) {
|
||||
processor := NewFileProcessor(rootPath)
|
||||
ctx := context.Background()
|
||||
processor.ProcessWithContext(ctx, filePath, outCh)
|
||||
if err := processor.ProcessWithContext(ctx, filePath, outCh); err != nil {
|
||||
shared.LogErrorf(err, shared.FileProcessingMsgFailedToProcess, filePath)
|
||||
}
|
||||
}
|
||||
|
||||
// ProcessFileWithMonitor processes a file using a shared resource monitor.
|
||||
@@ -122,19 +67,25 @@ func ProcessFileWithMonitor(
|
||||
outCh chan<- WriteRequest,
|
||||
rootPath string,
|
||||
monitor *ResourceMonitor,
|
||||
) {
|
||||
) error {
|
||||
if monitor == nil {
|
||||
monitor = NewResourceMonitor()
|
||||
}
|
||||
processor := NewFileProcessorWithMonitor(rootPath, monitor)
|
||||
processor.ProcessWithContext(ctx, filePath, outCh)
|
||||
|
||||
return processor.ProcessWithContext(ctx, filePath, outCh)
|
||||
}
|
||||
|
||||
// Process handles file processing with the configured settings.
|
||||
func (p *FileProcessor) Process(filePath string, outCh chan<- WriteRequest) {
|
||||
ctx := context.Background()
|
||||
p.ProcessWithContext(ctx, filePath, outCh)
|
||||
if err := p.ProcessWithContext(ctx, filePath, outCh); err != nil {
|
||||
shared.LogErrorf(err, shared.FileProcessingMsgFailedToProcess, filePath)
|
||||
}
|
||||
}
|
||||
|
||||
// ProcessWithContext handles file processing with context and resource monitoring.
|
||||
func (p *FileProcessor) ProcessWithContext(ctx context.Context, filePath string, outCh chan<- WriteRequest) {
|
||||
func (p *FileProcessor) ProcessWithContext(ctx context.Context, filePath string, outCh chan<- WriteRequest) error {
|
||||
// Create file processing context with timeout
|
||||
fileCtx, fileCancel := p.resourceMonitor.CreateFileProcessingContext(ctx)
|
||||
defer fileCancel()
|
||||
@@ -142,50 +93,51 @@ func (p *FileProcessor) ProcessWithContext(ctx context.Context, filePath string,
|
||||
// Wait for rate limiting
|
||||
if err := p.resourceMonitor.WaitForRateLimit(fileCtx); err != nil {
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
gibidiutils.LogErrorf(
|
||||
gibidiutils.NewStructuredError(
|
||||
gibidiutils.ErrorTypeValidation,
|
||||
gibidiutils.CodeResourceLimitTimeout,
|
||||
"file processing timeout during rate limiting",
|
||||
filePath,
|
||||
nil,
|
||||
),
|
||||
"File processing timeout during rate limiting: %s",
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"file processing timeout during rate limiting",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "File processing timeout during rate limiting: %s", filePath)
|
||||
|
||||
return structErr
|
||||
}
|
||||
return
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// Validate file and check resource limits
|
||||
fileInfo, err := p.validateFileWithLimits(fileCtx, filePath)
|
||||
if err != nil {
|
||||
return // Error already logged
|
||||
return err // Error already logged
|
||||
}
|
||||
|
||||
// Acquire read slot for concurrent processing
|
||||
if err := p.resourceMonitor.AcquireReadSlot(fileCtx); err != nil {
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
gibidiutils.LogErrorf(
|
||||
gibidiutils.NewStructuredError(
|
||||
gibidiutils.ErrorTypeValidation,
|
||||
gibidiutils.CodeResourceLimitTimeout,
|
||||
"file processing timeout waiting for read slot",
|
||||
filePath,
|
||||
nil,
|
||||
),
|
||||
"File processing timeout waiting for read slot: %s",
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"file processing timeout waiting for read slot",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "File processing timeout waiting for read slot: %s", filePath)
|
||||
|
||||
return structErr
|
||||
}
|
||||
return
|
||||
|
||||
return err
|
||||
}
|
||||
defer p.resourceMonitor.ReleaseReadSlot()
|
||||
|
||||
// Check hard memory limits before processing
|
||||
if err := p.resourceMonitor.CheckHardMemoryLimit(); err != nil {
|
||||
gibidiutils.LogErrorf(err, "Hard memory limit check failed for file: %s", filePath)
|
||||
return
|
||||
shared.LogErrorf(err, "Hard memory limit check failed for file: %s", filePath)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
// Get relative path
|
||||
@@ -193,61 +145,69 @@ func (p *FileProcessor) ProcessWithContext(ctx context.Context, filePath string,
|
||||
|
||||
// Process file with timeout
|
||||
processStart := time.Now()
|
||||
defer func() {
|
||||
// Record successful processing
|
||||
p.resourceMonitor.RecordFileProcessed(fileInfo.Size())
|
||||
logrus.Debugf("File processed in %v: %s", time.Since(processStart), filePath)
|
||||
}()
|
||||
|
||||
// Choose processing strategy based on file size
|
||||
if fileInfo.Size() <= StreamThreshold {
|
||||
p.processInMemoryWithContext(fileCtx, filePath, relPath, outCh)
|
||||
if fileInfo.Size() <= shared.FileProcessingStreamThreshold {
|
||||
err = p.processInMemoryWithContext(fileCtx, filePath, relPath, outCh)
|
||||
} else {
|
||||
p.processStreamingWithContext(fileCtx, filePath, relPath, outCh)
|
||||
err = p.processStreamingWithContext(fileCtx, filePath, relPath, outCh, fileInfo.Size())
|
||||
}
|
||||
|
||||
// Only record success if processing completed without error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Record successful processing only on success path
|
||||
p.resourceMonitor.RecordFileProcessed(fileInfo.Size())
|
||||
logger := shared.GetLogger()
|
||||
logger.Debugf("File processed in %v: %s", time.Since(processStart), filePath)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// validateFileWithLimits checks if the file can be processed with resource limits.
|
||||
func (p *FileProcessor) validateFileWithLimits(ctx context.Context, filePath string) (os.FileInfo, error) {
|
||||
// Check context cancellation
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return nil, ctx.Err()
|
||||
default:
|
||||
if err := shared.CheckContextCancellation(ctx, "file validation"); err != nil {
|
||||
return nil, fmt.Errorf("context check during file validation: %w", err)
|
||||
}
|
||||
|
||||
fileInfo, err := os.Stat(filePath)
|
||||
if err != nil {
|
||||
structErr := gibidiutils.WrapError(
|
||||
err, gibidiutils.ErrorTypeFileSystem, gibidiutils.CodeFSAccess,
|
||||
structErr := shared.WrapError(
|
||||
err,
|
||||
shared.ErrorTypeFileSystem,
|
||||
shared.CodeFSAccess,
|
||||
"failed to stat file",
|
||||
).WithFilePath(filePath)
|
||||
gibidiutils.LogErrorf(structErr, "Failed to stat file %s", filePath)
|
||||
shared.LogErrorf(structErr, "Failed to stat file %s", filePath)
|
||||
|
||||
return nil, structErr
|
||||
}
|
||||
|
||||
// Check traditional size limit
|
||||
if fileInfo.Size() > p.sizeLimit {
|
||||
filesizeContext := map[string]interface{}{
|
||||
c := map[string]any{
|
||||
"file_size": fileInfo.Size(),
|
||||
"size_limit": p.sizeLimit,
|
||||
}
|
||||
gibidiutils.LogErrorf(
|
||||
gibidiutils.NewStructuredError(
|
||||
gibidiutils.ErrorTypeValidation,
|
||||
gibidiutils.CodeValidationSize,
|
||||
fmt.Sprintf("file size (%d bytes) exceeds limit (%d bytes)", fileInfo.Size(), p.sizeLimit),
|
||||
filePath,
|
||||
filesizeContext,
|
||||
),
|
||||
"Skipping large file %s", filePath,
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeValidationSize,
|
||||
fmt.Sprintf(shared.FileProcessingMsgSizeExceeds, fileInfo.Size(), p.sizeLimit),
|
||||
filePath,
|
||||
c,
|
||||
)
|
||||
return nil, fmt.Errorf("file too large")
|
||||
shared.LogErrorf(structErr, "Skipping large file %s", filePath)
|
||||
|
||||
return nil, structErr
|
||||
}
|
||||
|
||||
// Check resource limits
|
||||
if err := p.resourceMonitor.ValidateFileProcessing(filePath, fileInfo.Size()); err != nil {
|
||||
gibidiutils.LogErrorf(err, "Resource limit validation failed for file: %s", filePath)
|
||||
shared.LogErrorf(err, "Resource limit validation failed for file: %s", filePath)
|
||||
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -260,6 +220,7 @@ func (p *FileProcessor) getRelativePath(filePath string) string {
|
||||
if err != nil {
|
||||
return filePath // Fallback
|
||||
}
|
||||
|
||||
return relPath
|
||||
}
|
||||
|
||||
@@ -268,38 +229,74 @@ func (p *FileProcessor) processInMemoryWithContext(
|
||||
ctx context.Context,
|
||||
filePath, relPath string,
|
||||
outCh chan<- WriteRequest,
|
||||
) {
|
||||
) error {
|
||||
// Check context before reading
|
||||
if p.checkContextCancellation(ctx, filePath, "") {
|
||||
return
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"file processing canceled",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "File processing canceled: %s", filePath)
|
||||
|
||||
return structErr
|
||||
default:
|
||||
}
|
||||
|
||||
// #nosec G304 - filePath is validated by walker
|
||||
content, err := os.ReadFile(filePath)
|
||||
content, err := os.ReadFile(filePath) // #nosec G304 - filePath is validated by walker
|
||||
if err != nil {
|
||||
structErr := gibidiutils.WrapError(
|
||||
err, gibidiutils.ErrorTypeProcessing, gibidiutils.CodeProcessingFileRead,
|
||||
structErr := shared.WrapError(
|
||||
err,
|
||||
shared.ErrorTypeProcessing,
|
||||
shared.CodeProcessingFileRead,
|
||||
"failed to read file",
|
||||
).WithFilePath(filePath)
|
||||
gibidiutils.LogErrorf(structErr, "Failed to read file %s", filePath)
|
||||
return
|
||||
shared.LogErrorf(structErr, "Failed to read file %s", filePath)
|
||||
|
||||
return structErr
|
||||
}
|
||||
|
||||
// Check context again after reading
|
||||
if p.checkContextCancellation(ctx, filePath, "after read") {
|
||||
return
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"file processing canceled after read",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "File processing canceled after read: %s", filePath)
|
||||
|
||||
return structErr
|
||||
default:
|
||||
}
|
||||
|
||||
// Check context before sending output
|
||||
if p.checkContextCancellation(ctx, filePath, "before output") {
|
||||
return
|
||||
}
|
||||
// Try to send the result, but respect context cancellation
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"file processing canceled before output",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "File processing canceled before output: %s", filePath)
|
||||
|
||||
outCh <- WriteRequest{
|
||||
return structErr
|
||||
case outCh <- WriteRequest{
|
||||
Path: relPath,
|
||||
Content: p.formatContent(relPath, string(content)),
|
||||
IsStream: false,
|
||||
Size: int64(len(content)),
|
||||
}:
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// processStreamingWithContext creates a streaming reader for large files with context awareness.
|
||||
@@ -307,58 +304,87 @@ func (p *FileProcessor) processStreamingWithContext(
|
||||
ctx context.Context,
|
||||
filePath, relPath string,
|
||||
outCh chan<- WriteRequest,
|
||||
) {
|
||||
size int64,
|
||||
) error {
|
||||
// Check context before creating reader
|
||||
if p.checkContextCancellation(ctx, filePath, "before streaming") {
|
||||
return
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"streaming processing canceled",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "Streaming processing canceled: %s", filePath)
|
||||
|
||||
return structErr
|
||||
default:
|
||||
}
|
||||
|
||||
reader := p.createStreamReaderWithContext(ctx, filePath, relPath)
|
||||
if reader == nil {
|
||||
return // Error already logged
|
||||
// Error already logged, create and return error
|
||||
return shared.NewStructuredError(
|
||||
shared.ErrorTypeProcessing,
|
||||
shared.CodeProcessingFileRead,
|
||||
"failed to create stream reader",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
}
|
||||
|
||||
// Check context before sending output
|
||||
if p.checkContextCancellation(ctx, filePath, "before streaming output") {
|
||||
// Close the reader to prevent file descriptor leak
|
||||
if closer, ok := reader.(io.Closer); ok {
|
||||
_ = closer.Close()
|
||||
}
|
||||
return
|
||||
}
|
||||
// Try to send the result, but respect context cancellation
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
structErr := shared.NewStructuredError(
|
||||
shared.ErrorTypeValidation,
|
||||
shared.CodeResourceLimitTimeout,
|
||||
"streaming processing canceled before output",
|
||||
filePath,
|
||||
nil,
|
||||
)
|
||||
shared.LogErrorf(structErr, "Streaming processing canceled before output: %s", filePath)
|
||||
|
||||
outCh <- WriteRequest{
|
||||
return structErr
|
||||
case outCh <- WriteRequest{
|
||||
Path: relPath,
|
||||
Content: "", // Empty since content is in Reader
|
||||
IsStream: true,
|
||||
Reader: reader,
|
||||
Size: size,
|
||||
}:
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// createStreamReaderWithContext creates a reader that combines header and file content with context awareness.
|
||||
func (p *FileProcessor) createStreamReaderWithContext(ctx context.Context, filePath, relPath string) io.Reader {
|
||||
func (p *FileProcessor) createStreamReaderWithContext(
|
||||
ctx context.Context, filePath, relPath string,
|
||||
) io.Reader {
|
||||
// Check context before opening file
|
||||
if p.checkContextCancellation(ctx, filePath, "before opening file") {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
}
|
||||
|
||||
// #nosec G304 - filePath is validated by walker
|
||||
file, err := os.Open(filePath)
|
||||
file, err := os.Open(filePath) // #nosec G304 - filePath is validated by walker
|
||||
if err != nil {
|
||||
structErr := gibidiutils.WrapError(
|
||||
err, gibidiutils.ErrorTypeProcessing, gibidiutils.CodeProcessingFileRead,
|
||||
structErr := shared.WrapError(
|
||||
err,
|
||||
shared.ErrorTypeProcessing,
|
||||
shared.CodeProcessingFileRead,
|
||||
"failed to open file for streaming",
|
||||
).WithFilePath(filePath)
|
||||
gibidiutils.LogErrorf(structErr, "Failed to open file for streaming %s", filePath)
|
||||
shared.LogErrorf(structErr, "Failed to open file for streaming %s", filePath)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
header := p.formatHeader(relPath)
|
||||
// Wrap in multiReaderCloser to ensure file is closed even on cancellation
|
||||
return &multiReaderCloser{
|
||||
reader: io.MultiReader(header, file),
|
||||
closers: []io.Closer{file},
|
||||
}
|
||||
|
||||
return newHeaderFileReader(header, file)
|
||||
}
|
||||
|
||||
// formatContent formats the file content with header.
|
||||
@@ -370,3 +396,66 @@ func (p *FileProcessor) formatContent(relPath, content string) string {
|
||||
func (p *FileProcessor) formatHeader(relPath string) io.Reader {
|
||||
return strings.NewReader(fmt.Sprintf("\n---\n%s\n", relPath))
|
||||
}
|
||||
|
||||
// headerFileReader wraps a MultiReader and closes the file when EOF is reached.
|
||||
type headerFileReader struct {
|
||||
reader io.Reader
|
||||
file *os.File
|
||||
mu sync.Mutex
|
||||
closed bool
|
||||
}
|
||||
|
||||
// newHeaderFileReader creates a new headerFileReader.
|
||||
func newHeaderFileReader(header io.Reader, file *os.File) *headerFileReader {
|
||||
return &headerFileReader{
|
||||
reader: io.MultiReader(header, file),
|
||||
file: file,
|
||||
}
|
||||
}
|
||||
|
||||
// Read implements io.Reader and closes the file on EOF.
|
||||
func (r *headerFileReader) Read(p []byte) (n int, err error) {
|
||||
n, err = r.reader.Read(p)
|
||||
if err == io.EOF {
|
||||
r.closeFile()
|
||||
// EOF is a sentinel value that must be passed through unchanged for io.Reader interface
|
||||
return n, err //nolint:wrapcheck // EOF must not be wrapped
|
||||
}
|
||||
if err != nil {
|
||||
return n, shared.WrapError(
|
||||
err, shared.ErrorTypeIO, shared.CodeIORead,
|
||||
"failed to read from header file reader",
|
||||
)
|
||||
}
|
||||
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// closeFile closes the file once.
|
||||
func (r *headerFileReader) closeFile() {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if !r.closed && r.file != nil {
|
||||
if err := r.file.Close(); err != nil {
|
||||
shared.LogError("Failed to close file", err)
|
||||
}
|
||||
r.closed = true
|
||||
}
|
||||
}
|
||||
|
||||
// Close implements io.Closer and ensures the underlying file is closed.
|
||||
// This allows explicit cleanup when consumers stop reading before EOF.
|
||||
func (r *headerFileReader) Close() error {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if r.closed || r.file == nil {
|
||||
return nil
|
||||
}
|
||||
err := r.file.Close()
|
||||
if err != nil {
|
||||
shared.LogError("Failed to close file", err)
|
||||
}
|
||||
r.closed = true
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user