- Remove DotNetZip package from PepLib.Core.csproj - Update DrawingReader, NestReader, and ZipHelper to use System.IO.Compression.ZipArchive - Simplify stream handling and improve resource disposal - Keep behavior consistent for loop/plate detection and extraction
99 lines
2.5 KiB
C#
99 lines
2.5 KiB
C#
using System;
|
|
using System.Diagnostics;
|
|
using System.IO;
|
|
using System.IO.Compression;
|
|
using System.Text.RegularExpressions;
|
|
|
|
namespace PepLib.IO
|
|
{
|
|
public sealed class DrawingReader
|
|
{
|
|
public Drawing Drawing { get; private set; }
|
|
|
|
public DrawingReader()
|
|
{
|
|
Drawing = new Drawing();
|
|
}
|
|
|
|
public DrawingReader(Drawing drawing)
|
|
{
|
|
Drawing = drawing;
|
|
}
|
|
|
|
public void Read(Stream stream)
|
|
{
|
|
using (var zip = new ZipArchive(stream, ZipArchiveMode.Read, leaveOpen: true))
|
|
{
|
|
foreach (var entry in zip.Entries)
|
|
{
|
|
using var entryStream = entry.Open();
|
|
var memstream = new MemoryStream();
|
|
entryStream.CopyTo(memstream);
|
|
memstream.Seek(0, SeekOrigin.Begin);
|
|
|
|
var extension = Path.GetExtension(entry.FullName);
|
|
|
|
switch (extension)
|
|
{
|
|
case ".dir":
|
|
LoadInfo(memstream);
|
|
memstream.Close();
|
|
continue;
|
|
}
|
|
|
|
if (Regex.IsMatch(extension, "loop-\\d\\d\\d"))
|
|
Drawing.Loops.Add(ReadLoop(entry.FullName, memstream));
|
|
|
|
memstream.Close();
|
|
}
|
|
}
|
|
|
|
Drawing.ResolveLoops();
|
|
}
|
|
|
|
public void Read(string nestFile)
|
|
{
|
|
if (!File.Exists(nestFile))
|
|
{
|
|
var msg = string.Format("File Not Found: {0}", nestFile);
|
|
throw new FileNotFoundException(msg);
|
|
}
|
|
|
|
Stream stream = null;
|
|
|
|
try
|
|
{
|
|
stream = new FileStream(nestFile, FileMode.Open);
|
|
Read(stream);
|
|
}
|
|
finally
|
|
{
|
|
if (stream != null)
|
|
stream.Close();
|
|
}
|
|
}
|
|
|
|
private void LoadInfo(Stream stream)
|
|
{
|
|
try
|
|
{
|
|
Drawing.Info = DrawingInfo.Load(stream);
|
|
}
|
|
catch (Exception exception)
|
|
{
|
|
Debug.WriteLine(exception.Message);
|
|
Debug.WriteLine(exception.StackTrace);
|
|
}
|
|
}
|
|
|
|
private Loop ReadLoop(string name, Stream stream)
|
|
{
|
|
var reader = new LoopReader();
|
|
reader.Read(name, stream);
|
|
|
|
return reader.Loop;
|
|
}
|
|
}
|
|
}
|
|
|