on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

rename DoMerged => MergeFiles

Browse Source 
refact file extension validate
This commit is contained in:
eugeniy_ivanov 2023-01-17 12:09:58 +05:00
parent 3e128c5cba
commit 5367f3e85f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs
View File

@ -11,9 +11,9 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert
{
internal class ConvertToPdf
{
private readonly string[] fileExtension = { ".xlsx", ".xls", ".ods", ".odt", ".doc", ".docx", ".pdf" };
private readonly string[] filesExtensions = { ".xlsx", ".xls", ".ods", ".odt", ".doc", ".docx", ".pdf" };
public static void DoMergedAsync(IEnumerable<string> inputFiles, string outFile)
public static void MergeFiles(IEnumerable<string> inputFiles, string outFile)
{
using (FileStream stream = new FileStream(outFile, FileMode.Create))
using (Document doc = new Document())
@ -49,7 +49,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert
foreach (var file in filesNames)
{
var fileExt = Path.GetExtension(file);
if (fileExtension.All(fe => fileExt != fe))
if (!filesExtensions.Contains(fileExt))
{
throw new FileFormatException($"Файл с именем: {file} - неподдерживаемого формата. Он не может быть добавлен в список файлов для конвертации и слияния в общий файл программы бурения.");
}
@ -66,12 +66,11 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert
{
var fileExt = Path.GetExtension(fileName.inputFile);
if (fileExt != ".pdf")
{
//FileInfo fileInfo = new FileInfo(fileName.inputFile);
{
await StartConvertProcessAsync(fileName.inputFile, fileName.convertedFile, token);
}
}
DoMergedAsync(listFileNames.Select(c => c.convertedFile), resultPath);
MergeFiles(listFileNames.Select(c => c.convertedFile), resultPath);
}
}
}