diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs index 7eaeff2ee..316463933 100644 --- a/Aaru.Core/Sidecar/BlockMedia.cs +++ b/Aaru.Core/Sidecar/BlockMedia.cs @@ -384,7 +384,7 @@ namespace Aaru.Core if(image is ITapeImage { IsTape: true } tapeImage) { - List tapePartitions = new List(); + List tapePartitions = new(); foreach(TapePartition tapePartition in tapeImage.TapePartitions) { @@ -457,7 +457,7 @@ namespace Aaru.Core EndProgress2(); } - List filesInPartition = new List(); + List filesInPartition = new(); foreach(TapeFile tapeFile in tapeImage.Files.Where(f => f.Partition == tapePartition.Number)) { @@ -577,7 +577,7 @@ namespace Aaru.Core Type = partitions[i].Type }; - List lstFs = new List(); + List lstFs = new(); foreach(IFilesystem plugin in plugins.PluginsList.Values) try @@ -632,7 +632,7 @@ namespace Aaru.Core Size = image.Info.Sectors * image.Info.SectorSize }; - List lstFs = new List(); + List lstFs = new(); foreach(IFilesystem plugin in plugins.PluginsList.Values) try @@ -869,7 +869,7 @@ namespace Aaru.Core (image.Info.Heads == 1 && (scpImage.Header.heads == 1 || scpImage.Header.heads == 2))) if(scpImage.Header.end + 1 >= image.Info.Cylinders) { - List scpBlockTrackTypes = new List(); + List scpBlockTrackTypes = new(); ulong currentSector = 0; Stream scpStream = scpFilter.GetDataForkStream(); @@ -976,7 +976,7 @@ namespace Aaru.Core if(kfImage.Info.Heads == image.Info.Heads) if(kfImage.Info.Cylinders >= image.Info.Cylinders) { - List kfBlockTrackTypes = new List(); + List kfBlockTrackTypes = new(); ulong currentSector = 0; @@ -994,8 +994,8 @@ namespace Aaru.Core format = kfImage.Format, Value = kfDir ? Path. - Combine(Path.GetFileName(Path.GetDirectoryName(kvp.Value.GetBasePath())), - kvp.Value.GetFilename()) : kvp.Value.GetFilename(), + Combine(Path.GetFileName(Path.GetDirectoryName(kvp.Value.BasePath)), + kvp.Value.Filename) : kvp.Value.Filename, offset = 0 } }; @@ -1063,7 +1063,7 @@ namespace Aaru.Core if(image.Info.Heads == dfiImage.Info.Heads) if(dfiImage.Info.Cylinders >= image.Info.Cylinders) { - List dfiBlockTrackTypes = new List(); + List dfiBlockTrackTypes = new(); ulong currentSector = 0; Stream dfiStream = dfiFilter.GetDataForkStream(); diff --git a/Aaru.Filters/AppleSingle.cs b/Aaru.Filters/AppleSingle.cs index 03f2c5a51..99b9b9f1c 100644 --- a/Aaru.Filters/AppleSingle.cs +++ b/Aaru.Filters/AppleSingle.cs @@ -74,20 +74,17 @@ namespace Aaru.Filters { 0x56, 0x41, 0x58, 0x20, 0x56, 0x4D, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }; - string _basePath; - byte[] _bytes; - DateTime _creationTime; - Entry _dataFork; - Header _header; - bool _isBytes, _isStream, _isPath, _opened; - DateTime _lastWriteTime; - Entry _rsrcFork; - Stream _stream; + byte[] _bytes; + Entry _dataFork; + Header _header; + bool _isBytes, _isStream, _isPath; + Entry _rsrcFork; + Stream _stream; /// public string Name => "AppleSingle"; /// - public Guid Id => new Guid("A69B20E8-F4D3-42BB-BD2B-4A7263394A05"); + public Guid Id => new("A69B20E8-F4D3-42BB-BD2B-4A7263394A05"); /// public string Author => "Natalia Portillo"; @@ -99,17 +96,17 @@ namespace Aaru.Filters _isBytes = false; _isStream = false; _isPath = false; - _opened = false; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _dataFork.length; + public long DataForkLength => _dataFork.length; /// public Stream GetDataForkStream() @@ -124,29 +121,29 @@ namespace Aaru.Filters return new OffsetStream(_stream, _dataFork.offset, _dataFork.offset + _dataFork.length - 1); if(_isPath) - return new OffsetStream(_basePath, FileMode.Open, FileAccess.Read, _dataFork.offset, + return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataFork.offset, _dataFork.offset + _dataFork.length - 1); return null; } /// - public string GetFilename() => Path.GetFileName(_basePath); + public string Filename => System.IO.Path.GetFileName(BasePath); /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _dataFork.length + _rsrcFork.length; + public long Length => _dataFork.length + _rsrcFork.length; /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public string GetPath() => _basePath; + public string Path => BasePath; /// - public long GetResourceForkLength() => _rsrcFork.length; + public long ResourceForkLength => _rsrcFork.length; /// public Stream GetResourceForkStream() @@ -161,14 +158,14 @@ namespace Aaru.Filters return new OffsetStream(_stream, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1); if(_isPath) - return new OffsetStream(_basePath, FileMode.Open, FileAccess.Read, _rsrcFork.offset, + return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1); return null; } /// - public bool HasResourceFork() => _rsrcFork.length > 0; + public bool HasResourceFork => _rsrcFork.length > 0; /// public bool Identify(byte[] buffer) @@ -220,7 +217,7 @@ namespace Aaru.Filters } /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } /// public void Open(byte[] buffer) @@ -241,8 +238,8 @@ namespace Aaru.Filters entries[i] = Marshal.ByteArrayToStructureBigEndian(entry); } - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; foreach(Entry entry in entries) switch((AppleSingleEntryID)entry.id) @@ -258,8 +255,8 @@ namespace Aaru.Filters FileDates dates = Marshal.ByteArrayToStructureBigEndian(datesB); - _creationTime = DateHandlers.UnixUnsignedToDateTime(dates.creationDate); - _lastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate); + CreationTime = DateHandlers.UnixUnsignedToDateTime(dates.creationDate); + LastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate); break; case AppleSingleEntryID.FileInfo: @@ -271,28 +268,28 @@ namespace Aaru.Filters { MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(macinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(macinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); } else if(_proDosHome.SequenceEqual(_header.homeFilesystem)) { ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); } else if(_unixHome.SequenceEqual(_header.homeFilesystem)) { UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); - _lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); + CreationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); + LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); } else if(_dosHome.SequenceEqual(_header.homeFilesystem)) { DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _lastWriteTime = + LastWriteTime = DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime); } @@ -304,7 +301,7 @@ namespace Aaru.Filters } ms.Close(); - _opened = true; + Opened = true; _isBytes = true; _bytes = buffer; } @@ -327,8 +324,8 @@ namespace Aaru.Filters entries[i] = Marshal.ByteArrayToStructureBigEndian(entry); } - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; foreach(Entry entry in entries) switch((AppleSingleEntryID)entry.id) @@ -344,8 +341,8 @@ namespace Aaru.Filters FileDates dates = Marshal.ByteArrayToStructureBigEndian(datesB); - _creationTime = DateHandlers.MacToDateTime(dates.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate); + CreationTime = DateHandlers.MacToDateTime(dates.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate); break; case AppleSingleEntryID.FileInfo: @@ -357,28 +354,28 @@ namespace Aaru.Filters { MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(macinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(macinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); } else if(_proDosHome.SequenceEqual(_header.homeFilesystem)) { ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); } else if(_unixHome.SequenceEqual(_header.homeFilesystem)) { UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); - _lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); + CreationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); + LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); } else if(_dosHome.SequenceEqual(_header.homeFilesystem)) { DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _lastWriteTime = + LastWriteTime = DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime); } @@ -390,7 +387,7 @@ namespace Aaru.Filters } stream.Seek(0, SeekOrigin.Begin); - _opened = true; + Opened = true; _isStream = true; _stream = stream; } @@ -414,8 +411,8 @@ namespace Aaru.Filters entries[i] = Marshal.ByteArrayToStructureBigEndian(entry); } - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; foreach(Entry entry in entries) switch((AppleSingleEntryID)entry.id) @@ -431,8 +428,8 @@ namespace Aaru.Filters FileDates dates = Marshal.ByteArrayToStructureBigEndian(datesB); - _creationTime = DateHandlers.MacToDateTime(dates.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate); + CreationTime = DateHandlers.MacToDateTime(dates.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate); break; case AppleSingleEntryID.FileInfo: @@ -444,28 +441,28 @@ namespace Aaru.Filters { MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(macinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(macinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate); } else if(_proDosHome.SequenceEqual(_header.homeFilesystem)) { ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); - _lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); + CreationTime = DateHandlers.MacToDateTime(prodosinfo.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate); } else if(_unixHome.SequenceEqual(_header.homeFilesystem)) { UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _creationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); - _lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); + CreationTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate); + LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate); } else if(_dosHome.SequenceEqual(_header.homeFilesystem)) { DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian(finfo); - _lastWriteTime = + LastWriteTime = DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime); } @@ -477,9 +474,9 @@ namespace Aaru.Filters } fs.Close(); - _opened = true; - _isPath = true; - _basePath = path; + Opened = true; + _isPath = true; + BasePath = path; } enum AppleSingleEntryID : uint diff --git a/Aaru.Filters/BZip2.cs b/Aaru.Filters/BZip2.cs index fe2a9aa5f..f32d82a9f 100644 --- a/Aaru.Filters/BZip2.cs +++ b/Aaru.Filters/BZip2.cs @@ -42,18 +42,13 @@ namespace Aaru.Filters /// Decompress bz2 files while reading public class BZip2 : IFilter { - string _basePath; - DateTime _creationTime; - Stream _dataStream; - long _decompressedSize; - Stream _innerStream; - DateTime _lastWriteTime; - bool _opened; + Stream _dataStream; + Stream _innerStream; /// public string Name => "BZip2"; /// - public Guid Id => new Guid("FCCFB0C3-32EF-40D8-9714-2333F6AC72A9"); + public Guid Id => new("FCCFB0C3-32EF-40D8-9714-2333F6AC72A9"); /// public string Author => "Natalia Portillo"; @@ -62,24 +57,24 @@ namespace Aaru.Filters { _dataStream?.Close(); _dataStream = null; - _basePath = null; - _opened = false; + BasePath = null; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// public Stream GetDataForkStream() => _innerStream; /// - public string GetPath() => _basePath; + public string Path => BasePath; /// public Stream GetResourceForkStream() => null; /// - public bool HasResourceFork() => false; + public bool HasResourceFork => false; /// public bool Identify(byte[] buffer) @@ -158,70 +153,73 @@ namespace Aaru.Filters /// public void Open(byte[] buffer) { - _dataStream = new MemoryStream(buffer); - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; - _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); - _decompressedSize = _innerStream.Length; - _opened = true; + _dataStream = new MemoryStream(buffer); + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; + _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); + DataForkLength = _innerStream.Length; + Opened = true; } /// public void Open(Stream stream) { - _dataStream = stream; - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; - _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); - _decompressedSize = _innerStream.Length; - _opened = true; + _dataStream = stream; + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; + _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); + DataForkLength = _innerStream.Length; + Opened = true; } /// public void Open(string path) { _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read); - _basePath = Path.GetFullPath(path); + BasePath = System.IO.Path.GetFullPath(path); var fi = new FileInfo(path); - _creationTime = fi.CreationTimeUtc; - _lastWriteTime = fi.LastWriteTimeUtc; - _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); - _decompressedSize = _innerStream.Length; - _opened = true; + CreationTime = fi.CreationTimeUtc; + LastWriteTime = fi.LastWriteTimeUtc; + _innerStream = new ForcedSeekStream(_dataStream, CompressionMode.Decompress, false); + DataForkLength = _innerStream.Length; + Opened = true; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _decompressedSize; + public long DataForkLength { get; private set; } /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _decompressedSize; + public long Length => DataForkLength; /// - public long GetResourceForkLength() => 0; + public long ResourceForkLength => 0; /// - public string GetFilename() + public string Filename { - if(_basePath?.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase) == true) - return _basePath.Substring(0, _basePath.Length - 4); + get + { + if(BasePath?.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase) == true) + return BasePath.Substring(0, BasePath.Length - 4); - return _basePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true - ? _basePath.Substring(0, _basePath.Length - 6) : _basePath; + return BasePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true + ? BasePath.Substring(0, BasePath.Length - 6) : BasePath; + } } /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } } } \ No newline at end of file diff --git a/Aaru.Filters/GZip.cs b/Aaru.Filters/GZip.cs index 705bb9a9a..b1e5aa99d 100644 --- a/Aaru.Filters/GZip.cs +++ b/Aaru.Filters/GZip.cs @@ -42,18 +42,14 @@ namespace Aaru.Filters /// Decompress gzip files while reading public sealed class GZip : IFilter { - string _basePath; - DateTime _creationTime; - Stream _dataStream; - uint _decompressedSize; - DateTime _lastWriteTime; - bool _opened; - Stream _zStream; + Stream _dataStream; + uint _decompressedSize; + Stream _zStream; /// public string Name => "GZip"; /// - public Guid Id => new Guid("F4996661-4A29-42C9-A2C7-3904EF40F3B0"); + public Guid Id => new("F4996661-4A29-42C9-A2C7-3904EF40F3B0"); /// public string Author => "Natalia Portillo"; @@ -62,24 +58,24 @@ namespace Aaru.Filters { _dataStream?.Close(); _dataStream = null; - _basePath = null; - _opened = false; + BasePath = null; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// public Stream GetDataForkStream() => _zStream; /// - public string GetPath() => _basePath; + public string Path => BasePath; /// public Stream GetResourceForkStream() => null; /// - public bool HasResourceFork() => false; + public bool HasResourceFork => false; /// public bool Identify(byte[] buffer) => buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08; @@ -119,7 +115,7 @@ namespace Aaru.Filters byte[] isizeB = new byte[4]; _dataStream = new MemoryStream(buffer); - _basePath = null; + BasePath = null; _dataStream.Seek(4, SeekOrigin.Begin); _dataStream.Read(mtimeB, 0, 4); @@ -131,12 +127,12 @@ namespace Aaru.Filters uint isize = BitConverter.ToUInt32(isizeB, 0); _decompressedSize = isize; - _creationTime = DateHandlers.UnixUnsignedToDateTime(mtime); - _lastWriteTime = _creationTime; + CreationTime = DateHandlers.UnixUnsignedToDateTime(mtime); + LastWriteTime = CreationTime; _zStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); - _opened = true; + Opened = true; } /// @@ -146,7 +142,7 @@ namespace Aaru.Filters byte[] isizeB = new byte[4]; _dataStream = stream; - _basePath = null; + BasePath = null; _dataStream.Seek(4, SeekOrigin.Begin); _dataStream.Read(mtimeB, 0, 4); @@ -158,12 +154,12 @@ namespace Aaru.Filters uint isize = BitConverter.ToUInt32(isizeB, 0); _decompressedSize = isize; - _creationTime = DateHandlers.UnixUnsignedToDateTime(mtime); - _lastWriteTime = _creationTime; + CreationTime = DateHandlers.UnixUnsignedToDateTime(mtime); + LastWriteTime = CreationTime; _zStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); - _opened = true; + Opened = true; } /// @@ -173,7 +169,7 @@ namespace Aaru.Filters byte[] isizeB = new byte[4]; _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read); - _basePath = Path.GetFullPath(path); + BasePath = System.IO.Path.GetFullPath(path); _dataStream.Seek(4, SeekOrigin.Begin); _dataStream.Read(mtimeB, 0, 4); @@ -186,41 +182,44 @@ namespace Aaru.Filters _decompressedSize = isize; var fi = new FileInfo(path); - _creationTime = fi.CreationTimeUtc; - _lastWriteTime = DateHandlers.UnixUnsignedToDateTime(mtime); + CreationTime = fi.CreationTimeUtc; + LastWriteTime = DateHandlers.UnixUnsignedToDateTime(mtime); _zStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); - _opened = true; + Opened = true; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _decompressedSize; + public long DataForkLength => _decompressedSize; /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _decompressedSize; + public long Length => _decompressedSize; /// - public long GetResourceForkLength() => 0; + public long ResourceForkLength => 0; /// - public string GetFilename() + public string Filename { - if(_basePath?.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase) == true) - return _basePath.Substring(0, _basePath.Length - 3); + get + { + if(BasePath?.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase) == true) + return BasePath.Substring(0, BasePath.Length - 3); - return _basePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true - ? _basePath.Substring(0, _basePath.Length - 5) : _basePath; + return BasePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true + ? BasePath.Substring(0, BasePath.Length - 5) : BasePath; + } } /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } } } \ No newline at end of file diff --git a/Aaru.Filters/LZip.cs b/Aaru.Filters/LZip.cs index 0de57f6fa..af0bcd561 100644 --- a/Aaru.Filters/LZip.cs +++ b/Aaru.Filters/LZip.cs @@ -42,18 +42,13 @@ namespace Aaru.Filters /// Decompress lzip files while reading public sealed class LZip : IFilter { - string _basePath; - DateTime _creationTime; - Stream _dataStream; - long _decompressedSize; - Stream _innerStream; - DateTime _lastWriteTime; - bool _opened; + Stream _dataStream; + Stream _innerStream; /// public string Name => "LZip"; /// - public Guid Id => new Guid("09D715E9-20C0-48B1-A8D9-D8897CEC57C9"); + public Guid Id => new("09D715E9-20C0-48B1-A8D9-D8897CEC57C9"); /// public string Author => "Natalia Portillo"; @@ -62,24 +57,24 @@ namespace Aaru.Filters { _dataStream?.Close(); _dataStream = null; - _basePath = null; - _opened = false; + BasePath = null; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// public Stream GetDataForkStream() => _innerStream; /// - public string GetPath() => _basePath; + public string Path => BasePath; /// public Stream GetResourceForkStream() => null; /// - public bool HasResourceFork() => false; + public bool HasResourceFork => false; /// public bool Identify(byte[] buffer) => buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && @@ -118,80 +113,83 @@ namespace Aaru.Filters /// public void Open(byte[] buffer) { - _dataStream = new MemoryStream(buffer); - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; - _decompressedSize = BitConverter.ToInt64(buffer, buffer.Length - 16); + _dataStream = new MemoryStream(buffer); + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; + DataForkLength = BitConverter.ToInt64(buffer, buffer.Length - 16); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream, CompressionMode.Decompress); - _opened = true; + Opened = true; } /// public void Open(Stream stream) { - _dataStream = stream; - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + _dataStream = stream; + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; byte[] tmp = new byte[8]; _dataStream.Seek(-16, SeekOrigin.End); _dataStream.Read(tmp, 0, 8); - _decompressedSize = BitConverter.ToInt64(tmp, 0); + DataForkLength = BitConverter.ToInt64(tmp, 0); _dataStream.Seek(0, SeekOrigin.Begin); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); - _opened = true; + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream, CompressionMode.Decompress); + Opened = true; } /// public void Open(string path) { _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read); - _basePath = Path.GetFullPath(path); + BasePath = System.IO.Path.GetFullPath(path); var fi = new FileInfo(path); - _creationTime = fi.CreationTimeUtc; - _lastWriteTime = fi.LastWriteTimeUtc; + CreationTime = fi.CreationTimeUtc; + LastWriteTime = fi.LastWriteTimeUtc; byte[] tmp = new byte[8]; _dataStream.Seek(-16, SeekOrigin.End); _dataStream.Read(tmp, 0, 8); - _decompressedSize = BitConverter.ToInt64(tmp, 0); + DataForkLength = BitConverter.ToInt64(tmp, 0); _dataStream.Seek(0, SeekOrigin.Begin); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream, CompressionMode.Decompress); - _opened = true; + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream, CompressionMode.Decompress); + Opened = true; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _decompressedSize; + public long DataForkLength { get; private set; } /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _decompressedSize; + public long Length => DataForkLength; /// - public long GetResourceForkLength() => 0; + public long ResourceForkLength => 0; /// - public string GetFilename() + public string Filename { - if(_basePath?.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase) == true) - return _basePath.Substring(0, _basePath.Length - 3); + get + { + if(BasePath?.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase) == true) + return BasePath.Substring(0, BasePath.Length - 3); - return _basePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true - ? _basePath.Substring(0, _basePath.Length - 5) : _basePath; + return BasePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true + ? BasePath.Substring(0, BasePath.Length - 5) : BasePath; + } } /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } } } \ No newline at end of file diff --git a/Aaru.Filters/MacBinary.cs b/Aaru.Filters/MacBinary.cs index 8cc17c004..cac0416d9 100644 --- a/Aaru.Filters/MacBinary.cs +++ b/Aaru.Filters/MacBinary.cs @@ -46,21 +46,17 @@ namespace Aaru.Filters public sealed class MacBinary : IFilter { const uint MAGIC = 0x6D42494E; - string _basePath; byte[] _bytes; - DateTime _creationTime; long _dataForkOff; - string _filename; Header _header; - bool _isBytes, _isStream, _isPath, _opened; - DateTime _lastWriteTime; + bool _isBytes, _isStream, _isPath; long _rsrcForkOff; Stream _stream; /// public string Name => "MacBinary"; /// - public Guid Id => new Guid("D7C321D3-E51F-45DF-A150-F6BFDF0D7704"); + public Guid Id => new("D7C321D3-E51F-45DF-A150-F6BFDF0D7704"); /// public string Author => "Natalia Portillo"; @@ -72,17 +68,17 @@ namespace Aaru.Filters _isBytes = false; _isStream = false; _isPath = false; - _opened = false; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _header.dataLength; + public long DataForkLength => _header.dataLength; /// public Stream GetDataForkStream() @@ -97,29 +93,29 @@ namespace Aaru.Filters return new OffsetStream(_stream, _dataForkOff, _dataForkOff + _header.dataLength - 1); if(_isPath) - return new OffsetStream(_basePath, FileMode.Open, FileAccess.Read, _dataForkOff, + return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataForkOff, _dataForkOff + _header.dataLength - 1); return null; } /// - public string GetFilename() => _filename; + public string Filename { get; private set; } /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _header.dataLength + _header.resourceLength; + public long Length => _header.dataLength + _header.resourceLength; /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public string GetPath() => _basePath; + public string Path => BasePath; /// - public long GetResourceForkLength() => _header.resourceLength; + public long ResourceForkLength => _header.resourceLength; /// public Stream GetResourceForkStream() @@ -134,14 +130,14 @@ namespace Aaru.Filters return new OffsetStream(_stream, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1); if(_isPath) - return new OffsetStream(_basePath, FileMode.Open, FileAccess.Read, _rsrcForkOff, + return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1); return null; } /// - public bool HasResourceFork() => _header.resourceLength > 0; + public bool HasResourceFork => _header.resourceLength > 0; /// public bool Identify(byte[] buffer) @@ -202,7 +198,7 @@ namespace Aaru.Filters } /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } /// public void Open(byte[] buffer) @@ -228,12 +224,12 @@ namespace Aaru.Filters _rsrcForkOff = blocks * 128; - _filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); - _creationTime = DateHandlers.MacToDateTime(_header.creationTime); - _lastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); + Filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); + CreationTime = DateHandlers.MacToDateTime(_header.creationTime); + LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); ms.Close(); - _opened = true; + Opened = true; _isBytes = true; _bytes = buffer; } @@ -261,12 +257,12 @@ namespace Aaru.Filters _rsrcForkOff = blocks * 128; - _filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); - _creationTime = DateHandlers.MacToDateTime(_header.creationTime); - _lastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); + Filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); + CreationTime = DateHandlers.MacToDateTime(_header.creationTime); + LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); stream.Seek(0, SeekOrigin.Begin); - _opened = true; + Opened = true; _isStream = true; _stream = stream; } @@ -295,14 +291,14 @@ namespace Aaru.Filters _rsrcForkOff = blocks * 128; - _filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); - _creationTime = DateHandlers.MacToDateTime(_header.creationTime); - _lastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); + Filename = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh")); + CreationTime = DateHandlers.MacToDateTime(_header.creationTime); + LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime); fs.Close(); - _opened = true; - _isPath = true; - _basePath = path; + Opened = true; + _isPath = true; + BasePath = path; } [StructLayout(LayoutKind.Sequential, Pack = 1)] diff --git a/Aaru.Filters/PCExchange.cs b/Aaru.Filters/PCExchange.cs index 53826bd45..9e8a51b13 100644 --- a/Aaru.Filters/PCExchange.cs +++ b/Aaru.Filters/PCExchange.cs @@ -51,60 +51,54 @@ namespace Aaru.Filters const string FILE_ID = "FILEID.DAT"; const string FINDER_INFO = "FINDER.DAT"; const string RESOURCES = "RESOURCE.FRK"; - string _basePath; - DateTime _creationTime; - long _dataLen; string _dataPath; - DateTime _lastWriteTime; - bool _opened; - long _rsrcLen; string _rsrcPath; /// public string Name => "PCExchange"; /// - public Guid Id => new Guid("9264EB9F-D634-4F9B-BE12-C24CD44988C6"); + public Guid Id => new("9264EB9F-D634-4F9B-BE12-C24CD44988C6"); /// public string Author => "Natalia Portillo"; /// - public void Close() => _opened = false; + public void Close() => Opened = false; /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _dataLen; + public long DataForkLength { get; private set; } /// public Stream GetDataForkStream() => new FileStream(_dataPath, FileMode.Open, FileAccess.Read); /// - public string GetFilename() => Path.GetFileName(_basePath); + public string Filename => System.IO.Path.GetFileName(BasePath); /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _dataLen + _rsrcLen; + public long Length => DataForkLength + ResourceForkLength; /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public string GetPath() => _basePath; + public string Path => BasePath; /// - public long GetResourceForkLength() => _rsrcLen; + public long ResourceForkLength { get; private set; } /// public Stream GetResourceForkStream() => new FileStream(_rsrcPath, FileMode.Open, FileAccess.Read); /// - public bool HasResourceFork() => _rsrcPath != null; + public bool HasResourceFork => _rsrcPath != null; /// public bool Identify(byte[] buffer) => false; @@ -115,23 +109,23 @@ namespace Aaru.Filters /// public bool Identify(string path) { - string parentFolder = Path.GetDirectoryName(path); + string parentFolder = System.IO.Path.GetDirectoryName(path); parentFolder ??= ""; - if(!File.Exists(Path.Combine(parentFolder, FINDER_INFO))) + if(!File.Exists(System.IO.Path.Combine(parentFolder, FINDER_INFO))) return false; - if(!Directory.Exists(Path.Combine(parentFolder, RESOURCES))) + if(!Directory.Exists(System.IO.Path.Combine(parentFolder, RESOURCES))) return false; - string baseFilename = Path.GetFileName(path); + string baseFilename = System.IO.Path.GetFileName(path); bool dataFound = false; bool rsrcFound = false; - var finderDatStream = - new FileStream(Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, FileAccess.Read); + var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, + FileAccess.Read); while(finderDatStream.Position + 0x5C <= finderDatStream.Length) { @@ -159,12 +153,13 @@ namespace Aaru.Filters continue; dataFound |= - File.Exists(Path.Combine(parentFolder, macName ?? throw new InvalidOperationException())) || - File.Exists(Path.Combine(parentFolder, dosName)) || - File.Exists(Path.Combine(parentFolder, dosNameLow)); + File.Exists(System.IO.Path.Combine(parentFolder, + macName ?? throw new InvalidOperationException())) || + File.Exists(System.IO.Path.Combine(parentFolder, dosName)) || + File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow)); - rsrcFound |= File.Exists(Path.Combine(parentFolder, RESOURCES, dosName)) || - File.Exists(Path.Combine(parentFolder, RESOURCES, dosNameLow)); + rsrcFound |= File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName)) || + File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow)); break; } @@ -175,7 +170,7 @@ namespace Aaru.Filters } /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } /// public void Open(byte[] buffer) => throw new NotSupportedException(); @@ -186,13 +181,13 @@ namespace Aaru.Filters /// public void Open(string path) { - string parentFolder = Path.GetDirectoryName(path); - string baseFilename = Path.GetFileName(path); + string parentFolder = System.IO.Path.GetDirectoryName(path); + string baseFilename = System.IO.Path.GetFileName(path); parentFolder ??= ""; - var finderDatStream = - new FileStream(Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, FileAccess.Read); + var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, + FileAccess.Read); while(finderDatStream.Position + 0x5C <= finderDatStream.Length) { @@ -218,33 +213,33 @@ namespace Aaru.Filters baseFilename != dosNameLow) continue; - if(File.Exists(Path.Combine(parentFolder, macName ?? throw new InvalidOperationException()))) - _dataPath = Path.Combine(parentFolder, macName); - else if(File.Exists(Path.Combine(parentFolder, dosName))) - _dataPath = Path.Combine(parentFolder, dosName); - else if(File.Exists(Path.Combine(parentFolder, dosNameLow))) - _dataPath = Path.Combine(parentFolder, dosNameLow); + if(File.Exists(System.IO.Path.Combine(parentFolder, macName ?? throw new InvalidOperationException()))) + _dataPath = System.IO.Path.Combine(parentFolder, macName); + else if(File.Exists(System.IO.Path.Combine(parentFolder, dosName))) + _dataPath = System.IO.Path.Combine(parentFolder, dosName); + else if(File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow))) + _dataPath = System.IO.Path.Combine(parentFolder, dosNameLow); else _dataPath = null; - if(File.Exists(Path.Combine(parentFolder, RESOURCES, dosName))) - _rsrcPath = Path.Combine(parentFolder, RESOURCES, dosName); - else if(File.Exists(Path.Combine(parentFolder, RESOURCES, dosNameLow))) - _rsrcPath = Path.Combine(parentFolder, RESOURCES, dosNameLow); + if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName))) + _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosName); + else if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow))) + _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow); else _rsrcPath = null; - _lastWriteTime = DateHandlers.MacToDateTime(datEntry.modificationDate); - _creationTime = DateHandlers.MacToDateTime(datEntry.creationDate); + LastWriteTime = DateHandlers.MacToDateTime(datEntry.modificationDate); + CreationTime = DateHandlers.MacToDateTime(datEntry.creationDate); break; } - _dataLen = new FileInfo(_dataPath ?? throw new InvalidOperationException()).Length; - _rsrcLen = new FileInfo(_rsrcPath ?? throw new InvalidOperationException()).Length; + DataForkLength = new FileInfo(_dataPath ?? throw new InvalidOperationException()).Length; + ResourceForkLength = new FileInfo(_rsrcPath ?? throw new InvalidOperationException()).Length; - _basePath = path; - _opened = true; + BasePath = path; + Opened = true; finderDatStream.Close(); } diff --git a/Aaru.Filters/XZ.cs b/Aaru.Filters/XZ.cs index 80708dcfa..3c36b57b1 100644 --- a/Aaru.Filters/XZ.cs +++ b/Aaru.Filters/XZ.cs @@ -41,18 +41,13 @@ namespace Aaru.Filters /// Decompress xz files while reading public sealed class XZ : IFilter { - string _basePath; - DateTime _creationTime; - Stream _dataStream; - long _decompressedSize; - Stream _innerStream; - DateTime _lastWriteTime; - bool _opened; + Stream _dataStream; + Stream _innerStream; /// public string Name => "XZ"; /// - public Guid Id => new Guid("666A8617-0444-4C05-9F4F-DF0FD758D0D2"); + public Guid Id => new("666A8617-0444-4C05-9F4F-DF0FD758D0D2"); /// public string Author => "Natalia Portillo"; @@ -61,24 +56,24 @@ namespace Aaru.Filters { _dataStream?.Close(); _dataStream = null; - _basePath = null; - _opened = false; + BasePath = null; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// public Stream GetDataForkStream() => _innerStream; /// - public string GetPath() => _basePath; + public string Path => BasePath; /// public Stream GetResourceForkStream() => null; /// - public bool HasResourceFork() => false; + public bool HasResourceFork => false; /// public bool Identify(byte[] buffer) => buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && @@ -130,75 +125,78 @@ namespace Aaru.Filters /// public void Open(byte[] buffer) { - _dataStream = new MemoryStream(buffer); - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + _dataStream = new MemoryStream(buffer); + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; GuessSize(); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream); - _opened = true; + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream); + Opened = true; } /// public void Open(Stream stream) { - _dataStream = stream; - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; + _dataStream = stream; + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; GuessSize(); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream); - _opened = true; + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream); + Opened = true; } /// public void Open(string path) { _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read); - _basePath = Path.GetFullPath(path); + BasePath = System.IO.Path.GetFullPath(path); var fi = new FileInfo(path); - _creationTime = fi.CreationTimeUtc; - _lastWriteTime = fi.LastWriteTimeUtc; + CreationTime = fi.CreationTimeUtc; + LastWriteTime = fi.LastWriteTimeUtc; GuessSize(); - _innerStream = new ForcedSeekStream(_decompressedSize, _dataStream); - _opened = true; + _innerStream = new ForcedSeekStream(DataForkLength, _dataStream); + Opened = true; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _decompressedSize; + public long DataForkLength { get; private set; } /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _decompressedSize; + public long Length => DataForkLength; /// - public long GetResourceForkLength() => 0; + public long ResourceForkLength => 0; /// - public string GetFilename() + public string Filename { - if(_basePath?.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase) == true) - return _basePath.Substring(0, _basePath.Length - 3); + get + { + if(BasePath?.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase) == true) + return BasePath.Substring(0, BasePath.Length - 3); - return _basePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true - ? _basePath.Substring(0, _basePath.Length - 5) : _basePath; + return BasePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true + ? BasePath.Substring(0, BasePath.Length - 5) : BasePath; + } } /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } void GuessSize() { - _decompressedSize = 0; + DataForkLength = 0; // Seek to footer backwards size field _dataStream.Seek(-8, SeekOrigin.End); @@ -220,7 +218,7 @@ namespace Aaru.Filters tmp = new byte[backwardSize - 2 - ignore]; _dataStream.Read(tmp, 0, tmp.Length); Decode(tmp, tmp.Length, ref number); - _decompressedSize = (long)number; + DataForkLength = (long)number; _dataStream.Seek(0, SeekOrigin.Begin); } diff --git a/Aaru.Filters/ZZZNoFilter.cs b/Aaru.Filters/ZZZNoFilter.cs index 21bbb118d..8ea7fb626 100644 --- a/Aaru.Filters/ZZZNoFilter.cs +++ b/Aaru.Filters/ZZZNoFilter.cs @@ -40,16 +40,12 @@ namespace Aaru.Filters /// No filter for reading files not recognized by any filter public sealed class ZZZNoFilter : IFilter { - string _basePath; - DateTime _creationTime; - Stream _dataStream; - DateTime _lastWriteTime; - bool _opened; + Stream _dataStream; /// public string Name => "No filter"; /// - public Guid Id => new Guid("12345678-AAAA-BBBB-CCCC-123456789000"); + public Guid Id => new("12345678-AAAA-BBBB-CCCC-123456789000"); /// public string Author => "Natalia Portillo"; @@ -58,24 +54,24 @@ namespace Aaru.Filters { _dataStream?.Close(); _dataStream = null; - _basePath = null; - _opened = false; + BasePath = null; + Opened = false; } /// - public string GetBasePath() => _basePath; + public string BasePath { get; private set; } /// public Stream GetDataForkStream() => _dataStream; /// - public string GetPath() => _basePath; + public string Path => BasePath; /// public Stream GetResourceForkStream() => null; /// - public bool HasResourceFork() => false; + public bool HasResourceFork => false; /// public bool Identify(byte[] buffer) => buffer != null && buffer.Length > 0; @@ -89,56 +85,56 @@ namespace Aaru.Filters /// public void Open(byte[] buffer) { - _dataStream = new MemoryStream(buffer); - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; - _opened = true; + _dataStream = new MemoryStream(buffer); + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; + Opened = true; } /// public void Open(Stream stream) { - _dataStream = stream; - _basePath = null; - _creationTime = DateTime.UtcNow; - _lastWriteTime = _creationTime; - _opened = true; + _dataStream = stream; + BasePath = null; + CreationTime = DateTime.UtcNow; + LastWriteTime = CreationTime; + Opened = true; } /// public void Open(string path) { _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read); - _basePath = Path.GetFullPath(path); + BasePath = System.IO.Path.GetFullPath(path); var fi = new FileInfo(path); - _creationTime = fi.CreationTimeUtc; - _lastWriteTime = fi.LastWriteTimeUtc; - _opened = true; + CreationTime = fi.CreationTimeUtc; + LastWriteTime = fi.LastWriteTimeUtc; + Opened = true; } /// - public DateTime GetCreationTime() => _creationTime; + public DateTime CreationTime { get; private set; } /// - public long GetDataForkLength() => _dataStream.Length; + public long DataForkLength => _dataStream.Length; /// - public DateTime GetLastWriteTime() => _lastWriteTime; + public DateTime LastWriteTime { get; private set; } /// - public long GetLength() => _dataStream.Length; + public long Length => _dataStream.Length; /// - public long GetResourceForkLength() => 0; + public long ResourceForkLength => 0; /// - public string GetFilename() => Path.GetFileName(_basePath); + public string Filename => System.IO.Path.GetFileName(BasePath); /// - public string GetParentFolder() => Path.GetDirectoryName(_basePath); + public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath); /// - public bool IsOpened() => _opened; + public bool Opened { get; private set; } } } \ No newline at end of file diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs index 3fe38236b..273baaff8 100644 --- a/Aaru.Images/AaruFormat/Read.cs +++ b/Aaru.Images/AaruFormat/Read.cs @@ -782,7 +782,7 @@ namespace Aaru.DiscImages EndSector = (ulong)trackEntry.end, Pregap = (ulong)trackEntry.pregap, Session = trackEntry.session, - File = imageFilter.GetFilename(), + File = imageFilter.Filename, FileType = "BINARY", Filter = imageFilter }); @@ -1277,7 +1277,7 @@ namespace Aaru.DiscImages { BytesPerSector = (int)_imageInfo.SectorSize, EndSector = _imageInfo.Sectors - 1, - File = imageFilter.GetFilename(), + File = imageFilter.Filename, FileType = "BINARY", Filter = imageFilter, RawBytesPerSector = (int)_imageInfo.SectorSize, diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs index 011b34a60..20d296325 100644 --- a/Aaru.Images/Alcohol120/Properties.cs +++ b/Aaru.Images/Alcohol120/Properties.cs @@ -101,7 +101,7 @@ namespace Aaru.DiscImages Sequence = alcTrack.point, Type = TrackModeToTrackType(alcTrack.mode), Filter = _alcImage, - File = _alcImage.GetFilename(), + File = _alcImage.Filename, FileOffset = alcTrack.startOffset, FileType = "BINARY", RawBytesPerSector = alcTrack.sectorSize, @@ -121,7 +121,7 @@ namespace Aaru.DiscImages { case SubchannelMode.Interleaved: aaruTrack.SubchannelFilter = _alcImage; - aaruTrack.SubchannelFile = _alcImage.GetFilename(); + aaruTrack.SubchannelFile = _alcImage.Filename; aaruTrack.SubchannelOffset = alcTrack.startOffset; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 16377c596..55e18717f 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -326,15 +326,15 @@ namespace Aaru.DiscImages if(_alcFooter.filenameOffset == 0) { - if(Path.GetExtension(imageFilter.GetBasePath()).ToLowerInvariant() == ".mds") - alcFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".mdf"; - else if(Path.GetExtension(imageFilter.GetBasePath()).ToLowerInvariant() == ".xmd") - alcFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".xmf"; + if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".mds") + alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf"; + else if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".xmd") + alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf"; } else if(string.Compare(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase) == 0) - alcFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".mdf"; + alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf"; else if(string.Compare(alcFile, "*.xmf", StringComparison.InvariantCultureIgnoreCase) == 0) - alcFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".xmf"; + alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf"; if(_header.bcaLength > 0 && _header.bcaOffset > 0 && @@ -680,9 +680,9 @@ namespace Aaru.DiscImages if(_alcImage == null) throw new Exception("Cannot open data file"); - _imageInfo.ImageSize = (ulong)_alcImage.GetDataForkLength(); - _imageInfo.CreationTime = _alcImage.GetCreationTime(); - _imageInfo.LastModificationTime = _alcImage.GetLastWriteTime(); + _imageInfo.ImageSize = (ulong)_alcImage.DataForkLength; + _imageInfo.CreationTime = _alcImage.CreationTime; + _imageInfo.LastModificationTime = _alcImage.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; _imageInfo.Version = $"{_header.version[0]}.{_header.version[1]}"; @@ -1509,7 +1509,7 @@ namespace Aaru.DiscImages Sequence = alcTrack.point, Type = TrackModeToTrackType(alcTrack.mode), Filter = _alcImage, - File = _alcImage.GetFilename(), + File = _alcImage.Filename, FileOffset = alcTrack.startOffset, FileType = "BINARY", RawBytesPerSector = alcTrack.sectorSize, @@ -1525,7 +1525,7 @@ namespace Aaru.DiscImages { case SubchannelMode.Interleaved: aaruTrack.SubchannelFilter = _alcImage; - aaruTrack.SubchannelFile = _alcImage.GetFilename(); + aaruTrack.SubchannelFile = _alcImage.Filename; aaruTrack.SubchannelOffset = alcTrack.startOffset; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs index b25cc9153..13bb876e9 100644 --- a/Aaru.Images/Anex86/Read.cs +++ b/Aaru.Images/Anex86/Read.cs @@ -66,9 +66,9 @@ namespace Aaru.DiscImages AaruConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", _imageInfo.MediaType); _imageInfo.ImageSize = (ulong)_header.dskSize; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = (ulong)(_header.cylinders * _header.heads * _header.spt); _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; _imageInfo.SectorSize = (uint)_header.bps; diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs index 760d25e3b..1ecd6a3e3 100644 --- a/Aaru.Images/Apple2MG/Read.cs +++ b/Aaru.Images/Apple2MG/Read.cs @@ -234,9 +234,9 @@ namespace Aaru.DiscImages _imageInfo.Comments = Encoding.ASCII.GetString(comments); } - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.MediaType = GetMediaType(); _a2MgImageFilter = imageFilter; diff --git a/Aaru.Images/AppleDOS/Identify.cs b/Aaru.Images/AppleDOS/Identify.cs index 4e8ff48e8..81e2f3be8 100644 --- a/Aaru.Images/AppleDOS/Identify.cs +++ b/Aaru.Images/AppleDOS/Identify.cs @@ -40,9 +40,9 @@ namespace Aaru.DiscImages /// public bool Identify(IFilter imageFilter) { - _extension = Path.GetExtension(imageFilter.GetFilename())?.ToLower(); + _extension = Path.GetExtension(imageFilter.Filename)?.ToLower(); - return imageFilter.GetDataForkLength() == 143360 && (_extension == ".po" || _extension == ".do"); + return imageFilter.DataForkLength == 143360 && (_extension == ".po" || _extension == ".do"); } } } \ No newline at end of file diff --git a/Aaru.Images/AppleDOS/Read.cs b/Aaru.Images/AppleDOS/Read.cs index 8ff8ef1f1..8364531a7 100644 --- a/Aaru.Images/AppleDOS/Read.cs +++ b/Aaru.Images/AppleDOS/Read.cs @@ -46,10 +46,10 @@ namespace Aaru.DiscImages Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); - byte[] tmp = new byte[imageFilter.GetDataForkLength()]; + byte[] tmp = new byte[imageFilter.DataForkLength]; stream.Read(tmp, 0, tmp.Length); - _extension = Path.GetExtension(imageFilter.GetFilename())?.ToLower(); + _extension = Path.GetExtension(imageFilter.Filename)?.ToLower(); if((_extension == ".d13" || _extension == ".do") && tmp.Length == 116480) @@ -81,10 +81,10 @@ namespace Aaru.DiscImages } _imageInfo.SectorSize = 256; - _imageInfo.ImageSize = (ulong)imageFilter.GetDataForkLength(); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.ImageSize = (ulong)imageFilter.DataForkLength; + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = _dos32 ? 455u : 560u; _imageInfo.MediaType = _dos32 ? MediaType.Apple32SS : MediaType.Apple33SS; _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs index c0ea83104..731bd6015 100644 --- a/Aaru.Images/AppleNIB/Read.cs +++ b/Aaru.Images/AppleNIB/Read.cs @@ -61,7 +61,7 @@ namespace Aaru.DiscImages List tracks = Apple2.MarshalDisk(buffer); AaruConsole.DebugWriteLine("Apple NIB Plugin", "Got {0} tracks", tracks.Count); - Dictionary rawSectors = new Dictionary(); + Dictionary rawSectors = new(); int spt = 0; bool allTracksEqual = true; @@ -131,10 +131,10 @@ namespace Aaru.DiscImages _addressFields.Add(kvp.Key, addr); } - _imageInfo.ImageSize = (ulong)imageFilter.GetDataForkLength(); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.ImageSize = (ulong)imageFilter.DataForkLength; + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); if(_imageInfo.Sectors == 455) _imageInfo.MediaType = MediaType.Apple32SS; diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs index 0a3a01e9b..54e8bc538 100644 --- a/Aaru.Images/Apridisk/Read.cs +++ b/Aaru.Images/Apridisk/Read.cs @@ -221,9 +221,9 @@ namespace Aaru.DiscImages false)); _imageInfo.ImageSize = (ulong)stream.Length - headerSizes; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack; _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs index f7f15fc03..f4f17a1f0 100644 --- a/Aaru.Images/BLU/Read.cs +++ b/Aaru.Images/BLU/Read.cs @@ -136,9 +136,9 @@ namespace Aaru.DiscImages _imageInfo.Application = StringHandlers.CToString(hdrTag); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _bluImageFilter = imageFilter; diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs index 517c25e8d..d6a6e2e7e 100644 --- a/Aaru.Images/BlindWrite4/Read.cs +++ b/Aaru.Images/BlindWrite4/Read.cs @@ -393,26 +393,26 @@ namespace Aaru.DiscImages if(!string.IsNullOrEmpty(_header.DataFile)) while(true) { - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.DataFile)); + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile)); if(_dataFilter != null) break; - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.ToLower(CultureInfo. CurrentCulture))); if(_dataFilter != null) break; - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.ToUpper(CultureInfo. CurrentCulture))); if(_dataFilter != null) break; - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.DataFile. + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile. Split(new[] { '\\' @@ -422,7 +422,7 @@ namespace Aaru.DiscImages if(_dataFilter != null) break; - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.DataFile. + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile. Split(new[] { '\\' @@ -432,7 +432,7 @@ namespace Aaru.DiscImages if(_dataFilter != null) break; - _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.DataFile. + _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile. Split(new[] { '\\' @@ -452,25 +452,22 @@ namespace Aaru.DiscImages filtersList = new FiltersList(); _subFilter = - ((((filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.SubchannelFile)) ?? - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + ((((filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile)) ?? + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile. ToLower(CultureInfo.CurrentCulture)))) ?? - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile. ToUpper(CultureInfo.CurrentCulture)))) ?? - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.SubchannelFile. - Split(new[] - { - '\\' - }, StringSplitOptions.RemoveEmptyEntries).Last()))) ?? - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.SubchannelFile. - Split(new[] - { - '\\' - }, StringSplitOptions.RemoveEmptyEntries).Last(). - ToLower(CultureInfo.CurrentCulture)))) ?? - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), _header.SubchannelFile.Split(new[] + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[] + { + '\\' + }, StringSplitOptions.RemoveEmptyEntries).Last()))) ?? + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[] + { + '\\' + }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)))) ?? + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture))); @@ -497,73 +494,70 @@ namespace Aaru.DiscImages do { track.Filter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), bwTrack.filename)); + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename)); if(track.Filter != null) break; - track.Filter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), - bwTrack.filename.ToLower(CultureInfo. - CurrentCulture))); + track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, + bwTrack.filename.ToLower(CultureInfo. + CurrentCulture))); if(track.Filter != null) break; - track.Filter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), - bwTrack.filename.ToUpper(CultureInfo. - CurrentCulture))); + track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, + bwTrack.filename.ToUpper(CultureInfo. + CurrentCulture))); if(track.Filter != null) break; - track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), - bwTrack.filename.Split(new[] + track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, + bwTrack.filename.Split(new[] { '\\' }, StringSplitOptions. RemoveEmptyEntries). - Last())); + Last())); if(track.Filter != null) break; - track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), - bwTrack.filename.Split(new[] + track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, + bwTrack.filename.Split(new[] { '\\' }, StringSplitOptions. RemoveEmptyEntries). - Last(). - ToLower(CultureInfo.CurrentCulture))); + Last().ToLower(CultureInfo. + CurrentCulture))); if(track.Filter != null) break; - track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), - bwTrack.filename.Split(new[] + track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, + bwTrack.filename.Split(new[] { '\\' }, StringSplitOptions. RemoveEmptyEntries). - Last(). - ToUpper(CultureInfo.CurrentCulture))); + Last().ToUpper(CultureInfo. + CurrentCulture))); track.Filter = _dataFilter; } while(true); else track.Filter = _dataFilter; - track.File = _dataFilter.GetFilename(); + track.File = _dataFilter.Filename; track.FileOffset = bwTrack.offset + ((150 - bwTrack.pregapOffsetAdjustment) * 2352); - track.SubchannelOffset = - ((bwTrack.offset / 2352) + (150 - bwTrack.pregapOffsetAdjustment)) * 96; + track.SubchannelOffset = ((bwTrack.offset / 2352) + (150 - bwTrack.pregapOffsetAdjustment)) * 96; if(bwTrack.pregap > 0) { @@ -592,7 +586,7 @@ namespace Aaru.DiscImages maxSession = track.Session; track.SubchannelFilter = _subFilter; - track.SubchannelFile = _subFilter?.GetFilename(); + track.SubchannelFile = _subFilter?.Filename; if(_subFilter != null) { @@ -607,9 +601,9 @@ namespace Aaru.DiscImages switch(bwTrack.trackMode) { case TrackType.Audio: - track.Type = CommonTypes.Enums.TrackType.Audio; - _imageInfo.SectorSize = 2352; - track.BytesPerSector = 2352; + track.Type = CommonTypes.Enums.TrackType.Audio; + _imageInfo.SectorSize = 2352; + track.BytesPerSector = 2352; break; case TrackType.Mode1: @@ -660,7 +654,7 @@ namespace Aaru.DiscImages default: track.Type = CommonTypes.Enums.TrackType.Data; track.RawBytesPerSector = 2048; - _imageInfo.SectorSize = 2048; + _imageInfo.SectorSize = 2048; track.BytesPerSector = 2048; break; @@ -717,9 +711,9 @@ namespace Aaru.DiscImages { var session = new Session { - Sequence = i, - StartTrack = uint.MaxValue, - StartSector = uint.MaxValue + Sequence = i, + StartTrack = uint.MaxValue, + StartSector = uint.MaxValue }; foreach(Track track in Tracks.Where(track => track.Session == i)) @@ -751,9 +745,9 @@ namespace Aaru.DiscImages _imageInfo.ApplicationVersion = "4"; _imageInfo.Version = "4"; - _imageInfo.ImageSize = (ulong)_dataFilter.GetDataForkLength(); - _imageInfo.CreationTime = _dataFilter.GetCreationTime(); - _imageInfo.LastModificationTime = _dataFilter.GetLastWriteTime(); + _imageInfo.ImageSize = (ulong)_dataFilter.DataForkLength; + _imageInfo.CreationTime = _dataFilter.CreationTime; + _imageInfo.LastModificationTime = _dataFilter.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; bool data = false; @@ -843,9 +837,9 @@ namespace Aaru.DiscImages /// public byte[] ReadSectors(ulong sectorAddress, uint length) { - foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value - from track in Tracks where track.Sequence == kvp.Key - where sectorAddress - kvp.Value < + foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value + from track in Tracks where track.Sequence == kvp.Key + where sectorAddress - kvp.Value < track.EndSector - track.StartSector + 1 select kvp) return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key); @@ -855,9 +849,9 @@ namespace Aaru.DiscImages /// public byte[] ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag) { - foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value - from track in Tracks where track.Sequence == kvp.Key - where sectorAddress - kvp.Value < + foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value + from track in Tracks where track.Sequence == kvp.Key + where sectorAddress - kvp.Value < track.EndSector - track.StartSector + 1 select kvp) return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag); @@ -1181,9 +1175,9 @@ namespace Aaru.DiscImages /// public byte[] ReadSectorsLong(ulong sectorAddress, uint length) { - foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value - from track in Tracks where track.Sequence == kvp.Key - where sectorAddress - kvp.Value < + foreach(KeyValuePair kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value + from track in Tracks where track.Sequence == kvp.Key + where sectorAddress - kvp.Value < track.EndSector - track.StartSector + 1 select kvp) return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key); @@ -1254,7 +1248,6 @@ namespace Aaru.DiscImages } /// - public List GetSessionTracks(ushort session) => - Tracks.Where(track => track.Session == session).ToList(); + public List GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList(); } } \ No newline at end of file diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs index 43ffa6faa..02acd6990 100644 --- a/Aaru.Images/BlindWrite5/Read.cs +++ b/Aaru.Images/BlindWrite5/Read.cs @@ -476,37 +476,36 @@ namespace Aaru.DiscImages string path = Path.Combine(_dataPath, dataFile.Filename); var filtersList = new FiltersList(); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)) != null) + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null) { - chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)); + chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)); chars.FilePath = path; } else { path = Path.Combine(_dataPath, dataFile.Filename.ToLower(CultureInfo.CurrentCulture)); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)) != null) + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null) { - chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)); + chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)); chars.FilePath = path; } else { path = Path.Combine(_dataPath, dataFile.Filename.ToUpper(CultureInfo.CurrentCulture)); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)) != null) + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null) { - chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)); + chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)); chars.FilePath = path; } else { path = Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture), dataFile.Filename); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)) != null) + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null) { - chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)); + chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)); chars.FilePath = path; } @@ -514,10 +513,10 @@ namespace Aaru.DiscImages { path = Path.Combine(_dataPath.ToUpper(CultureInfo.CurrentCulture), dataFile.Filename); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)) != null) + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null) { chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), path)); + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)); chars.FilePath = path; } @@ -525,57 +524,57 @@ namespace Aaru.DiscImages { path = Path.Combine(_dataPath, dataFile.Filename); - if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path.ToLower(CultureInfo.CurrentCulture))) != null) { chars.FilePath = path.ToLower(CultureInfo.CurrentCulture); chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path.ToLower(CultureInfo. CurrentCulture))); } - else if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path.ToUpper(CultureInfo. CurrentCulture))) != null) { chars.FilePath = path.ToUpper(CultureInfo.CurrentCulture); chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path.ToUpper(CultureInfo. CurrentCulture))); } - else if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename.ToLower(CultureInfo. CurrentCulture))) != null) { chars.FilePath = dataFile.Filename.ToLower(CultureInfo.CurrentCulture); chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename.ToLower(CultureInfo. CurrentCulture))); } - else if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename.ToUpper(CultureInfo. CurrentCulture))) != null) { chars.FilePath = dataFile.Filename.ToUpper(CultureInfo.CurrentCulture); chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename.ToUpper(CultureInfo. CurrentCulture))); } - else if(filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename)) != null) { chars.FilePath = dataFile.Filename; chars.FileFilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, dataFile.Filename)); } else @@ -789,32 +788,32 @@ namespace Aaru.DiscImages bool lowerCaseFileName = false; string basePath; - bool version5 = string.Compare(Path.GetExtension(imageFilter.GetFilename()), ".B5T", + bool version5 = string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase) == 0; string firstExtension = version5 ? "B5I" : "B6I"; string firstExtensionLower = version5 ? "b5i" : "b6i"; - if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), $"{filename}.{firstExtension}"))) + if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename}.{firstExtension}"))) { - basePath = imageFilter.GetParentFolder(); + basePath = imageFilter.ParentFolder; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename}.{firstExtensionLower}"))) { - basePath = imageFilter.GetParentFolder(); + basePath = imageFilter.ParentFolder; lowerCaseExtension = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}"))) { - basePath = imageFilter.GetParentFolder(); + basePath = imageFilter.ParentFolder; lowerCaseFileName = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}"))) { - basePath = imageFilter.GetParentFolder(); + basePath = imageFilter.ParentFolder; lowerCaseFileName = true; lowerCaseExtension = true; } @@ -867,61 +866,61 @@ namespace Aaru.DiscImages lowerCaseExtension = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), _dataPath, + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath, $"{filename}.{firstExtension}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), _dataPath); + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath); } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), _dataPath, + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath, $"{filename}.{firstExtensionLower}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), _dataPath); + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath); lowerCaseExtension = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), _dataPath, + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath, $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), _dataPath); + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath); lowerCaseFileName = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), _dataPath, + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath, $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), _dataPath); + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath); lowerCaseFileName = true; lowerCaseExtension = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture), $"{filename}.{firstExtension}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture)); } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture), $"{filename}.b00"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture)); lowerCaseExtension = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture), $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture)); lowerCaseFileName = true; } - else if(File.Exists(Path.Combine(imageFilter.GetParentFolder(), + else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture), $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}"))) { - basePath = Path.Combine(imageFilter.GetParentFolder(), + basePath = Path.Combine(imageFilter.ParentFolder, _dataPath.ToLower(CultureInfo.CurrentCulture)); lowerCaseFileName = true; @@ -1011,7 +1010,7 @@ namespace Aaru.DiscImages foreach(DataFileCharacteristics chars in fileCharsForThisTrack) { track.Filter = chars.FileFilter; - track.File = chars.FileFilter.GetFilename(); + track.File = chars.FileFilter.Filename; if(trk.startLba >= 0) track.FileOffset = (ulong)((trk.startLba - chars.StartLba) * chars.SectorSize) + @@ -1264,18 +1263,17 @@ namespace Aaru.DiscImages _imageInfo.DriveFirmwareRevision = StringHandlers.CToString(_header.revision); _imageInfo.Application = "BlindWrite"; - if(string.Compare(Path.GetExtension(imageFilter.GetFilename()), ".B5T", - StringComparison.OrdinalIgnoreCase) == 0) + if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase) == 0) _imageInfo.ApplicationVersion = "5"; - else if(string.Compare(Path.GetExtension(imageFilter.GetFilename()), ".B6T", + else if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B6T", StringComparison.OrdinalIgnoreCase) == 0) _imageInfo.ApplicationVersion = "6"; _imageInfo.Version = "5"; - _imageInfo.ImageSize = (ulong)imageFilter.GetDataForkLength(); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.ImageSize = (ulong)imageFilter.DataForkLength; + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; if(_pma != null) diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs index b71c5fdb6..da9a1182d 100644 --- a/Aaru.Images/CDRDAO/Identify.cs +++ b/Aaru.Images/CDRDAO/Identify.cs @@ -98,7 +98,7 @@ namespace Aaru.DiscImages } catch(Exception ex) { - AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrdaoFilter.GetFilename()); + AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrdaoFilter.Filename); AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message); AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace); diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs index 8868582c4..08c767424 100644 --- a/Aaru.Images/CDRDAO/Properties.cs +++ b/Aaru.Images/CDRDAO/Properties.cs @@ -107,7 +107,7 @@ namespace Aaru.DiscImages Sequence = cdrTrack.Sequence, Type = CdrdaoTrackTypeToTrackType(cdrTrack.Tracktype), Filter = cdrTrack.Trackfile.Datafilter, - File = cdrTrack.Trackfile.Datafilter.GetFilename(), + File = cdrTrack.Trackfile.Datafilter.Filename, FileOffset = cdrTrack.Trackfile.Offset, FileType = cdrTrack.Trackfile.Filetype, RawBytesPerSector = cdrTrack.Bps, @@ -125,7 +125,7 @@ namespace Aaru.DiscImages : TrackSubchannelType.RawInterleaved; aaruTrack.SubchannelFilter = cdrTrack.Trackfile.Datafilter; - aaruTrack.SubchannelFile = cdrTrack.Trackfile.Datafilter.GetFilename(); + aaruTrack.SubchannelFile = cdrTrack.Trackfile.Datafilter.Filename; aaruTrack.SubchannelOffset = cdrTrack.Trackfile.Offset; } else diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs index deae88d33..a095cce02 100644 --- a/Aaru.Images/CDRDAO/Read.cs +++ b/Aaru.Images/CDRDAO/Read.cs @@ -398,7 +398,7 @@ namespace Aaru.DiscImages currentTrack.Trackfile = new CdrdaoTrackFile { Datafilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, matchAudioFile.Groups["filename"].Value)), Datafile = matchAudioFile.Groups["filename"].Value, Offset = matchAudioFile.Groups["base_offset"].Value != "" @@ -429,7 +429,7 @@ namespace Aaru.DiscImages } else currentTrack.Sectors = - ((ulong)currentTrack.Trackfile.Datafilter.GetDataForkLength() - + ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength - currentTrack.Trackfile.Offset) / currentTrack.Bps; } else if(matchFile.Success) @@ -442,7 +442,7 @@ namespace Aaru.DiscImages currentTrack.Trackfile = new CdrdaoTrackFile { Datafilter = - filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(), + filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, matchFile.Groups["filename"].Value)), Datafile = matchAudioFile.Groups["filename"].Value, Offset = matchFile.Groups["base_offset"].Value != "" @@ -461,7 +461,7 @@ namespace Aaru.DiscImages } else currentTrack.Sectors = - ((ulong)currentTrack.Trackfile.Datafilter.GetDataForkLength() - + ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength - currentTrack.Trackfile.Offset) / currentTrack.Bps; } else if(matchTitle.Success) @@ -651,7 +651,7 @@ namespace Aaru.DiscImages AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}", - _discimage.Tracks[i].Trackfile.Datafilter.GetFilename(), + _discimage.Tracks[i].Trackfile.Datafilter.Filename, _discimage.Tracks[i].Trackfile.Filetype, _discimage.Tracks[i].Trackfile.Offset); @@ -779,8 +779,8 @@ namespace Aaru.DiscImages _imageInfo.Application = "CDRDAO"; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.Comments = _discimage.Comment; _imageInfo.MediaSerialNumber = _discimage.Mcn; diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs index d5f4263f6..fb3045424 100644 --- a/Aaru.Images/CDRWin/Properties.cs +++ b/Aaru.Images/CDRWin/Properties.cs @@ -89,7 +89,7 @@ namespace Aaru.DiscImages Session = cdrTrack.Session, Sequence = cdrTrack.Sequence, Type = _isCd ? CdrWinTrackTypeToTrackType(cdrTrack.TrackType) : TrackType.Data, - File = cdrTrack.TrackFile.DataFilter.GetFilename(), + File = cdrTrack.TrackFile.DataFilter.Filename, Filter = cdrTrack.TrackFile.DataFilter, FileOffset = cdrTrack.TrackFile.Offset, FileType = cdrTrack.TrackFile.FileType, @@ -125,14 +125,14 @@ namespace Aaru.DiscImages previousStartSector < gdRomSession2Offset) aaruTrack.StartSector = gdRomSession2Offset; - previousTrackFile = cdrTrack.TrackFile.DataFilter.GetFilename(); + previousTrackFile = cdrTrack.TrackFile.DataFilter.Filename; aaruTrack.EndSector = aaruTrack.StartSector + cdrTrack.Sectors - 1; if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG) { aaruTrack.SubchannelFilter = cdrTrack.TrackFile.DataFilter; - aaruTrack.SubchannelFile = cdrTrack.TrackFile.DataFilter.GetFilename(); + aaruTrack.SubchannelFile = cdrTrack.TrackFile.DataFilter.Filename; aaruTrack.SubchannelOffset = cdrTrack.TrackFile.Offset; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; } diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 96651d6d5..851a22214 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -499,11 +499,10 @@ namespace Aaru.DiscImages currentFile.Sequence = currentTrack.Sequence; currentTrack.TrackFile = currentFile; - _negativeEnd = currentFile.DataFilter.GetLength() - (long)currentFile.Offset < 0; + _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0; - currentTrack.Sectors = - ((ulong)currentFile.DataFilter.GetLength() - currentFile.Offset) / - CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType); + currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) / + CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType); cueTracks[currentTrack.Sequence - 1] = currentTrack; inTrack = false; @@ -536,7 +535,7 @@ namespace Aaru.DiscImages if(currentFile.DataFilter == null) { - string path = imageFilter.GetParentFolder() + Path.PathSeparator + + string path = imageFilter.ParentFolder + Path.PathSeparator + unixPathMatch.Groups[1].Value; currentFile.DataFilter = filtersList.GetFilter(path); @@ -566,7 +565,7 @@ namespace Aaru.DiscImages if(currentFile.DataFilter == null) { - string path = imageFilter.GetParentFolder() + Path.PathSeparator + + string path = imageFilter.ParentFolder + Path.PathSeparator + winPathMatch.Groups[1].Value; currentFile.DataFilter = filtersList.GetFilter(path); @@ -582,7 +581,7 @@ namespace Aaru.DiscImages } else { - string path = imageFilter.GetParentFolder() + Path.PathSeparator + datafile; + string path = imageFilter.ParentFolder + Path.PathSeparator + datafile; currentFile.DataFilter = filtersList.GetFilter(path); if(currentFile.DataFilter == null) @@ -592,7 +591,7 @@ namespace Aaru.DiscImages // File does exist, process it AaruConsole.DebugWriteLine("CDRWin plugin", "File \"{0}\" found", - currentFile.DataFilter.GetFilename()); + currentFile.DataFilter.Filename); switch(currentFile.FileType) { @@ -830,9 +829,9 @@ namespace Aaru.DiscImages currentFile.Sequence = currentTrack.Sequence; currentTrack.TrackFile = currentFile; - _negativeEnd = currentFile.DataFilter.GetLength() - (long)currentFile.Offset < 0; + _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0; - currentTrack.Sectors = ((ulong)currentFile.DataFilter.GetLength() - currentFile.Offset) / + currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) / CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType); cueTracks[currentTrack.Sequence - 1] = currentTrack; @@ -840,9 +839,9 @@ namespace Aaru.DiscImages if(_negativeEnd) { - string firstFile = cueTracks[0].TrackFile.DataFilter.GetPath(); + string firstFile = cueTracks[0].TrackFile.DataFilter.Path; - if(cueTracks.Any(t => t.Session > 1 || t.TrackFile.DataFilter.GetPath() != firstFile) || + if(cueTracks.Any(t => t.Session > 1 || t.TrackFile.DataFilter.Path != firstFile) || cueTracks[0].Indexes.ContainsKey(0)) { AaruConsole. @@ -857,8 +856,7 @@ namespace Aaru.DiscImages foreach(CdrWinTrack track in cueTracks) track.TrackFile.Offset -= (ulong)reduceOffset; - if(currentFile.DataFilter.GetLength() - - (long)cueTracks[currentTrack.Sequence - 1].TrackFile.Offset < 0) + if(currentFile.DataFilter.Length - (long)cueTracks[currentTrack.Sequence - 1].TrackFile.Offset < 0) { AaruConsole. ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file."); @@ -867,8 +865,7 @@ namespace Aaru.DiscImages } cueTracks[currentTrack.Sequence - 1].Sectors = - ((ulong)currentFile.DataFilter.GetLength() - - cueTracks[currentTrack.Sequence - 1].TrackFile.Offset) / + ((ulong)currentFile.DataFilter.Length - cueTracks[currentTrack.Sequence - 1].TrackFile.Offset) / cueTracks[currentTrack.Sequence - 1].Bps; cueTracks[0].Indexes[0] = 0; @@ -936,8 +933,8 @@ namespace Aaru.DiscImages if(firstSessionTrack.Pregap < 150) firstSessionTrack.Pregap = 150; - if(cueTracks.Any(i => i.TrackFile.DataFilter.GetFilename() != - cueTracks.First().TrackFile.DataFilter.GetFilename())) + if(cueTracks.Any(i => i.TrackFile.DataFilter.Filename != + cueTracks.First().TrackFile.DataFilter.Filename)) continue; if(firstSessionTrack.Indexes.TryGetValue(0, out int sessionStart)) @@ -1188,7 +1185,7 @@ namespace Aaru.DiscImages AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}", - _discImage.Tracks[i].TrackFile.DataFilter.GetFilename(), + _discImage.Tracks[i].TrackFile.DataFilter.Filename, _discImage.Tracks[i].TrackFile.FileType, _discImage.Tracks[i].TrackFile.Offset); @@ -1245,10 +1242,10 @@ namespace Aaru.DiscImages foreach(CdrWinTrack track in _discImage.Tracks) { - if(track.TrackFile.DataFilter.GetBasePath() != currentFilePath) + if(track.TrackFile.DataFilter.BasePath != currentFilePath) { currentFileStartSector = currentSector; - currentFilePath = track.TrackFile.DataFilter.GetBasePath(); + currentFilePath = track.TrackFile.DataFilter.BasePath; } Dictionary newIndexes = new(); @@ -1400,8 +1397,8 @@ namespace Aaru.DiscImages _imageInfo.Application = "CDRWin"; } - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.Comments = _discImage.Comment; _imageInfo.MediaSerialNumber = _discImage.Mcn; @@ -1547,7 +1544,7 @@ namespace Aaru.DiscImages } catch(Exception ex) { - AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.GetFilename()); + AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename); AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message); AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace); diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs index f4a5017fc..77f282350 100644 --- a/Aaru.Images/CHD/Read.cs +++ b/Aaru.Images/CHD/Read.cs @@ -570,7 +570,7 @@ namespace Aaru.DiscImages switch((SubTypeOld)chdTrack.subType) { case SubTypeOld.Cooked: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.PackedInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -580,7 +580,7 @@ namespace Aaru.DiscImages break; case SubTypeOld.Raw: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -592,7 +592,7 @@ namespace Aaru.DiscImages aaruTrack.Description = $"Track {i + 1}"; aaruTrack.EndSector = currentSector + chdTrack.frames - 1; - aaruTrack.File = imageFilter.GetFilename(); + aaruTrack.File = imageFilter.Filename; aaruTrack.FileType = "BINARY"; aaruTrack.Filter = imageFilter; aaruTrack.StartSector = currentSector; @@ -697,7 +697,7 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.PackedInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -707,7 +707,7 @@ namespace Aaru.DiscImages break; case SUB_TYPE_RAW: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -718,7 +718,7 @@ namespace Aaru.DiscImages aaruTrack.Description = $"Track {trackNo}"; aaruTrack.EndSector = currentSector + frames - 1; - aaruTrack.File = imageFilter.GetFilename(); + aaruTrack.File = imageFilter.Filename; aaruTrack.FileType = "BINARY"; aaruTrack.Filter = imageFilter; aaruTrack.StartSector = currentSector; @@ -836,7 +836,7 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.PackedInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -846,7 +846,7 @@ namespace Aaru.DiscImages break; case SUB_TYPE_RAW: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -857,7 +857,7 @@ namespace Aaru.DiscImages aaruTrack.Description = $"Track {trackNo}"; aaruTrack.EndSector = currentSector + frames - 1; - aaruTrack.File = imageFilter.GetFilename(); + aaruTrack.File = imageFilter.Filename; aaruTrack.FileType = "BINARY"; aaruTrack.Filter = imageFilter; aaruTrack.StartSector = currentSector; @@ -993,7 +993,7 @@ namespace Aaru.DiscImages switch(subtype) { case SUB_TYPE_COOKED: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.PackedInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -1003,7 +1003,7 @@ namespace Aaru.DiscImages break; case SUB_TYPE_RAW: - aaruTrack.SubchannelFile = imageFilter.GetFilename(); + aaruTrack.SubchannelFile = imageFilter.Filename; aaruTrack.SubchannelType = TrackSubchannelType.RawInterleaved; aaruTrack.SubchannelFilter = imageFilter; @@ -1014,7 +1014,7 @@ namespace Aaru.DiscImages aaruTrack.Description = $"Track {trackNo}"; aaruTrack.EndSector = currentSector + frames - 1; - aaruTrack.File = imageFilter.GetFilename(); + aaruTrack.File = imageFilter.Filename; aaruTrack.FileType = "BINARY"; aaruTrack.Filter = imageFilter; aaruTrack.StartSector = currentSector; diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs index baca07c8f..089f95e4d 100644 --- a/Aaru.Images/CPCDSK/Read.cs +++ b/Aaru.Images/CPCDSK/Read.cs @@ -175,8 +175,8 @@ namespace Aaru.DiscImages else allTracksSameSize = false; - Dictionary thisTrackSectors = new Dictionary(); - Dictionary thisTrackAddressMarks = new Dictionary(); + Dictionary thisTrackSectors = new(); + Dictionary thisTrackAddressMarks = new(); for(int k = 1; k <= trackInfo.sectors; k++) { @@ -273,9 +273,9 @@ namespace Aaru.DiscImages AaruConsole.DebugWriteLine("CPCDSK plugin", "All tracks are same size? {0}", allTracksSameSize); _imageInfo.Application = StringHandlers.CToString(header.creator); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = (ulong)_sectors.Count; _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; _imageInfo.MediaType = MediaType.CompactFloppy; diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs index 228c2f2f2..897ed188a 100644 --- a/Aaru.Images/CisCopy/Read.cs +++ b/Aaru.Images/CisCopy/Read.cs @@ -124,9 +124,9 @@ namespace Aaru.DiscImages } _imageInfo.Application = "CisCopy"; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = imageFilter.GetFilename(); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = imageFilter.Filename; _imageInfo.ImageSize = (ulong)(stream.Length - 2 - trackBytes.Length); _imageInfo.SectorSize = 512; diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index 57be9a378..1e2ef7cf5 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -396,8 +396,8 @@ namespace Aaru.DiscImages _fullToc = tocMs.ToArray(); _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC); - string dataFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".img"; - string subFile = Path.GetFileNameWithoutExtension(imageFilter.GetBasePath()) + ".sub"; + string dataFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".img"; + string subFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".sub"; var filtersList = new FiltersList(); _dataFilter = filtersList.GetFilter(dataFile); @@ -466,7 +466,7 @@ namespace Aaru.DiscImages currentTrack = new Track { BytesPerSector = 2352, - File = _dataFilter.GetFilename(), + File = _dataFilter.Filename, FileType = _scrambled ? "SCRAMBLED" : "BINARY", Filter = _dataFilter, RawBytesPerSector = 2352, @@ -517,7 +517,7 @@ namespace Aaru.DiscImages if(_subFilter != null) { - currentTrack.SubchannelFile = _subFilter.GetFilename(); + currentTrack.SubchannelFile = _subFilter.Filename; currentTrack.SubchannelFilter = _subFilter; currentTrack.SubchannelType = TrackSubchannelType.Raw; } @@ -879,16 +879,16 @@ namespace Aaru.DiscImages _imageInfo.MediaType = MediaType.CD; _imageInfo.Application = "CloneCD"; - _imageInfo.ImageSize = (ulong)imageFilter.GetDataForkLength(); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.ImageSize = (ulong)imageFilter.DataForkLength; + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; return true; } catch(Exception ex) { - AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.GetFilename()); + AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename); AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message); AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace); diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs index 1c95c61a3..5fdb7a744 100644 --- a/Aaru.Images/CopyTape/Identify.cs +++ b/Aaru.Images/CopyTape/Identify.cs @@ -42,7 +42,7 @@ namespace Aaru.DiscImages /// public bool Identify(IFilter imageFilter) { - if(imageFilter.GetDataForkLength() <= 16) + if(imageFilter.DataForkLength <= 16) return false; byte[] header = new byte[16]; @@ -68,7 +68,7 @@ namespace Aaru.DiscImages return false; if(blockSize == 0 || - blockSize + 17 >= imageFilter.GetDataForkLength()) + blockSize + 17 >= imageFilter.DataForkLength) return false; strm.Position += blockSize; diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs index 378e577f6..208e77da0 100644 --- a/Aaru.Images/CopyTape/Read.cs +++ b/Aaru.Images/CopyTape/Read.cs @@ -47,13 +47,13 @@ namespace Aaru.DiscImages /// public bool Open(IFilter imageFilter) { - List blockPositions = new List(); + List blockPositions = new(); var partialBlockRx = new Regex(PARTIAL_BLOCK_REGEX); var blockRx = new Regex(BLOCK_REGEX); var filemarkRx = new Regex(FILEMARK_REGEX); var eotRx = new Regex(END_OF_TAPE_REGEX); - if(imageFilter.GetDataForkLength() <= 16) + if(imageFilter.DataForkLength <= 16) return false; _imageStream = imageFilter.GetDataForkStream(); @@ -123,7 +123,7 @@ namespace Aaru.DiscImages throw new ArgumentException("Cannot decode block header, cannot open."); if(blockSize == 0 || - blockSize + 17 > imageFilter.GetDataForkLength()) + blockSize + 17 > imageFilter.DataForkLength) throw new ArgumentException("Cannot decode block header, cannot open."); _imageStream.Position += blockSize; @@ -145,7 +145,7 @@ namespace Aaru.DiscImages TapePartitions = new List { - new TapePartition + new() { FirstBlock = 0, LastBlock = currentBlock - 1, @@ -156,8 +156,8 @@ namespace Aaru.DiscImages _imageInfo.Sectors = (ulong)_blockPositionCache.LongLength; _imageInfo.MediaType = MediaType.UnknownTape; _imageInfo.Application = "CopyTape"; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; IsTape = true; diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs index 01701c5b9..e6147f946 100644 --- a/Aaru.Images/D88/Read.cs +++ b/Aaru.Images/D88/Read.cs @@ -271,9 +271,9 @@ namespace Aaru.DiscImages AaruConsole.DebugWriteLine("D88 plugin", "MediaType: {0}", _imageInfo.MediaType); _imageInfo.ImageSize = (ulong)hdr.disk_size; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = (ulong)_sectorsData.Count; _imageInfo.Comments = StringHandlers.CToString(hdr.name, shiftjis); _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs index ff9c2b97b..902f354c5 100644 --- a/Aaru.Images/DART/Read.cs +++ b/Aaru.Images/DART/Read.cs @@ -178,7 +178,7 @@ namespace Aaru.DiscImages try { - if(imageFilter.HasResourceFork()) + if(imageFilter.HasResourceFork) { var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream()); @@ -280,9 +280,9 @@ namespace Aaru.DiscImages _imageInfo.ApplicationVersion); _imageInfo.Sectors = (ulong)(header.srcSize * 2); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.SectorSize = SECTOR_SIZE; _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; _imageInfo.ImageSize = _imageInfo.Sectors * SECTOR_SIZE; diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs index 92d587e5a..e1bb1833e 100644 --- a/Aaru.Images/DIM/Read.cs +++ b/Aaru.Images/DIM/Read.cs @@ -190,9 +190,9 @@ namespace Aaru.DiscImages _dimImageFilter = imageFilter; _imageInfo.ImageSize = (ulong)diskSize; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.Sectors = _imageInfo.ImageSize / _imageInfo.SectorSize; _imageInfo.Comments = StringHandlers.CToString(_comment, Encoding.GetEncoding(932)); _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs index e93619562..4efa26b70 100644 --- a/Aaru.Images/DiscJuggler/Read.cs +++ b/Aaru.Images/DiscJuggler/Read.cs @@ -591,12 +591,12 @@ namespace Aaru.DiscImages default: throw new ImageNotSupportedException($"Unknown track mode {trackMode}"); } - track.File = imageFilter.GetFilename(); + track.File = imageFilter.Filename; track.Filter = imageFilter; if(track.SubchannelType != TrackSubchannelType.None) { - track.SubchannelFile = imageFilter.GetFilename(); + track.SubchannelFile = imageFilter.Filename; track.SubchannelFilter = imageFilter; if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel)) @@ -758,9 +758,9 @@ namespace Aaru.DiscImages _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags); _imageInfo.Application = "DiscJuggler"; - _imageInfo.ImageSize = (ulong)imageFilter.GetDataForkLength(); - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + _imageInfo.ImageSize = (ulong)imageFilter.DataForkLength; + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; _sectorBuilder = new SectorBuilder(); diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs index a8082ebed..1dd999e4a 100644 --- a/Aaru.Images/DiskCopy42/Identify.cs +++ b/Aaru.Images/DiskCopy42/Identify.cs @@ -83,7 +83,7 @@ namespace Aaru.DiscImages return false; // Some versions seem to incorrectly create little endian fields - if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.GetDataForkLength() && + if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.DataForkLength && tmpHeader.Format != kSigmaFormatTwiggy) { tmpHeader.DataSize = BitConverter.ToUInt32(buffer, 0x40); @@ -91,7 +91,7 @@ namespace Aaru.DiscImages tmpHeader.DataChecksum = BitConverter.ToUInt32(buffer, 0x48); tmpHeader.TagChecksum = BitConverter.ToUInt32(buffer, 0x4C); - if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.GetDataForkLength() && + if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.DataForkLength && tmpHeader.Format != kSigmaFormatTwiggy) return false; } diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs index dc84a255a..694bce87b 100644 --- a/Aaru.Images/DiskCopy42/Read.cs +++ b/Aaru.Images/DiskCopy42/Read.cs @@ -89,7 +89,7 @@ namespace Aaru.DiscImages return false; // Some versions seem to incorrectly create little endian fields - if(header.DataSize + header.TagSize + 0x54 != imageFilter.GetDataForkLength() && + if(header.DataSize + header.TagSize + 0x54 != imageFilter.DataForkLength && header.Format != kSigmaFormatTwiggy) { header.DataSize = BitConverter.ToUInt32(buffer, 0x40); @@ -97,7 +97,7 @@ namespace Aaru.DiscImages header.DataChecksum = BitConverter.ToUInt32(buffer, 0x48); header.TagChecksum = BitConverter.ToUInt32(buffer, 0x4C); - if(header.DataSize + header.TagSize + 0x54 != imageFilter.GetDataForkLength() && + if(header.DataSize + header.TagSize + 0x54 != imageFilter.DataForkLength && header.Format != kSigmaFormatTwiggy) return false; } @@ -163,8 +163,8 @@ namespace Aaru.DiscImages } imageInfo.ImageSize = (imageInfo.Sectors * imageInfo.SectorSize) + (imageInfo.Sectors * bptag); - imageInfo.CreationTime = imageFilter.GetCreationTime(); - imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); + imageInfo.CreationTime = imageFilter.CreationTime; + imageInfo.LastModificationTime = imageFilter.LastWriteTime; imageInfo.MediaTitle = header.DiskName; switch(header.Format) @@ -313,7 +313,7 @@ namespace Aaru.DiscImages try { - if(imageFilter.HasResourceFork()) + if(imageFilter.HasResourceFork) { var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream()); diff --git a/Aaru.Images/DiskDupe/Read.cs b/Aaru.Images/DiskDupe/Read.cs index b1f5c4d05..b70c2f9a1 100644 --- a/Aaru.Images/DiskDupe/Read.cs +++ b/Aaru.Images/DiskDupe/Read.cs @@ -68,9 +68,9 @@ namespace Aaru.DiscImages _imageInfo.XmlMediaType = XmlMediaType.BlockMedia; - _imageInfo.CreationTime = imageFilter.GetCreationTime(); - _imageInfo.LastModificationTime = imageFilter.GetLastWriteTime(); - _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.GetFilename()); + _imageInfo.CreationTime = imageFilter.CreationTime; + _imageInfo.LastModificationTime = imageFilter.LastWriteTime; + _imageInfo.MediaTitle = Path.GetFileNameWithoutExtension(imageFilter.Filename); _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads, (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM, diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs index e7696301c..4c3fb292e 100644 --- a/Aaru.Images/DriDiskCopy/Read.cs +++ b/Aaru.Images/DriDiskCopy/Read.cs @@ -81,8 +81,8 @@ namespace Aaru.DiscImages _driImageFilter = imageFilter; _imageInfo.ImageSize = (ulong)(stream.Length - Marshal.SizeOf