Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using NPOI.SS.UserModel;
using NPOI.XWPF.UserModel;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -220,52 +219,19 @@ private string ExtractTextFromExcelFile(string fileName, byte[] fileContent)
using var workbook = WorkbookFactory.Create(stream);
var builder = new StringBuilder();
var sheetCount = Math.Min(workbook.NumberOfSheets, MaxExcelSheets);
var limitReached = false;

for (var sheetIndex = 0; sheetIndex < sheetCount; sheetIndex++)
{
if (limitReached || builder.Length >= MaxExtractedTextLength)
if (builder.Length >= MaxExtractedTextLength)
{
break;
}

var sheet = workbook.GetSheetAt(sheetIndex);
if (sheet == null)
{
continue;
}

var processedRows = 0;
foreach (IRow row in sheet)
var limitReached = TryAppendExcelSheet(sheet, builder);
if (limitReached)
{
if (processedRows >= MaxExcelRowsPerSheet || builder.Length >= MaxExtractedTextLength)
{
break;
}

var rowHasValue = false;
foreach (var cell in row.Cells.Take(MaxExcelCellsPerRow))
{
var value = GetCellText(cell);
if (string.IsNullOrWhiteSpace(value))
{
continue;
}

var separator = rowHasValue ? " | " : (builder.Length > 0 ? Environment.NewLine : null);
limitReached = AppendWithLimit(builder, value, MaxExtractedTextLength, separator);
rowHasValue = true;
if (limitReached)
{
break;
}
}

processedRows++;
if (limitReached)
{
break;
}
break;
}
}

Expand All @@ -278,6 +244,64 @@ private string ExtractTextFromExcelFile(string fileName, byte[] fileContent)
}
}

private static bool TryAppendExcelSheet(ISheet? sheet, StringBuilder builder)
{
if (sheet == null)
{
return false;
}

var processedRows = 0;
foreach (IRow row in sheet)
{
if (processedRows >= MaxExcelRowsPerSheet || builder.Length >= MaxExtractedTextLength)
{
break;
}

var limitReached = TryAppendExcelRow(row, builder);
processedRows++;
if (limitReached)
{
return true;
}
}

return builder.Length >= MaxExtractedTextLength;
}

private static bool TryAppendExcelRow(IRow row, StringBuilder builder)
{
var rowHasValue = false;
foreach (var cell in row.Cells.Take(MaxExcelCellsPerRow))
{
var value = GetCellText(cell);
if (string.IsNullOrWhiteSpace(value))
{
continue;
}

string? separator = null;
if (rowHasValue)
{
separator = " | ";
}
else if (builder.Length > 0)
{
separator = Environment.NewLine;
}

var limitReached = AppendWithLimit(builder, value, MaxExtractedTextLength, separator);
rowHasValue = true;
if (limitReached)
{
return true;
}
}

return false;
}

private static bool AppendWithLimit(StringBuilder builder, string? value, int maxLength, string? separator = null)
{
if (string.IsNullOrWhiteSpace(value))
Expand Down
Loading