diff --git a/Aaru.Checksums b/Aaru.Checksums index 223ccea7f..d350a4463 160000 --- a/Aaru.Checksums +++ b/Aaru.Checksums @@ -1 +1 @@ -Subproject commit 223ccea7f0d16af9c00d78d1c8dc72826165ff0f +Subproject commit d350a446320b15283d98dd5c207a7d7d835cb78c diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index afcceb66d..5858e12e7 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit afcceb66d075dfdc3bb37df0ea78bdf01d9a5371 +Subproject commit 5858e12e728646b6c454b9542147048523048cb9 diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj index 84a774040..cef398ed7 100644 --- a/Aaru.Compression/Aaru.Compression.csproj +++ b/Aaru.Compression/Aaru.Compression.csproj @@ -6,7 +6,7 @@ {858398D1-7321-4763-8BAB-56BBFEC74E29} Library Properties - DiscImageChef.Compression + Aaru.Compression Aaru.Compression 512 $(Version) diff --git a/Aaru.Compression/AppleRle.cs b/Aaru.Compression/AppleRle.cs index b94d9f546..eeda01220 100644 --- a/Aaru.Compression/AppleRle.cs +++ b/Aaru.Compression/AppleRle.cs @@ -33,7 +33,7 @@ using System.IO; -namespace DiscImageChef.Compression +namespace Aaru.Compression { public class AppleRle { diff --git a/Aaru.Compression/TeleDiskLzh.cs b/Aaru.Compression/TeleDiskLzh.cs index b9f3dde7c..7e4b74887 100644 --- a/Aaru.Compression/TeleDiskLzh.cs +++ b/Aaru.Compression/TeleDiskLzh.cs @@ -45,7 +45,7 @@ using System; using System.IO; -namespace DiscImageChef.Compression +namespace Aaru.Compression { /* * Based on Japanese version 29-NOV-1988 diff --git a/Aaru.Console b/Aaru.Console index fcb02dec8..f88ccf06f 160000 --- a/Aaru.Console +++ b/Aaru.Console @@ -1 +1 @@ -Subproject commit fcb02dec83072147347f5548e9a1a4e98b021b06 +Subproject commit f88ccf06f5df9816ab0a388fbcdccaa41ac3078f diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj index bc0a6b8d4..79659a726 100644 --- a/Aaru.Core/Aaru.Core.csproj +++ b/Aaru.Core/Aaru.Core.csproj @@ -6,7 +6,7 @@ 2.0 {679659B8-25D0-4279-B632-56EF8F94ADC0} Library - DiscImageChef.Core + Aaru.Core Aaru.Core $(Version) false diff --git a/Aaru.Core/Checksum.cs b/Aaru.Core/Checksum.cs index e77c9ed0b..2b83b9f20 100644 --- a/Aaru.Core/Checksum.cs +++ b/Aaru.Core/Checksum.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Threading; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { [Flags] public enum EnableChecksum diff --git a/Aaru.Core/DataFile.cs b/Aaru.Core/DataFile.cs index 46f3922d2..e0b5837ad 100644 --- a/Aaru.Core/DataFile.cs +++ b/Aaru.Core/DataFile.cs @@ -32,9 +32,9 @@ using System.Diagnostics.CodeAnalysis; using System.IO; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Core +namespace Aaru.Core { /// /// Abstracts a datafile with a block based interface diff --git a/Aaru.Core/Delegates.cs b/Aaru.Core/Delegates.cs index ef688f25e..889122bc3 100644 --- a/Aaru.Core/Delegates.cs +++ b/Aaru.Core/Delegates.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core +namespace Aaru.Core { /// /// Initializates a progress indicator (e.g. makes a progress bar visible) diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs index 5117115f7..effdb128d 100644 --- a/Aaru.Core/Devices/Dumping/ATA.cs +++ b/Aaru.Core/Devices/Dumping/ATA.cs @@ -35,18 +35,18 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.PCMCIA; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Decoders.PCMCIA; using Schemas; -using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using Tuple = Aaru.Decoders.PCMCIA.Tuple; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements dumping ATA devices public partial class Dump diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs index cdddc7dbd..0e23f2f3e 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs @@ -32,20 +32,20 @@ using System; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; using Schemas; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs index b5760c95f..44b65ec00 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs @@ -34,27 +34,27 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Core.Media.Detection; -using DiscImageChef.Database.Models; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.Core.Media.Detection; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Database.Models; +using Aaru.Decoders.CD; +using Aaru.Devices; using Schemas; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using TrackType = Aaru.CommonTypes.Enums.TrackType; +using Version = Aaru.CommonTypes.Interop.Version; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implement dumping Compact Discs diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs index 6961fe52e..54b11e788 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs @@ -32,19 +32,19 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; using Schemas; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs index b00ea4011..950a99db7 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs @@ -31,17 +31,17 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.Core.Logging; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.Devices; using Schemas; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs index c154b4695..a5a769e41 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs @@ -34,18 +34,18 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.Checksums; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Devices; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { @@ -124,7 +124,7 @@ namespace DiscImageChef.Core.Devices.Dumping public static void SolveTrackPregaps(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus, Track[] tracks, bool supportsPqSubchannel, bool supportsRwSubchannel, - Database.Models.Device dbDev, out bool inexactPositioning) + Aaru.Database.Models.Device dbDev, out bool inexactPositioning) { bool sense = true; // Sense indicator byte[] subBuf = null; @@ -546,7 +546,7 @@ namespace DiscImageChef.Core.Devices.Dumping } } - static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf) + static bool GetSectorForPregapRaw(Device dev, uint lba, Aaru.Database.Models.Device dbDev, out byte[] subBuf) { byte[] cmdBuf; bool sense; @@ -601,7 +601,7 @@ namespace DiscImageChef.Core.Devices.Dumping return sense; } - static bool GetSectorForPregapQ16(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf) + static bool GetSectorForPregapQ16(Device dev, uint lba, Aaru.Database.Models.Device dbDev, out byte[] subBuf) { byte[] cmdBuf; bool sense; diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs index 7708d04d3..7c3a30ab2 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs @@ -30,14 +30,14 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Core.Logging; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.Devices; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs index 8b356d9a7..bfb7b1451 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs @@ -32,17 +32,17 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Devices; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Devices; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs index 7e9d7413f..19d7a3892 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs @@ -33,18 +33,18 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders.CD; +using Aaru.Devices; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs index 10fae0eaa..e19fa7057 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs @@ -31,16 +31,16 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.Devices; using Schemas; // ReSharper disable JoinDeclarationAndInitializer // ReSharper disable InlineOutVariableDeclaration // ReSharper disable TooWideLocalVariableScope -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/Dump.cs b/Aaru.Core/Devices/Dumping/Dump.cs index 9b5989818..21b5657a3 100644 --- a/Aaru.Core/Devices/Dumping/Dump.cs +++ b/Aaru.Core/Devices/Dumping/Dump.cs @@ -4,15 +4,15 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Core.Logging; -using DiscImageChef.Database; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.Database; +using Aaru.Devices; using Schemas; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { public enum DumpSubchannel { @@ -43,7 +43,7 @@ namespace DiscImageChef.Core.Devices.Dumping readonly bool _trim; bool _aborted; DicContext _ctx; // Master database context - Database.Models.Device _dbDev; // Device database entry + Aaru.Database.Models.Device _dbDev; // Device database entry bool _dumpFirstTrackPregap; bool _fixOffset; uint _maximumReadable; // Maximum number of sectors drive can read at once @@ -113,7 +113,7 @@ namespace DiscImageChef.Core.Devices.Dumping public void Start() { // Open master database - _ctx = DicContext.Create(Settings.Settings.MasterDbPath); + _ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath); // Search for device in master database _dbDev = _ctx.Devices.FirstOrDefault(d => d.Manufacturer == _dev.Manufacturer && d.Model == _dev.Model && diff --git a/Aaru.Core/Devices/Dumping/MMC.cs b/Aaru.Core/Devices/Dumping/MMC.cs index cb9833352..052942609 100644 --- a/Aaru.Core/Devices/Dumping/MMC.cs +++ b/Aaru.Core/Devices/Dumping/MMC.cs @@ -32,19 +32,19 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.Bluray; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Devices; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.Bluray; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Devices; using Schemas; -using DDS = DiscImageChef.Decoders.DVD.DDS; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Spare = DiscImageChef.Decoders.DVD.Spare; +using DDS = Aaru.Decoders.DVD.DDS; +using DMI = Aaru.Decoders.Xbox.DMI; +using Spare = Aaru.Decoders.DVD.Spare; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implement dumping optical discs from MultiMedia devices partial class Dump diff --git a/Aaru.Core/Devices/Dumping/Metadata.cs b/Aaru.Core/Devices/Dumping/Metadata.cs index b33f91775..d0338b810 100644 --- a/Aaru.Core/Devices/Dumping/Metadata.cs +++ b/Aaru.Core/Devices/Dumping/Metadata.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; using Schemas; -using MediaType = DiscImageChef.CommonTypes.MediaType; +using MediaType = Aaru.CommonTypes.MediaType; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/NVMe.cs b/Aaru.Core/Devices/Dumping/NVMe.cs index 7d094117f..35608f4ca 100644 --- a/Aaru.Core/Devices/Dumping/NVMe.cs +++ b/Aaru.Core/Devices/Dumping/NVMe.cs @@ -34,7 +34,7 @@ // ReSharper disable InconsistentNaming -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { public partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs index a3720337c..a316dad36 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs @@ -4,23 +4,23 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; using Schemas; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using MediaType = Aaru.CommonTypes.MediaType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { public partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/ResumeSupport.cs b/Aaru.Core/Devices/Dumping/ResumeSupport.cs index b2c4fd754..6f333dbaf 100644 --- a/Aaru.Core/Devices/Dumping/ResumeSupport.cs +++ b/Aaru.Core/Devices/Dumping/ResumeSupport.cs @@ -32,13 +32,13 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Metadata; using Schemas; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements resume support internal static class ResumeSupport diff --git a/Aaru.Core/Devices/Dumping/SBC.cs b/Aaru.Core/Devices/Dumping/SBC.cs index ea540d177..26b26a53d 100644 --- a/Aaru.Core/Devices/Dumping/SBC.cs +++ b/Aaru.Core/Devices/Dumping/SBC.cs @@ -35,23 +35,23 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; using Schemas; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using MediaType = Aaru.CommonTypes.MediaType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements dumping SCSI Block Commands and Reduced Block Commands devices partial class Dump diff --git a/Aaru.Core/Devices/Dumping/SCSI.cs b/Aaru.Core/Devices/Dumping/SCSI.cs index 925a1fb97..02302d865 100644 --- a/Aaru.Core/Devices/Dumping/SCSI.cs +++ b/Aaru.Core/Devices/Dumping/SCSI.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System.Threading; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.SCSI; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.SCSI; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements dumping SCSI and ATAPI devices public partial class Dump diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs index abb248cdd..ec327c649 100644 --- a/Aaru.Core/Devices/Dumping/SSC.cs +++ b/Aaru.Core/Devices/Dumping/SSC.cs @@ -36,21 +36,21 @@ using System.IO; using System.Linq; using System.Threading; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; using Schemas; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using MediaType = Aaru.CommonTypes.MediaType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { partial class Dump { diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs index fe9bd101f..05fe9d602 100644 --- a/Aaru.Core/Devices/Dumping/SecureDigital.cs +++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs @@ -35,18 +35,18 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.MMC; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.Decoders.MMC; using Schemas; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using MediaType = Aaru.CommonTypes.MediaType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements dumping a MultiMediaCard or SecureDigital flash card public partial class Dump @@ -95,7 +95,7 @@ namespace DiscImageChef.Core.Devices.Dumping if(!sense) { - ExtendedCSD ecsdDecoded = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd); + ExtendedCSD ecsdDecoded = Aaru.Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd); blocksToRead = ecsdDecoded.OptimalReadSize; blocks = ecsdDecoded.SectorCount; blockSize = (uint)(ecsdDecoded.SectorSize == 1 ? 4096 : 512); @@ -120,7 +120,7 @@ namespace DiscImageChef.Core.Devices.Dumping { if(blocks == 0) { - CSD csdDecoded = Decoders.MMC.Decoders.DecodeCSD(csd); + CSD csdDecoded = Aaru.Decoders.MMC.Decoders.DecodeCSD(csd); blocks = (ulong)((csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2)); blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength); } @@ -150,7 +150,7 @@ namespace DiscImageChef.Core.Devices.Dumping if(!sense) { - Decoders.SecureDigital.CSD csdDecoded = Decoders.SecureDigital.Decoders.DecodeCSD(csd); + Aaru.Decoders.SecureDigital.CSD csdDecoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCSD(csd); blocks = (ulong)(csdDecoded.Structure == 0 ? (csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2) diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs index cd8023680..e4c9020c0 100644 --- a/Aaru.Core/Devices/Dumping/XGD.cs +++ b/Aaru.Core/Devices/Dumping/XGD.cs @@ -33,25 +33,25 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.Xbox; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.Xbox; +using Aaru.Devices; using Schemas; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using TrackType = Aaru.CommonTypes.Enums.TrackType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Devices.Dumping +namespace Aaru.Core.Devices.Dumping { /// Implements dumping an Xbox Game Disc using a Kreon drive partial class Dump diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs index 459f40d4c..accfbb825 100644 --- a/Aaru.Core/Devices/Info/DeviceInfo.cs +++ b/Aaru.Core/Devices/Info/DeviceInfo.cs @@ -32,15 +32,15 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Decoders.SCSI; +using Aaru.Devices; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; -namespace DiscImageChef.Core.Devices.Info +namespace Aaru.Core.Devices.Info { public partial class DeviceInfo { @@ -518,7 +518,7 @@ namespace DiscImageChef.Core.Devices.Info else { DensitySupport = seqBuf; - DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); + DensitySupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); } sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _); @@ -529,7 +529,7 @@ namespace DiscImageChef.Core.Devices.Info else { MediumDensitySupport = seqBuf; - MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); + MediaTypeSupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); } break; diff --git a/Aaru.Core/Devices/Info/Plextor.cs b/Aaru.Core/Devices/Info/Plextor.cs index cae66345c..9623fc7dc 100644 --- a/Aaru.Core/Devices/Info/Plextor.cs +++ b/Aaru.Core/Devices/Info/Plextor.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core.Devices.Info +namespace Aaru.Core.Devices.Info { public class Plextor { diff --git a/Aaru.Core/Devices/Info/Properties.cs b/Aaru.Core/Devices/Info/Properties.cs index e44147b06..0163d119a 100644 --- a/Aaru.Core/Devices/Info/Properties.cs +++ b/Aaru.Core/Devices/Info/Properties.cs @@ -31,15 +31,15 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.ATA; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; -namespace DiscImageChef.Core.Devices.Info +namespace Aaru.Core.Devices.Info { public partial class DeviceInfo { diff --git a/Aaru.Core/Devices/Reader.cs b/Aaru.Core/Devices/Reader.cs index 4d3280124..a3c66e805 100644 --- a/Aaru.Core/Devices/Reader.cs +++ b/Aaru.Core/Devices/Reader.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices +namespace Aaru.Core.Devices { /// Reduces common code used for scanning and dumping internal partial class Reader diff --git a/Aaru.Core/Devices/ReaderATA.cs b/Aaru.Core/Devices/ReaderATA.cs index 04f083967..8037a4cd7 100644 --- a/Aaru.Core/Devices/ReaderATA.cs +++ b/Aaru.Core/Devices/ReaderATA.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using Identify = DiscImageChef.CommonTypes.Structs.Devices.ATA.Identify; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify; -namespace DiscImageChef.Core.Devices +namespace Aaru.Core.Devices { internal partial class Reader { diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs index 51723756e..1290981d5 100644 --- a/Aaru.Core/Devices/ReaderSCSI.cs +++ b/Aaru.Core/Devices/ReaderSCSI.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; -namespace DiscImageChef.Core.Devices +namespace Aaru.Core.Devices { internal partial class Reader { diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs index 856e2d4e7..2927e1c76 100644 --- a/Aaru.Core/Devices/Report/ATA.cs +++ b/Aaru.Core/Devices/Report/ATA.cs @@ -31,13 +31,13 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; -using Identify = DiscImageChef.CommonTypes.Structs.Devices.ATA.Identify; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; +using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { public partial class DeviceReport { diff --git a/Aaru.Core/Devices/Report/DeviceReport.cs b/Aaru.Core/Devices/Report/DeviceReport.cs index 76aa142e5..035c3aa71 100644 --- a/Aaru.Core/Devices/Report/DeviceReport.cs +++ b/Aaru.Core/Devices/Report/DeviceReport.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Devices; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { public partial class DeviceReport { diff --git a/Aaru.Core/Devices/Report/FireWire.cs b/Aaru.Core/Devices/Report/FireWire.cs index 04adef795..9d0555a72 100644 --- a/Aaru.Core/Devices/Report/FireWire.cs +++ b/Aaru.Core/Devices/Report/FireWire.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes.Metadata; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { /// Implements creating a report for a FireWire device public partial class DeviceReport diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs index 4cc44019b..abee56837 100644 --- a/Aaru.Core/Devices/Report/MMC.cs +++ b/Aaru.Core/Devices/Report/MMC.cs @@ -33,14 +33,14 @@ using System; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { public partial class DeviceReport { diff --git a/Aaru.Core/Devices/Report/PCMCIA.cs b/Aaru.Core/Devices/Report/PCMCIA.cs index 2bc1fce3c..ce9a6d7db 100644 --- a/Aaru.Core/Devices/Report/PCMCIA.cs +++ b/Aaru.Core/Devices/Report/PCMCIA.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Decoders.PCMCIA; +using Aaru.CommonTypes.Metadata; +using Aaru.Decoders.PCMCIA; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { /// Implements creating a report for a PCMCIA device public partial class DeviceReport diff --git a/Aaru.Core/Devices/Report/SSC.cs b/Aaru.Core/Devices/Report/SSC.cs index f5bbd599f..e0b59e1b3 100644 --- a/Aaru.Core/Devices/Report/SSC.cs +++ b/Aaru.Core/Devices/Report/SSC.cs @@ -31,13 +31,13 @@ // ****************************************************************************/ using System.Linq; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { public partial class DeviceReport { diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs index 2f8b638cf..417ebfb19 100644 --- a/Aaru.Core/Devices/Report/Scsi.cs +++ b/Aaru.Core/Devices/Report/Scsi.cs @@ -33,14 +33,14 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { public partial class DeviceReport { diff --git a/Aaru.Core/Devices/Report/SecureDigital.cs b/Aaru.Core/Devices/Report/SecureDigital.cs index d1828316c..49da7b223 100644 --- a/Aaru.Core/Devices/Report/SecureDigital.cs +++ b/Aaru.Core/Devices/Report/SecureDigital.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { /// Implements creating a device report for a SecureDigital or MultiMediaCard flash card public partial class DeviceReport diff --git a/Aaru.Core/Devices/Report/USB.cs b/Aaru.Core/Devices/Report/USB.cs index b6282acdb..0fd221580 100644 --- a/Aaru.Core/Devices/Report/USB.cs +++ b/Aaru.Core/Devices/Report/USB.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes.Metadata; -namespace DiscImageChef.Core.Devices.Report +namespace Aaru.Core.Devices.Report { /// Implements creating a report for a USB device public partial class DeviceReport diff --git a/Aaru.Core/Devices/Scanning/ATA.cs b/Aaru.Core/Devices/Scanning/ATA.cs index dae35cfa4..244d572b6 100644 --- a/Aaru.Core/Devices/Scanning/ATA.cs +++ b/Aaru.Core/Devices/Scanning/ATA.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Core.Logging; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Structs.Devices.ATA; -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { /// Implements scanning the media from an ATA device public partial class MediaScan diff --git a/Aaru.Core/Devices/Scanning/MediaScan.cs b/Aaru.Core/Devices/Scanning/MediaScan.cs index 2f9a343df..8cbd8d666 100644 --- a/Aaru.Core/Devices/Scanning/MediaScan.cs +++ b/Aaru.Core/Devices/Scanning/MediaScan.cs @@ -1,8 +1,8 @@ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { public partial class MediaScan { diff --git a/Aaru.Core/Devices/Scanning/NVMe.cs b/Aaru.Core/Devices/Scanning/NVMe.cs index b3854e425..8da198454 100644 --- a/Aaru.Core/Devices/Scanning/NVMe.cs +++ b/Aaru.Core/Devices/Scanning/NVMe.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { public partial class MediaScan { diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs index 0b409f01d..fae090fa2 100644 --- a/Aaru.Core/Devices/Scanning/SCSI.cs +++ b/Aaru.Core/Devices/Scanning/SCSI.cs @@ -33,15 +33,15 @@ using System; using System.Collections.Generic; using System.Threading; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Devices; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Devices; -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { /// Implements scanning the media from an SCSI device public partial class MediaScan diff --git a/Aaru.Core/Devices/Scanning/ScanResults.cs b/Aaru.Core/Devices/Scanning/ScanResults.cs index 2a9d6dcc5..3db84ebf0 100644 --- a/Aaru.Core/Devices/Scanning/ScanResults.cs +++ b/Aaru.Core/Devices/Scanning/ScanResults.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { /// /// Contains the results of a media scan diff --git a/Aaru.Core/Devices/Scanning/SecureDigital.cs b/Aaru.Core/Devices/Scanning/SecureDigital.cs index c2cc89336..6ec413380 100644 --- a/Aaru.Core/Devices/Scanning/SecureDigital.cs +++ b/Aaru.Core/Devices/Scanning/SecureDigital.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Core.Logging; -using DiscImageChef.Decoders.MMC; +using Aaru.Core.Logging; +using Aaru.CommonTypes.Enums; +using Aaru.Decoders.MMC; -namespace DiscImageChef.Core.Devices.Scanning +namespace Aaru.Core.Devices.Scanning { /// /// Implements scanning a SecureDigital or MultiMediaCard flash card @@ -63,7 +63,7 @@ namespace DiscImageChef.Core.Devices.Scanning sense = dev.ReadExtendedCsd(out cmdBuf, out _, TIMEOUT, out _); if(!sense) { - ExtendedCSD ecsd = Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf); + ExtendedCSD ecsd = Aaru.Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf); blocksToRead = ecsd.OptimalReadSize; results.Blocks = ecsd.SectorCount; blockSize = (uint)(ecsd.SectorSize == 1 ? 4096 : 512); @@ -76,7 +76,7 @@ namespace DiscImageChef.Core.Devices.Scanning sense = dev.ReadCsd(out cmdBuf, out _, TIMEOUT, out _); if(!sense) { - CSD csd = Decoders.MMC.Decoders.DecodeCSD(cmdBuf); + CSD csd = Aaru.Decoders.MMC.Decoders.DecodeCSD(cmdBuf); results.Blocks = (ulong)((csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2)); blockSize = (uint)Math.Pow(2, csd.ReadBlockLength); } @@ -90,7 +90,7 @@ namespace DiscImageChef.Core.Devices.Scanning sense = dev.ReadCsd(out cmdBuf, out _, TIMEOUT, out _); if(!sense) { - Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf); + Aaru.Decoders.SecureDigital.CSD csd = Aaru.Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf); results.Blocks = (ulong)(csd.Structure == 0 ? (csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2) : (csd.Size + 1) * 1024); diff --git a/Aaru.Core/Entropy.cs b/Aaru.Core/Entropy.cs index 4de04b6b6..b12e4c7ac 100644 --- a/Aaru.Core/Entropy.cs +++ b/Aaru.Core/Entropy.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; -namespace DiscImageChef.Core +namespace Aaru.Core { public class Entropy { diff --git a/Aaru.Core/Error.cs b/Aaru.Core/Error.cs index 83db3e343..6560986e8 100644 --- a/Aaru.Core/Error.cs +++ b/Aaru.Core/Error.cs @@ -1,8 +1,8 @@ using System; -using DiscImageChef.CommonTypes.Interop; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using Aaru.CommonTypes.Interop; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class Error { diff --git a/Aaru.Core/Filesystems.cs b/Aaru.Core/Filesystems.cs index 208da2817..def47b8e9 100644 --- a/Aaru.Core/Filesystems.cs +++ b/Aaru.Core/Filesystems.cs @@ -32,10 +32,10 @@ using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class Filesystems { diff --git a/Aaru.Core/GetPluginBase.cs b/Aaru.Core/GetPluginBase.cs index 05fbe5ddd..5edd7fdff 100644 --- a/Aaru.Core/GetPluginBase.cs +++ b/Aaru.Core/GetPluginBase.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class GetPluginBase { @@ -45,10 +45,10 @@ namespace DiscImageChef.Core PluginBase instance = new PluginBase(); IPluginRegister checksumRegister = new Register(); - IPluginRegister imagesRegister = new DiscImages.Register(); - IPluginRegister filesystemsRegister = new DiscImageChef.Filesystems.Register(); - IPluginRegister filtersRegister = new Filters.Register(); - IPluginRegister partitionsRegister = new DiscImageChef.Partitions.Register(); + IPluginRegister imagesRegister = new Aaru.DiscImages.Register(); + IPluginRegister filesystemsRegister = new Aaru.Filesystems.Register(); + IPluginRegister filtersRegister = new Aaru.Filters.Register(); + IPluginRegister partitionsRegister = new Aaru.Partitions.Register(); instance.AddPlugins(checksumRegister); instance.AddPlugins(imagesRegister); diff --git a/Aaru.Core/ImageFormat.cs b/Aaru.Core/ImageFormat.cs index 81fb35206..330ba62a2 100644 --- a/Aaru.Core/ImageFormat.cs +++ b/Aaru.Core/ImageFormat.cs @@ -32,11 +32,11 @@ using System; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class ImageFormat { diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs index 504ec0f0a..e89f3d289 100644 --- a/Aaru.Core/ImageInfo.cs +++ b/Aaru.Core/ImageInfo.cs @@ -33,26 +33,26 @@ using System; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.Bluray; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.PCMCIA; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.Xbox; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Decoders.Bluray; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.PCMCIA; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.Xbox; using Schemas; -using DDS = DiscImageChef.Decoders.DVD.DDS; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; -using Session = DiscImageChef.CommonTypes.Structs.Session; -using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; +using DDS = Aaru.Decoders.DVD.DDS; +using DMI = Aaru.Decoders.Xbox.DMI; +using Inquiry = Aaru.Decoders.SCSI.Inquiry; +using Session = Aaru.CommonTypes.Structs.Session; +using Tuple = Aaru.Decoders.PCMCIA.Tuple; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class ImageInfo { @@ -390,7 +390,7 @@ namespace DiscImageChef.Core byte[] dds = imageFormat.ReadDiskTag(MediaTagType.BD_DDS); DicConsole.WriteLine("Bluray Disc Definition Structure contained in image:"); - DicConsole.Write("{0}", Decoders.Bluray.DDS.Prettify(dds)); + DicConsole.Write("{0}", Aaru.Decoders.Bluray.DDS.Prettify(dds)); DicConsole.WriteLine(); } @@ -475,7 +475,7 @@ namespace DiscImageChef.Core byte[] cid = imageFormat.ReadDiskTag(MediaTagType.SD_CID); DicConsole.WriteLine("SecureDigital CID contained in image:"); - DicConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(cid)); + DicConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCID(cid)); DicConsole.WriteLine(); } @@ -485,7 +485,7 @@ namespace DiscImageChef.Core byte[] csd = imageFormat.ReadDiskTag(MediaTagType.SD_CSD); DicConsole.WriteLine("SecureDigital CSD contained in image:"); - DicConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(csd)); + DicConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCSD(csd)); DicConsole.WriteLine(); } @@ -495,7 +495,7 @@ namespace DiscImageChef.Core byte[] scr = imageFormat.ReadDiskTag(MediaTagType.SD_SCR); DicConsole.WriteLine("SecureDigital SCR contained in image:"); - DicConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(scr)); + DicConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifySCR(scr)); DicConsole.WriteLine(); } @@ -505,7 +505,7 @@ namespace DiscImageChef.Core byte[] ocr = imageFormat.ReadDiskTag(MediaTagType.SD_OCR); DicConsole.WriteLine("SecureDigital OCR contained in image:"); - DicConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(ocr)); + DicConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyOCR(ocr)); DicConsole.WriteLine(); } @@ -515,7 +515,7 @@ namespace DiscImageChef.Core byte[] cid = imageFormat.ReadDiskTag(MediaTagType.MMC_CID); DicConsole.WriteLine("MultiMediaCard CID contained in image:"); - DicConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCID(cid)); + DicConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCID(cid)); DicConsole.WriteLine(); } @@ -525,7 +525,7 @@ namespace DiscImageChef.Core byte[] csd = imageFormat.ReadDiskTag(MediaTagType.MMC_CSD); DicConsole.WriteLine("MultiMediaCard CSD contained in image:"); - DicConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCSD(csd)); + DicConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCSD(csd)); DicConsole.WriteLine(); } @@ -535,7 +535,7 @@ namespace DiscImageChef.Core byte[] ecsd = imageFormat.ReadDiskTag(MediaTagType.MMC_ExtendedCSD); DicConsole.WriteLine("MultiMediaCard ExtendedCSD contained in image:"); - DicConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd)); + DicConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd)); DicConsole.WriteLine(); } @@ -545,7 +545,7 @@ namespace DiscImageChef.Core byte[] ocr = imageFormat.ReadDiskTag(MediaTagType.MMC_OCR); DicConsole.WriteLine("MultiMediaCard OCR contained in image:"); - DicConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyOCR(ocr)); + DicConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyOCR(ocr)); DicConsole.WriteLine(); } diff --git a/Aaru.Core/Logging/DumpLog.cs b/Aaru.Core/Logging/DumpLog.cs index c73d64519..e5639fde6 100644 --- a/Aaru.Core/Logging/DumpLog.cs +++ b/Aaru.Core/Logging/DumpLog.cs @@ -34,12 +34,12 @@ using System; using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Devices; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using Aaru.CommonTypes.Interop; +using Aaru.Devices; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Core.Logging +namespace Aaru.Core.Logging { /// Creates a dump log public class DumpLog diff --git a/Aaru.Core/Logging/IBGLog.cs b/Aaru.Core/Logging/IBGLog.cs index 63b36e061..2bc448172 100644 --- a/Aaru.Core/Logging/IBGLog.cs +++ b/Aaru.Core/Logging/IBGLog.cs @@ -34,9 +34,9 @@ using System; using System.Globalization; using System.IO; using System.Text; -using DiscImageChef.Devices; +using Aaru.Devices; -namespace DiscImageChef.Core.Logging +namespace Aaru.Core.Logging { /// Implements a log in the format used by IMGBurn internal class IbgLog diff --git a/Aaru.Core/Logging/MHDDLog.cs b/Aaru.Core/Logging/MHDDLog.cs index 7cd2c4a0c..0fa9632d4 100644 --- a/Aaru.Core/Logging/MHDDLog.cs +++ b/Aaru.Core/Logging/MHDDLog.cs @@ -34,10 +34,10 @@ using System; using System.Globalization; using System.IO; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.Devices; -namespace DiscImageChef.Core.Logging +namespace Aaru.Core.Logging { /// Implements a log in the format used by MHDD internal class MhddLog diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs index f49a2695d..6bd03aa58 100644 --- a/Aaru.Core/Media/Detection/MMC.cs +++ b/Aaru.Core/Media/Detection/MMC.cs @@ -33,16 +33,16 @@ using System; using System.IO; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.Sega; -using DiscImageChef.Devices; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.Sega; +using Aaru.Devices; // ReSharper disable JoinDeclarationAndInitializer -namespace DiscImageChef.Core.Media.Detection +namespace Aaru.Core.Media.Detection { public static class MMC { diff --git a/Aaru.Core/Media/Info/CompactDisc.cs b/Aaru.Core/Media/Info/CompactDisc.cs index c2c481ddc..0de2fec77 100644 --- a/Aaru.Core/Media/Info/CompactDisc.cs +++ b/Aaru.Core/Media/Info/CompactDisc.cs @@ -1,17 +1,17 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Core.Logging; -using DiscImageChef.Core.Media.Detection; -using DiscImageChef.Database.Models; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Devices; -using Device = DiscImageChef.Database.Models.Device; +using Aaru.Core.Logging; +using Aaru.Core.Media.Detection; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Database.Models; +using Aaru.Decoders.CD; +using Aaru.Devices; +using Device = Aaru.Database.Models.Device; -namespace DiscImageChef.Core.Media.Info +namespace Aaru.Core.Media.Info { public static class CompactDisc { @@ -28,7 +28,7 @@ namespace DiscImageChef.Core.Media.Info /// Combined offset /// true if offset could be found, false otherwise [SuppressMessage("ReSharper", "TooWideLocalVariableScope")] - public static void GetOffset(CdOffset cdOffset, Device dbDev, bool debug, DiscImageChef.Devices.Device dev, + public static void GetOffset(CdOffset cdOffset, Device dbDev, bool debug, Aaru.Devices.Device dev, MediaType dskType, DumpLog dumpLog, Track[] tracks, UpdateStatusHandler updateStatus, out int? driveOffset, out int? combinedOffset) { diff --git a/Aaru.Core/Media/Info/ScsiInfo.cs b/Aaru.Core/Media/Info/ScsiInfo.cs index b691629e6..e42c0195e 100644 --- a/Aaru.Core/Media/Info/ScsiInfo.cs +++ b/Aaru.Core/Media/Info/ScsiInfo.cs @@ -34,23 +34,23 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core.Media.Detection; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Decoders.Xbox; -using DiscImageChef.Devices; -using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; +using Aaru.Core.Media.Detection; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Decoders.Xbox; +using Aaru.Devices; +using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; +using DMI = Aaru.Decoders.Xbox.DMI; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; -namespace DiscImageChef.Core.Media.Info +namespace Aaru.Core.Media.Info { public class ScsiInfo { @@ -157,7 +157,7 @@ namespace DiscImageChef.Core.Media.Info MediaInserted = true; - DeviceInfo = new DeviceInfo(dev); + DeviceInfo = new Devices.Info.DeviceInfo(dev); byte scsiMediumType = 0; byte scsiDensityCode = 0; @@ -240,7 +240,7 @@ namespace DiscImageChef.Core.Media.Info !seqBuf.SequenceEqual(medBuf)) { DensitySupport = seqBuf; - DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); + DensitySupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); } } @@ -254,7 +254,7 @@ namespace DiscImageChef.Core.Media.Info !seqBuf.SequenceEqual(medBuf)) { MediaTypeSupport = medBuf; - MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); + MediaTypeSupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); } } @@ -1126,7 +1126,7 @@ namespace DiscImageChef.Core.Media.Info else { Session = cmdBuf; - DecodedSession = Decoders.CD.Session.Decode(cmdBuf); + DecodedSession = Aaru.Decoders.CD.Session.Decode(cmdBuf); if(DecodedSession.HasValue) { @@ -1505,7 +1505,7 @@ namespace DiscImageChef.Core.Media.Info public Dictionary Isrcs { get; } public bool MediaInserted { get; } public MediaType MediaType { get; } - public DeviceInfo DeviceInfo { get; } + public Devices.Info.DeviceInfo DeviceInfo { get; } public byte[] ReadCapacity { get; } public ulong Blocks { get; } public uint BlockSize { get; } diff --git a/Aaru.Core/Media/Info/XgdInfo.cs b/Aaru.Core/Media/Info/XgdInfo.cs index c1fea837b..c7f85dc90 100644 --- a/Aaru.Core/Media/Info/XgdInfo.cs +++ b/Aaru.Core/Media/Info/XgdInfo.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core.Media.Info +namespace Aaru.Core.Media.Info { public class XgdInfo { diff --git a/Aaru.Core/Options.cs b/Aaru.Core/Options.cs index 9186418fc..cc034349a 100644 --- a/Aaru.Core/Options.cs +++ b/Aaru.Core/Options.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class Options { diff --git a/Aaru.Core/Partitions.cs b/Aaru.Core/Partitions.cs index 9edd96814..d7550619a 100644 --- a/Aaru.Core/Partitions.cs +++ b/Aaru.Core/Partitions.cs @@ -32,13 +32,13 @@ using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Partitions; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Partitions; -namespace DiscImageChef.Core +namespace Aaru.Core { /// /// Implements methods for handling partitions diff --git a/Aaru.Core/PrintScsiModePages.cs b/Aaru.Core/PrintScsiModePages.cs index 443067320..4a3c19e56 100644 --- a/Aaru.Core/PrintScsiModePages.cs +++ b/Aaru.Core/PrintScsiModePages.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; -namespace DiscImageChef.Core +namespace Aaru.Core { public static class PrintScsiModePages { diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs index 38e6443dc..a474ca726 100644 --- a/Aaru.Core/Remote.cs +++ b/Aaru.Core/Remote.cs @@ -38,17 +38,17 @@ using System.Linq; using System.Net; using System.Text; using System.Threading; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; -using DiscImageChef.Dto; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; +using Aaru.Database; +using Aaru.Database.Models; +using Aaru.Dto; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using CdOffset = DiscImageChef.Database.Models.CdOffset; -using Version = DiscImageChef.CommonTypes.Metadata.Version; +using CdOffset = Aaru.Database.Models.CdOffset; +using Version = Aaru.CommonTypes.Metadata.Version; -namespace DiscImageChef.Core +namespace Aaru.Core { /// /// Handles connections to DiscImageChef.Server @@ -113,7 +113,7 @@ namespace DiscImageChef.Core public static void UpdateMasterDatabase(bool create) { - DicContext mctx = DicContext.Create(Settings.Settings.MasterDbPath); + DicContext mctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath); mctx.Database.Migrate(); mctx.SaveChanges(); diff --git a/Aaru.Core/Sidecar/AudioMedia.cs b/Aaru.Core/Sidecar/AudioMedia.cs index 24e5f7c66..cc41f605c 100644 --- a/Aaru.Core/Sidecar/AudioMedia.cs +++ b/Aaru.Core/Sidecar/AudioMedia.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs index 49b17abe3..aa829ec2f 100644 --- a/Aaru.Core/Sidecar/BlockMedia.cs +++ b/Aaru.Core/Sidecar/BlockMedia.cs @@ -35,21 +35,23 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.PCMCIA; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Decoders.PCMCIA; +using Aaru.DiscImages; +using Aaru.Filters; +using Aaru.CommonTypes.Structs.Devices.ATA; using Schemas; -using MediaType = DiscImageChef.CommonTypes.Metadata.MediaType; -using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; +using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify; +using MediaType = Aaru.CommonTypes.Metadata.MediaType; +using Tuple = Aaru.Decoders.PCMCIA.Tuple; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { @@ -681,7 +683,7 @@ namespace DiscImageChef.Core if(image.Info.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY)) { - CommonTypes.Structs.Devices.ATA.Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(image.ReadDiskTag(MediaTagType.ATA_IDENTIFY)); + Identify.IdentifyDevice? ataId = Identify.Decode(image.ReadDiskTag(MediaTagType.ATA_IDENTIFY)); if(ataId.HasValue) if(ataId.Value.CurrentCylinders > 0 && diff --git a/Aaru.Core/Sidecar/BlockTape.cs b/Aaru.Core/Sidecar/BlockTape.cs index c7f3b849a..d5535ac3e 100644 --- a/Aaru.Core/Sidecar/BlockTape.cs +++ b/Aaru.Core/Sidecar/BlockTape.cs @@ -34,7 +34,7 @@ using System.Collections.Generic; using System.IO; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/Events.cs b/Aaru.Core/Sidecar/Events.cs index 8f9e5cc82..15130c4d2 100644 --- a/Aaru.Core/Sidecar/Events.cs +++ b/Aaru.Core/Sidecar/Events.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs index 106b5b20a..4f34946cb 100644 --- a/Aaru.Core/Sidecar/Files.cs +++ b/Aaru.Core/Sidecar/Files.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/Helpers.cs b/Aaru.Core/Sidecar/Helpers.cs index 9ead51c19..821ccded7 100644 --- a/Aaru.Core/Sidecar/Helpers.cs +++ b/Aaru.Core/Sidecar/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/LinearMedia.cs b/Aaru.Core/Sidecar/LinearMedia.cs index 2f6761aee..f1e81c68d 100644 --- a/Aaru.Core/Sidecar/LinearMedia.cs +++ b/Aaru.Core/Sidecar/LinearMedia.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs index f963e2378..8a98ef0c7 100644 --- a/Aaru.Core/Sidecar/OpticalDisc.cs +++ b/Aaru.Core/Sidecar/OpticalDisc.cs @@ -35,20 +35,20 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; using Schemas; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using DMI = Aaru.Decoders.Xbox.DMI; +using MediaType = Aaru.CommonTypes.MediaType; +using Session = Aaru.CommonTypes.Structs.Session; using TrackType = Schemas.TrackType; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Sidecar/Sidecar.cs b/Aaru.Core/Sidecar/Sidecar.cs index f0a4027f9..d54d6b25e 100644 --- a/Aaru.Core/Sidecar/Sidecar.cs +++ b/Aaru.Core/Sidecar/Sidecar.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -namespace DiscImageChef.Core +namespace Aaru.Core { public partial class Sidecar { diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs index c37874646..454bdd623 100644 --- a/Aaru.Core/Statistics.cs +++ b/Aaru.Core/Statistics.cs @@ -39,18 +39,18 @@ using System.Net; using System.Text; using System.Threading; using System.Xml.Serialization; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Metadata; +using Aaru.Database; +using Aaru.Database.Models; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using Device = DiscImageChef.Devices.Device; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using OperatingSystem = DiscImageChef.Database.Models.OperatingSystem; -using Version = DiscImageChef.Database.Models.Version; +using Device = Aaru.Devices.Device; +using MediaType = Aaru.CommonTypes.MediaType; +using OperatingSystem = Aaru.Database.Models.OperatingSystem; +using Version = Aaru.Database.Models.Version; -namespace DiscImageChef.Core +namespace Aaru.Core { /// Handles anonymous usage statistics public static class Statistics @@ -61,14 +61,14 @@ namespace DiscImageChef.Core /// Loads saved statistics from disk public static void LoadStats() { - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); - if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"))) + if(File.Exists(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml"))) try { var allStats = new Stats(); var xs = new XmlSerializer(allStats.GetType()); - var sr = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")); + var sr = new StreamReader(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml")); allStats = (Stats)xs.Deserialize(sr); sr.Close(); @@ -467,9 +467,9 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(media.type)) continue; - Database.Models.Media existing = + Aaru.Database.Models.Media existing = ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real && - c.Synchronized) ?? new Database.Models.Media + c.Synchronized) ?? new Aaru.Database.Models.Media { Type = media.type, Real = media.real, Synchronized = true }; @@ -479,14 +479,14 @@ namespace DiscImageChef.Core } ctx.SaveChanges(); - File.Delete(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")); + File.Delete(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml")); } catch { // Do not care about it } - if(Settings.Settings.Current.Stats == null) + if(Aaru.Settings.Settings.Current.Stats == null) return; ctx.OperatingSystems.Add(new OperatingSystem @@ -506,11 +506,11 @@ namespace DiscImageChef.Core /// Saves statistics to disk public static void SaveStats() { - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.SaveChanges(); - if(Settings.Settings.Current.Stats != null && - Settings.Settings.Current.Stats.ShareStats) + if(Aaru.Settings.Settings.Current.Stats != null && + Aaru.Settings.Settings.Current.Stats.ShareStats) SubmitStats(); } @@ -519,7 +519,7 @@ namespace DiscImageChef.Core { var submitThread = new Thread(() => { - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); try { @@ -880,9 +880,9 @@ namespace DiscImageChef.Core { if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real)) { - Database.Models.Media existing = + Aaru.Database.Models.Media existing = ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && c.Real) ?? - new Database.Models.Media + new Aaru.Database.Models.Media { Synchronized = true, Type = media, Real = true }; @@ -900,9 +900,9 @@ namespace DiscImageChef.Core continue; { - Database.Models.Media existing = + Aaru.Database.Models.Media existing = ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && !c.Real) ?? - new Database.Models.Media + new Aaru.Database.Models.Media { Synchronized = true, Type = media, Real = false }; @@ -1073,7 +1073,7 @@ namespace DiscImageChef.Core } IEnumerable statsFiles = - Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml", + Directory.EnumerateFiles(Aaru.Settings.Settings.StatsPath, "PartialStats_*.xml", SearchOption.TopDirectoryOnly); foreach(string statsFile in statsFiles) @@ -1153,11 +1153,11 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(command)) return; - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.DeviceStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.DeviceStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Commands.Add(new Command { @@ -1174,11 +1174,11 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(filesystem)) return; - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.FilesystemStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.FilesystemStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Filesystems.Add(new Filesystem { @@ -1195,11 +1195,11 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(partition)) return; - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.PartitionStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.PartitionStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Partitions.Add(new Partition { @@ -1216,11 +1216,11 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(filter)) return; - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.FilterStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.FilterStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Filters.Add(new Filter { @@ -1237,11 +1237,11 @@ namespace DiscImageChef.Core if(string.IsNullOrWhiteSpace(format)) return; - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.MediaImageStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.MediaImageStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.MediaFormats.Add(new MediaFormat { @@ -1255,8 +1255,8 @@ namespace DiscImageChef.Core /// Device public static void AddDevice(Device dev) { - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.DeviceStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.DeviceStats) return; string deviceBus; @@ -1268,7 +1268,7 @@ namespace DiscImageChef.Core else deviceBus = dev.Type.ToString(); - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.SeenDevices.Add(new DeviceStat { @@ -1285,13 +1285,13 @@ namespace DiscImageChef.Core /// Set if media was found on a real device, otherwise found on a media image public static void AddMedia(MediaType type, bool real) { - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.MediaStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.MediaStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); - ctx.Medias.Add(new Database.Models.Media + ctx.Medias.Add(new Aaru.Database.Models.Media { Real = real, Synchronized = false, Type = type.ToString(), Count = 1 }); @@ -1303,11 +1303,11 @@ namespace DiscImageChef.Core public static void AddRemote(string serverApplication, string serverVersion, string serverOperatingSystem, string serverOperatingSystemVersion, string serverArchitecture) { - if(Settings.Settings.Current.Stats == null || - !Settings.Settings.Current.Stats.MediaStats) + if(Aaru.Settings.Settings.Current.Stats == null || + !Aaru.Settings.Settings.Current.Stats.MediaStats) return; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.RemoteApplications.Add(new RemoteApplication { diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj index c43e37367..9f5f6c290 100644 --- a/Aaru.Database/Aaru.Database.csproj +++ b/Aaru.Database/Aaru.Database.csproj @@ -5,7 +5,7 @@ AnyCPU 2.0 Library - DiscImageChef.Database + Aaru.Database Aaru.Database $(Version) false diff --git a/Aaru.Database/Context.cs b/Aaru.Database/Context.cs index e24c10988..44d4018f5 100644 --- a/Aaru.Database/Context.cs +++ b/Aaru.Database/Context.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Database.Models; +using Aaru.Database.Models; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Database +namespace Aaru.Database { public sealed class DicContext : DbContext { diff --git a/Aaru.Database/ContextFactory.cs b/Aaru.Database/ContextFactory.cs index a2b089466..558f6d976 100644 --- a/Aaru.Database/ContextFactory.cs +++ b/Aaru.Database/ContextFactory.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Design; -namespace DiscImageChef.Database +namespace Aaru.Database { public class DicContextFactory : IDesignTimeDbContextFactory { diff --git a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs index 1ebc8e0dd..7ea3d5273 100644 --- a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs +++ b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181126222301_DeviceReportV2")] diff --git a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs index 8e339db02..1ea8ee9a8 100644 --- a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs +++ b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class DeviceReportV2 : Migration { diff --git a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs index ff2cd210a..9bd69fd83 100644 --- a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs +++ b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181127001622_AddDeviceBasicFields")] diff --git a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.cs b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.cs index bab4a08f3..b236c1c27 100644 --- a/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.cs +++ b/Aaru.Database/Migrations/20181127001622_AddDeviceBasicFields.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddDeviceBasicFields : Migration { diff --git a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs index ff928b203..ad9c78985 100644 --- a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs +++ b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181127013131_CorrectReportsDbSet")] diff --git a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs index f4a1653de..56b051904 100644 --- a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs +++ b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class CorrectReportsDbSet : Migration { diff --git a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs index 22f3f0c08..819199632 100644 --- a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs +++ b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221015906_NameValueStatistics")] diff --git a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs index cc3f635a3..ef1370ab3 100644 --- a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs +++ b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class NameValueStatistics : Migration { diff --git a/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs b/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs index c4121924b..0dd3de96d 100644 --- a/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs +++ b/Aaru.Database/Migrations/20181221032605_MediaStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221032605_MediaStatistics")] diff --git a/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs b/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs index c0cf84124..c978655d7 100644 --- a/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs +++ b/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class MediaStatistics : Migration { diff --git a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs index c2c422a66..e8e7d9e8e 100644 --- a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs +++ b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221034941_SeenDevicesStatistics")] diff --git a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs index 8fd0662b8..333e729cf 100644 --- a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs +++ b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class SeenDevicesStatistics : Migration { diff --git a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs index fc535ce77..e06887b0b 100644 --- a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs +++ b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221040408_OperatingSystemStatistics")] diff --git a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs index ac8e174d2..9804d740d 100644 --- a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs +++ b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class OperatingSystemStatistics : Migration { diff --git a/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs b/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs index da43387e2..f23285b56 100644 --- a/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs +++ b/Aaru.Database/Migrations/20181221041242_VersionStatistics.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221041242_VersionStatistics")] diff --git a/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs b/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs index fe88a6fef..ed9d86b45 100644 --- a/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs +++ b/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class VersionStatistics : Migration { diff --git a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs index f61ac67a1..b1aa2c797 100644 --- a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs +++ b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181221125353_AddStatsCounters")] diff --git a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.cs b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.cs index b8b7e5a8d..e1e7f07ce 100644 --- a/Aaru.Database/Migrations/20181221125353_AddStatsCounters.cs +++ b/Aaru.Database/Migrations/20181221125353_AddStatsCounters.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddStatsCounters : Migration { diff --git a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs index 82c37db94..62099a60c 100644 --- a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs +++ b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181223183913_FixUnsignedFields")] diff --git a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.cs b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.cs index 4658fd9de..f27565390 100644 --- a/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.cs +++ b/Aaru.Database/Migrations/20181223183913_FixUnsignedFields.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class FixUnsignedFields : Migration { diff --git a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs index 61dd78938..2f19189d7 100644 --- a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs +++ b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports")] diff --git a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs index 6d535fa58..4b46e3fda 100644 --- a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs +++ b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class UseBinaryDataForIdentifyInquiryAndModesInReports : Migration { diff --git a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs index 0610a572d..642b69511 100644 --- a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs +++ b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181224044809_StoreUsbIdsInDatabase")] diff --git a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs index 1e2a4fb7c..f0cfc4165 100644 --- a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs +++ b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class StoreUsbIdsInDatabase : Migration { diff --git a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs index 3778e2ff0..cbce18030 100644 --- a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs +++ b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181224172147_FixUsbIdsAndIndexes")] diff --git a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs index 2e89cd002..1effb0785 100644 --- a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs +++ b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class FixUsbIdsAndIndexes : Migration { diff --git a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs index 529979024..275957013 100644 --- a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs +++ b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181225002740_AddCdOffsets")] diff --git a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs index 9c43cf948..79a0bef92 100644 --- a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs +++ b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs @@ -1,7 +1,7 @@ using System; using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddCdOffsets : Migration { diff --git a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs index de45a8225..49c7b6417 100644 --- a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs +++ b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181225152947_StoreMmcGetConfigurationResponse")] diff --git a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.cs b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.cs index be06c9d8b..e62532fc6 100644 --- a/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.cs +++ b/Aaru.Database/Migrations/20181225152947_StoreMmcGetConfigurationResponse.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { // TODO: Find how to permanently create indexes public partial class StoreMmcGetConfigurationResponse : Migration diff --git a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs index 6867e5ca4..6bc22724d 100644 --- a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs +++ b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20181225214500_StoreReadResultsInReportDatabase")] diff --git a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.cs b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.cs index 3201bf7a3..717a88eef 100644 --- a/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.cs +++ b/Aaru.Database/Migrations/20181225214500_StoreReadResultsInReportDatabase.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class StoreReadResultsInReportDatabase : Migration { diff --git a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs index a8dfb2818..f142342c3 100644 --- a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs +++ b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20190102061236_AddMultisessionLeadTest")] diff --git a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.cs b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.cs index 818369f34..dfedb3c04 100644 --- a/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.cs +++ b/Aaru.Database/Migrations/20190102061236_AddMultisessionLeadTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddMultisessionLeadTest : Migration { diff --git a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs index 05c13e5c6..4576a76cd 100644 --- a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs +++ b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20190102230036_AddOptimalReadMultipleCount")] diff --git a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs index e1cc12879..965859d77 100644 --- a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs +++ b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddOptimalReadMultipleCount : Migration { diff --git a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs index 1a81209a3..b14be2813 100644 --- a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs +++ b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20190108013456_AddChangeableScsiModes")] diff --git a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.cs b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.cs index 269336114..a0d4ad61b 100644 --- a/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.cs +++ b/Aaru.Database/Migrations/20190108013456_AddChangeableScsiModes.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddChangeableScsiModes : Migration { diff --git a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs index 9fbfaccd1..fe481083e 100644 --- a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs +++ b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20190525183723_IdForDensityCode")] diff --git a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs index 2b9bdb046..cda05caef 100644 --- a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs +++ b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class IdForDensityCode : Migration { diff --git a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs index 0697026cc..01bc9ebe5 100644 --- a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs +++ b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20191103000828_MakeFieldsUnsigned")] diff --git a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.cs b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.cs index f04b268dd..fc72ba150 100644 --- a/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.cs +++ b/Aaru.Database/Migrations/20191103000828_MakeFieldsUnsigned.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class MakeFieldsUnsigned : Migration { diff --git a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs index 5512b9016..9ed4df4ec 100644 --- a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs +++ b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20191207175444_SyncWithServerChanges")] diff --git a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.cs b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.cs index 04b1b90d7..c4029fea3 100644 --- a/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.cs +++ b/Aaru.Database/Migrations/20191207175444_SyncWithServerChanges.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class SyncWithServerChanges : Migration { diff --git a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs index af8ad2abc..a08252087 100644 --- a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs +++ b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20191207183522_AddNameCountModel")] diff --git a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs index 8cd106c07..69c273dd0 100644 --- a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs +++ b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddNameCountModel : Migration { diff --git a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs index cd27ba10d..3c44a0ac5 100644 --- a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs +++ b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.Designer.cs @@ -1,12 +1,12 @@ // using System; -using DiscImageChef.Database; +using Aaru.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] [Migration("20191207184342_AddRemoteStats")] diff --git a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.cs b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.cs index f09d4652c..7116c6a79 100644 --- a/Aaru.Database/Migrations/20191207184342_AddRemoteStats.cs +++ b/Aaru.Database/Migrations/20191207184342_AddRemoteStats.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { public partial class AddRemoteStats : Migration { diff --git a/Aaru.Database/Migrations/DicContextModelSnapshot.cs b/Aaru.Database/Migrations/DicContextModelSnapshot.cs index 4ba219feb..3ded44c0c 100644 --- a/Aaru.Database/Migrations/DicContextModelSnapshot.cs +++ b/Aaru.Database/Migrations/DicContextModelSnapshot.cs @@ -4,7 +4,7 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace DiscImageChef.Database.Migrations +namespace Aaru.Database.Migrations { [DbContext(typeof(DicContext))] internal class DicContextModelSnapshot : ModelSnapshot diff --git a/Aaru.Database/Models/BaseModel.cs b/Aaru.Database/Models/BaseModel.cs index 65efac785..400bed2a2 100644 --- a/Aaru.Database/Models/BaseModel.cs +++ b/Aaru.Database/Models/BaseModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public abstract class BaseModel { diff --git a/Aaru.Database/Models/BaseOperatingSystem.cs b/Aaru.Database/Models/BaseOperatingSystem.cs index c5f6c92a0..490a1fa57 100644 --- a/Aaru.Database/Models/BaseOperatingSystem.cs +++ b/Aaru.Database/Models/BaseOperatingSystem.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public abstract class BaseOperatingSystem : BaseModel { diff --git a/Aaru.Database/Models/CdOffset.cs b/Aaru.Database/Models/CdOffset.cs index a5c193ff5..b0c7baceb 100644 --- a/Aaru.Database/Models/CdOffset.cs +++ b/Aaru.Database/Models/CdOffset.cs @@ -33,7 +33,7 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class CdOffset : CommonTypes.Metadata.CdOffset { diff --git a/Aaru.Database/Models/Command.cs b/Aaru.Database/Models/Command.cs index d8d74f57c..3ac35562d 100644 --- a/Aaru.Database/Models/Command.cs +++ b/Aaru.Database/Models/Command.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Command : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/Device.cs b/Aaru.Database/Models/Device.cs index a2a6749fb..6be6e6c06 100644 --- a/Aaru.Database/Models/Device.cs +++ b/Aaru.Database/Models/Device.cs @@ -32,9 +32,9 @@ using System; using System.ComponentModel; -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes.Metadata; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Device : DeviceReportV2 { diff --git a/Aaru.Database/Models/DeviceStat.cs b/Aaru.Database/Models/DeviceStat.cs index 2fbd550af..ee9049c25 100644 --- a/Aaru.Database/Models/DeviceStat.cs +++ b/Aaru.Database/Models/DeviceStat.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class DeviceStat : BaseModel { diff --git a/Aaru.Database/Models/Filesystem.cs b/Aaru.Database/Models/Filesystem.cs index e28871399..026b38bc3 100644 --- a/Aaru.Database/Models/Filesystem.cs +++ b/Aaru.Database/Models/Filesystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Filesystem : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/Filter.cs b/Aaru.Database/Models/Filter.cs index 469a563c3..d7762e0c8 100644 --- a/Aaru.Database/Models/Filter.cs +++ b/Aaru.Database/Models/Filter.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Filter : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/Media.cs b/Aaru.Database/Models/Media.cs index 1726c0f99..073a4bc98 100644 --- a/Aaru.Database/Models/Media.cs +++ b/Aaru.Database/Models/Media.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Media : BaseModel { diff --git a/Aaru.Database/Models/MediaFormat.cs b/Aaru.Database/Models/MediaFormat.cs index 91d2ded36..cebfc46cc 100644 --- a/Aaru.Database/Models/MediaFormat.cs +++ b/Aaru.Database/Models/MediaFormat.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class MediaFormat : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/NameCountModel.cs b/Aaru.Database/Models/NameCountModel.cs index 4343d51b3..9c399e756 100644 --- a/Aaru.Database/Models/NameCountModel.cs +++ b/Aaru.Database/Models/NameCountModel.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public abstract class NameCountModel : BaseModel { diff --git a/Aaru.Database/Models/OperatingSystem.cs b/Aaru.Database/Models/OperatingSystem.cs index 5f97b3a03..b87b8935f 100644 --- a/Aaru.Database/Models/OperatingSystem.cs +++ b/Aaru.Database/Models/OperatingSystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class OperatingSystem : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Database/Models/Partition.cs b/Aaru.Database/Models/Partition.cs index 1219e5735..9cca6fd77 100644 --- a/Aaru.Database/Models/Partition.cs +++ b/Aaru.Database/Models/Partition.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Partition : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/RemoteApplication.cs b/Aaru.Database/Models/RemoteApplication.cs index 2563f89d4..109e24bb2 100644 --- a/Aaru.Database/Models/RemoteApplication.cs +++ b/Aaru.Database/Models/RemoteApplication.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class RemoteApplication : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Database/Models/RemoteArchitecture.cs b/Aaru.Database/Models/RemoteArchitecture.cs index 69213824c..db456ba2b 100644 --- a/Aaru.Database/Models/RemoteArchitecture.cs +++ b/Aaru.Database/Models/RemoteArchitecture.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class RemoteArchitecture : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Database/Models/RemoteOperatingSystem.cs b/Aaru.Database/Models/RemoteOperatingSystem.cs index 476b9acae..1a810f3ae 100644 --- a/Aaru.Database/Models/RemoteOperatingSystem.cs +++ b/Aaru.Database/Models/RemoteOperatingSystem.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class RemoteOperatingSystem : BaseOperatingSystem { } } \ No newline at end of file diff --git a/Aaru.Database/Models/Report.cs b/Aaru.Database/Models/Report.cs index 5bc6f7f85..cb1dcf878 100644 --- a/Aaru.Database/Models/Report.cs +++ b/Aaru.Database/Models/Report.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Metadata; +using Aaru.CommonTypes.Metadata; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Report : DeviceReportV2 { diff --git a/Aaru.Database/Models/UsbProduct.cs b/Aaru.Database/Models/UsbProduct.cs index 7171c04f0..110688f68 100644 --- a/Aaru.Database/Models/UsbProduct.cs +++ b/Aaru.Database/Models/UsbProduct.cs @@ -34,7 +34,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class UsbProduct { diff --git a/Aaru.Database/Models/UsbVendor.cs b/Aaru.Database/Models/UsbVendor.cs index f3ebb3183..12a35384e 100644 --- a/Aaru.Database/Models/UsbVendor.cs +++ b/Aaru.Database/Models/UsbVendor.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class UsbVendor { diff --git a/Aaru.Database/Models/Version.cs b/Aaru.Database/Models/Version.cs index e41cc7e05..b2629a053 100644 --- a/Aaru.Database/Models/Version.cs +++ b/Aaru.Database/Models/Version.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Database.Models +namespace Aaru.Database.Models { public class Version : NameCountModel { } } \ No newline at end of file diff --git a/Aaru.Decoders b/Aaru.Decoders index 3632331c4..7d9781a33 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit 3632331c45aa53b4423e6c1417a10ec11e68c44d +Subproject commit 7d9781a33ea3e1a5b52eba017c15b6cf8112e863 diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj index 8036a4a32..028fef79c 100644 --- a/Aaru.Devices/Aaru.Devices.csproj +++ b/Aaru.Devices/Aaru.Devices.csproj @@ -6,7 +6,7 @@ 2.0 {57BB2341-AB62-48FD-91B8-46F5A2F9ED51} Library - DiscImageChef.Devices + Aaru.Devices Aaru.Devices $(Version) false diff --git a/Aaru.Devices/Command.cs b/Aaru.Devices/Command.cs index f505c6b40..c278b88c5 100644 --- a/Aaru.Devices/Command.cs +++ b/Aaru.Devices/Command.cs @@ -31,14 +31,14 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices.FreeBSD; -using DiscImageChef.Devices.Windows; +using Aaru.Devices.FreeBSD; +using Aaru.Devices.Windows; +using Aaru.CommonTypes.Interop; +using Aaru.Decoders.ATA; using Microsoft.Win32.SafeHandles; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Devices +namespace Aaru.Devices { internal static class Command { diff --git a/Aaru.Devices/Device/AtaCommands/Ata28.cs b/Aaru.Devices/Device/AtaCommands/Ata28.cs index 85fd9082a..8abec5663 100644 --- a/Aaru.Devices/Device/AtaCommands/Ata28.cs +++ b/Aaru.Devices/Device/AtaCommands/Ata28.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs index 583c5af2f..fd33ff553 100644 --- a/Aaru.Devices/Device/AtaCommands/Ata48.cs +++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs index 08c02451d..5aa86f997 100644 --- a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs +++ b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/Atapi.cs b/Aaru.Devices/Device/AtaCommands/Atapi.cs index ea21c1ef3..c1e5c07a7 100644 --- a/Aaru.Devices/Device/AtaCommands/Atapi.cs +++ b/Aaru.Devices/Device/AtaCommands/Atapi.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/Cfa.cs b/Aaru.Devices/Device/AtaCommands/Cfa.cs index 43805c7eb..222f1e117 100644 --- a/Aaru.Devices/Device/AtaCommands/Cfa.cs +++ b/Aaru.Devices/Device/AtaCommands/Cfa.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/MCPT.cs b/Aaru.Devices/Device/AtaCommands/MCPT.cs index 4fcd1f550..430282955 100644 --- a/Aaru.Devices/Device/AtaCommands/MCPT.cs +++ b/Aaru.Devices/Device/AtaCommands/MCPT.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/AtaCommands/Smart.cs b/Aaru.Devices/Device/AtaCommands/Smart.cs index 89dab4417..c84435b13 100644 --- a/Aaru.Devices/Device/AtaCommands/Smart.cs +++ b/Aaru.Devices/Device/AtaCommands/Smart.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; +using Aaru.Console; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/Commands.cs b/Aaru.Devices/Device/Commands.cs index 35466d487..5c78ff3f9 100644 --- a/Aaru.Devices/Device/Commands.cs +++ b/Aaru.Devices/Device/Commands.cs @@ -32,9 +32,9 @@ using System; using System.Diagnostics.CodeAnalysis; -using DiscImageChef.Decoders.ATA; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices +namespace Aaru.Devices { [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public partial class Device diff --git a/Aaru.Devices/Device/Constructor.cs b/Aaru.Devices/Device/Constructor.cs index b60b32d23..568121386 100644 --- a/Aaru.Devices/Device/Constructor.cs +++ b/Aaru.Devices/Device/Constructor.cs @@ -35,27 +35,27 @@ using System.Globalization; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Decoders.SecureDigital; -using DiscImageChef.Devices.FreeBSD; -using DiscImageChef.Devices.Windows; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Decoders.SecureDigital; +using Aaru.Devices.FreeBSD; +using Aaru.Devices.Windows; using Microsoft.Win32.SafeHandles; -using Extern = DiscImageChef.Devices.Windows.Extern; -using FileAccess = DiscImageChef.Devices.Windows.FileAccess; -using FileAttributes = DiscImageChef.Devices.Windows.FileAttributes; -using FileFlags = DiscImageChef.Devices.Linux.FileFlags; -using FileMode = DiscImageChef.Devices.Windows.FileMode; -using FileShare = DiscImageChef.Devices.Windows.FileShare; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using VendorString = DiscImageChef.Decoders.SecureDigital.VendorString; +using Extern = Aaru.Devices.Windows.Extern; +using FileAccess = Aaru.Devices.Windows.FileAccess; +using FileAttributes = Aaru.Devices.Windows.FileAttributes; +using FileFlags = Aaru.Devices.Linux.FileFlags; +using FileMode = Aaru.Devices.Windows.FileMode; +using FileShare = Aaru.Devices.Windows.FileShare; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using VendorString = Aaru.Decoders.SecureDigital.VendorString; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { @@ -86,10 +86,10 @@ namespace DiscImageChef.Devices { case PlatformID.Win32NT: { - FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite, - FileShare.Read | FileShare.Write, - IntPtr.Zero, - FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero); + FileHandle = Windows.Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite, + FileShare.Read | FileShare.Write, + IntPtr.Zero, + FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero); if(((SafeFileHandle)FileHandle).IsInvalid) { @@ -184,10 +184,10 @@ namespace DiscImageChef.Devices int error = 0; bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle, - WindowsIoctl.IoctlStorageQueryProperty, - ref query, (uint)Marshal.SizeOf(query), - descriptorPtr, 1000, ref returned, - IntPtr.Zero); + WindowsIoctl.IoctlStorageQueryProperty, + ref query, (uint)Marshal.SizeOf(query), + descriptorPtr, 1000, ref returned, + IntPtr.Zero); if(hasError) error = Marshal.GetLastWin32Error(); @@ -440,7 +440,7 @@ namespace DiscImageChef.Devices if(cachedScr != null) { Type = DeviceType.SecureDigital; - CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid); + CID decoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCID(cachedCid); Manufacturer = VendorString.Prettify(decoded.Manufacturer); Model = decoded.ProductName; diff --git a/Aaru.Devices/Device/Destructor.cs b/Aaru.Devices/Device/Destructor.cs index f13b40456..1c3e6db63 100644 --- a/Aaru.Devices/Device/Destructor.cs +++ b/Aaru.Devices/Device/Destructor.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Devices.Linux; +using Aaru.Devices.Linux; using Microsoft.Win32.SafeHandles; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/DeviceException.cs b/Aaru.Devices/Device/DeviceException.cs index 49050853d..8455fd03b 100644 --- a/Aaru.Devices/Device/DeviceException.cs +++ b/Aaru.Devices/Device/DeviceException.cs @@ -1,6 +1,6 @@ using System; -namespace DiscImageChef.Devices +namespace Aaru.Devices { /// /// Exception to be returned by the device constructor diff --git a/Aaru.Devices/Device/List.cs b/Aaru.Devices/Device/List.cs index 457780400..1f934397e 100644 --- a/Aaru.Devices/Device/List.cs +++ b/Aaru.Devices/Device/List.cs @@ -32,11 +32,11 @@ using System; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Console; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using Aaru.CommonTypes.Interop; +using Aaru.Console; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Devices +namespace Aaru.Devices { [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)] public struct DeviceInfo diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs index 7c47d5cce..3704fc1e9 100644 --- a/Aaru.Devices/Device/MmcCommands/MMC.cs +++ b/Aaru.Devices/Device/MmcCommands/MMC.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs index 4fa78d08f..be4b7848e 100644 --- a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs +++ b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs index 892dea4ff..1c7f01e7a 100644 --- a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs +++ b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs @@ -32,9 +32,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs index 818537e7a..3c753581e 100644 --- a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs +++ b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Certance.cs b/Aaru.Devices/Device/ScsiCommands/Certance.cs index 0f59273e4..6976c766c 100644 --- a/Aaru.Devices/Device/ScsiCommands/Certance.cs +++ b/Aaru.Devices/Device/ScsiCommands/Certance.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Diagnostics.CodeAnalysis; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public partial class Device diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs index e87ef12c6..6dd85afdd 100644 --- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs +++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs @@ -32,9 +32,9 @@ using System; using System.Text; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs index 026091b19..9bb63128e 100644 --- a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs +++ b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/HP.cs b/Aaru.Devices/Device/ScsiCommands/HP.cs index c06478beb..8888a7822 100644 --- a/Aaru.Devices/Device/ScsiCommands/HP.cs +++ b/Aaru.Devices/Device/ScsiCommands/HP.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Kreon.cs b/Aaru.Devices/Device/ScsiCommands/Kreon.cs index 35d85c1a2..2356cdc69 100644 --- a/Aaru.Devices/Device/ScsiCommands/Kreon.cs +++ b/Aaru.Devices/Device/ScsiCommands/Kreon.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/MMC.cs b/Aaru.Devices/Device/ScsiCommands/MMC.cs index ce7d4fe93..7209417b5 100644 --- a/Aaru.Devices/Device/ScsiCommands/MMC.cs +++ b/Aaru.Devices/Device/ScsiCommands/MMC.cs @@ -32,9 +32,9 @@ using System; using System.Text; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/NEC.cs b/Aaru.Devices/Device/ScsiCommands/NEC.cs index 8a558fccd..241df099c 100644 --- a/Aaru.Devices/Device/ScsiCommands/NEC.cs +++ b/Aaru.Devices/Device/ScsiCommands/NEC.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs index 23842abe4..529fe17aa 100644 --- a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs +++ b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs index 771e435df..60d64bb31 100644 --- a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs +++ b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs index 63a3e61b7..33e546ce0 100644 --- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs +++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/SBC.cs b/Aaru.Devices/Device/ScsiCommands/SBC.cs index 5735a71c8..d5f9dc2ee 100644 --- a/Aaru.Devices/Device/ScsiCommands/SBC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SBC.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/SMC.cs b/Aaru.Devices/Device/ScsiCommands/SMC.cs index 1e1a350f3..292727815 100644 --- a/Aaru.Devices/Device/ScsiCommands/SMC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SMC.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs index 4c7ac36e9..0257f7983 100644 --- a/Aaru.Devices/Device/ScsiCommands/SPC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs @@ -32,10 +32,10 @@ using System; using System.Diagnostics.CodeAnalysis; -using DiscImageChef.Console; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using Aaru.Console; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Devices +namespace Aaru.Devices { [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] public partial class Device diff --git a/Aaru.Devices/Device/ScsiCommands/SSC.cs b/Aaru.Devices/Device/ScsiCommands/SSC.cs index e1e83b040..80c442362 100644 --- a/Aaru.Devices/Device/ScsiCommands/SSC.cs +++ b/Aaru.Devices/Device/ScsiCommands/SSC.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs index 85ff39e42..44e14f9d6 100644 --- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs +++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Device/Variables.cs b/Aaru.Devices/Device/Variables.cs index 8837640e0..fb1e24bf7 100644 --- a/Aaru.Devices/Device/Variables.cs +++ b/Aaru.Devices/Device/Variables.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Structs.Devices.SCSI; -namespace DiscImageChef.Devices +namespace Aaru.Devices { public partial class Device { diff --git a/Aaru.Devices/Enums.cs b/Aaru.Devices/Enums.cs index b94fd2c2c..ba9553223 100644 --- a/Aaru.Devices/Enums.cs +++ b/Aaru.Devices/Enums.cs @@ -35,7 +35,7 @@ using System; // ReSharper disable MemberCanBeInternal // ReSharper disable InconsistentNaming -namespace DiscImageChef.Devices +namespace Aaru.Devices { #region ATA Commands /// All known ATA commands diff --git a/Aaru.Devices/FreeBSD/Command.cs b/Aaru.Devices/FreeBSD/Command.cs index 1bf08dd56..f008b245b 100644 --- a/Aaru.Devices/FreeBSD/Command.cs +++ b/Aaru.Devices/FreeBSD/Command.cs @@ -34,11 +34,11 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using static DiscImageChef.Devices.FreeBSD.Extern; +using Aaru.Console; +using Aaru.Decoders.ATA; +using static Aaru.Devices.FreeBSD.Extern; -namespace DiscImageChef.Devices.FreeBSD +namespace Aaru.Devices.FreeBSD { [SuppressMessage("ReSharper", "BitwiseOperatorOnEnumWithoutFlags")] static class Command diff --git a/Aaru.Devices/FreeBSD/Enums.cs b/Aaru.Devices/FreeBSD/Enums.cs index ac85832c0..466648779 100644 --- a/Aaru.Devices/FreeBSD/Enums.cs +++ b/Aaru.Devices/FreeBSD/Enums.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Devices.FreeBSD +namespace Aaru.Devices.FreeBSD { [Flags] enum FileFlags diff --git a/Aaru.Devices/FreeBSD/Extern.cs b/Aaru.Devices/FreeBSD/Extern.cs index 4125c40a6..e0829c97e 100644 --- a/Aaru.Devices/FreeBSD/Extern.cs +++ b/Aaru.Devices/FreeBSD/Extern.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.Devices.FreeBSD +namespace Aaru.Devices.FreeBSD { static class Extern { diff --git a/Aaru.Devices/FreeBSD/ListDevices.cs b/Aaru.Devices/FreeBSD/ListDevices.cs index d99869d1c..540498be3 100644 --- a/Aaru.Devices/FreeBSD/ListDevices.cs +++ b/Aaru.Devices/FreeBSD/ListDevices.cs @@ -35,11 +35,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using static DiscImageChef.Devices.FreeBSD.Extern; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using static Aaru.Devices.FreeBSD.Extern; -namespace DiscImageChef.Devices.FreeBSD +namespace Aaru.Devices.FreeBSD { internal static class ListDevices { diff --git a/Aaru.Devices/FreeBSD/Structs.cs b/Aaru.Devices/FreeBSD/Structs.cs index 27a03eee7..484362b44 100644 --- a/Aaru.Devices/FreeBSD/Structs.cs +++ b/Aaru.Devices/FreeBSD/Structs.cs @@ -43,7 +43,7 @@ using target_id_t = System.UInt32; #pragma warning disable 649 #pragma warning disable 169 -namespace DiscImageChef.Devices.FreeBSD +namespace Aaru.Devices.FreeBSD { [StructLayout(LayoutKind.Sequential)] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] diff --git a/Aaru.Devices/Linux/Command.cs b/Aaru.Devices/Linux/Command.cs index d70cf3dfe..ec02993f3 100644 --- a/Aaru.Devices/Linux/Command.cs +++ b/Aaru.Devices/Linux/Command.cs @@ -34,10 +34,10 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Decoders.ATA; +using Aaru.CommonTypes.Interop; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices.Linux +namespace Aaru.Devices.Linux { static class Command { diff --git a/Aaru.Devices/Linux/Enums.cs b/Aaru.Devices/Linux/Enums.cs index 7b1aeb2c1..1b571452c 100644 --- a/Aaru.Devices/Linux/Enums.cs +++ b/Aaru.Devices/Linux/Enums.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Devices.Linux +namespace Aaru.Devices.Linux { [Flags] enum FileFlags diff --git a/Aaru.Devices/Linux/Extern.cs b/Aaru.Devices/Linux/Extern.cs index 6313cd3e5..4522b71b6 100644 --- a/Aaru.Devices/Linux/Extern.cs +++ b/Aaru.Devices/Linux/Extern.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.Devices.Linux +namespace Aaru.Devices.Linux { static class Extern { diff --git a/Aaru.Devices/Linux/ListDevices.cs b/Aaru.Devices/Linux/ListDevices.cs index d940aa303..71ee75075 100644 --- a/Aaru.Devices/Linux/ListDevices.cs +++ b/Aaru.Devices/Linux/ListDevices.cs @@ -34,7 +34,7 @@ using System; using System.IO; using System.Text; -namespace DiscImageChef.Devices.Linux +namespace Aaru.Devices.Linux { static class ListDevices { diff --git a/Aaru.Devices/Linux/Structs.cs b/Aaru.Devices/Linux/Structs.cs index ab0aaae36..7a5495a9f 100644 --- a/Aaru.Devices/Linux/Structs.cs +++ b/Aaru.Devices/Linux/Structs.cs @@ -35,7 +35,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace DiscImageChef.Devices.Linux +namespace Aaru.Devices.Linux { [StructLayout(LayoutKind.Sequential)] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] diff --git a/Aaru.Devices/Remote/Consts.cs b/Aaru.Devices/Remote/Consts.cs index 7e9906dd4..8d1fd1de9 100644 --- a/Aaru.Devices/Remote/Consts.cs +++ b/Aaru.Devices/Remote/Consts.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Devices.Remote +namespace Aaru.Devices.Remote { public class Consts { diff --git a/Aaru.Devices/Remote/Enums.cs b/Aaru.Devices/Remote/Enums.cs index fe6e2d862..49c88d565 100644 --- a/Aaru.Devices/Remote/Enums.cs +++ b/Aaru.Devices/Remote/Enums.cs @@ -1,4 +1,4 @@ -namespace DiscImageChef.Devices.Remote +namespace Aaru.Devices.Remote { public enum DicPacketType : sbyte { diff --git a/Aaru.Devices/Remote/Remote.cs b/Aaru.Devices/Remote/Remote.cs index a3d2a972d..659658224 100644 --- a/Aaru.Devices/Remote/Remote.cs +++ b/Aaru.Devices/Remote/Remote.cs @@ -5,14 +5,14 @@ using System.Linq; using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using Marshal = DiscImageChef.Helpers.Marshal; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interop; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Marshal = Aaru.Helpers.Marshal; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Devices.Remote +namespace Aaru.Devices.Remote { public class Remote : IDisposable { diff --git a/Aaru.Devices/Remote/Structs.cs b/Aaru.Devices/Remote/Structs.cs index 069ce223f..74c0faa9b 100644 --- a/Aaru.Devices/Remote/Structs.cs +++ b/Aaru.Devices/Remote/Structs.cs @@ -1,8 +1,8 @@ using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Decoders.ATA; +using Aaru.CommonTypes.Enums; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Devices.Remote +namespace Aaru.Devices.Remote { [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)] public struct DicPacketHeader diff --git a/Aaru.Devices/Windows/Command.cs b/Aaru.Devices/Windows/Command.cs index ffcd85838..b1eadb895 100644 --- a/Aaru.Devices/Windows/Command.cs +++ b/Aaru.Devices/Windows/Command.cs @@ -34,10 +34,10 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using DiscImageChef.Decoders.ATA; +using Aaru.Decoders.ATA; using Microsoft.Win32.SafeHandles; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { [SuppressMessage("ReSharper", "UnusedParameter.Global")] internal static class Command diff --git a/Aaru.Devices/Windows/Enums.cs b/Aaru.Devices/Windows/Enums.cs index cdfb75da2..8d757771a 100644 --- a/Aaru.Devices/Windows/Enums.cs +++ b/Aaru.Devices/Windows/Enums.cs @@ -34,7 +34,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { [Flags] internal enum FileAttributes : uint diff --git a/Aaru.Devices/Windows/Extern.cs b/Aaru.Devices/Windows/Extern.cs index 21dd055ac..687ee4795 100644 --- a/Aaru.Devices/Windows/Extern.cs +++ b/Aaru.Devices/Windows/Extern.cs @@ -35,7 +35,7 @@ using System; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { internal static class Extern { diff --git a/Aaru.Devices/Windows/ListDevices.cs b/Aaru.Devices/Windows/ListDevices.cs index 239b778b4..51af997dd 100644 --- a/Aaru.Devices/Windows/ListDevices.cs +++ b/Aaru.Devices/Windows/ListDevices.cs @@ -38,7 +38,7 @@ using System.Management; using System.Runtime.InteropServices; using System.Text; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { internal static class ListDevices { diff --git a/Aaru.Devices/Windows/Structs.cs b/Aaru.Devices/Windows/Structs.cs index b0424c73f..3f96c3cb8 100644 --- a/Aaru.Devices/Windows/Structs.cs +++ b/Aaru.Devices/Windows/Structs.cs @@ -35,7 +35,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { [StructLayout(LayoutKind.Sequential)] [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] diff --git a/Aaru.Devices/Windows/Usb.cs b/Aaru.Devices/Windows/Usb.cs index 743d3a490..069cd7d9f 100644 --- a/Aaru.Devices/Windows/Usb.cs +++ b/Aaru.Devices/Windows/Usb.cs @@ -38,7 +38,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { // TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love /// diff --git a/Aaru.Devices/Windows/UsbFunctions.cs b/Aaru.Devices/Windows/UsbFunctions.cs index 117c68f7d..cfbe18f04 100644 --- a/Aaru.Devices/Windows/UsbFunctions.cs +++ b/Aaru.Devices/Windows/UsbFunctions.cs @@ -35,7 +35,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -namespace DiscImageChef.Devices.Windows +namespace Aaru.Devices.Windows { // // A place for "higher level" related functions diff --git a/Aaru.Dto b/Aaru.Dto index 66c637abd..1a788f948 160000 --- a/Aaru.Dto +++ b/Aaru.Dto @@ -1 +1 @@ -Subproject commit 66c637abd4666d696590f11d3f3a6daf3dd19194 +Subproject commit 1a788f948a18adf12fe500aecc647410e8951445 diff --git a/Aaru.EntityFramework/Program.cs b/Aaru.EntityFramework/Program.cs index e3e77e854..ebd403f0f 100644 --- a/Aaru.EntityFramework/Program.cs +++ b/Aaru.EntityFramework/Program.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.EntityFramework +namespace Aaru.EntityFramework { class Program { diff --git a/Aaru.Filesystems/AODOS.cs b/Aaru.Filesystems/AODOS.cs index 72c16d908..3e1c52112 100644 --- a/Aaru.Filesystems/AODOS.cs +++ b/Aaru.Filesystems/AODOS.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information has been extracted looking at available disk images // This may be missing fields, or not, I don't know russian so any help is appreciated diff --git a/Aaru.Filesystems/APFS.cs b/Aaru.Filesystems/APFS.cs index 70e3d3f3f..2c5b1fccc 100644 --- a/Aaru.Filesystems/APFS.cs +++ b/Aaru.Filesystems/APFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class APFS : IFilesystem { diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj index 887f5ac66..305d6ca29 100644 --- a/Aaru.Filesystems/Aaru.Filesystems.csproj +++ b/Aaru.Filesystems/Aaru.Filesystems.csproj @@ -6,7 +6,7 @@ 2.0 {D7016DF2-5A5E-4524-B40D-BA2D59576688} Library - DiscImageChef.Filesystems + Aaru.Filesystems Aaru.Filesystems $(Version) false diff --git a/Aaru.Filesystems/Acorn.cs b/Aaru.Filesystems/Acorn.cs index 811d8bc73..a24348891 100644 --- a/Aaru.Filesystems/Acorn.cs +++ b/Aaru.Filesystems/Acorn.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class AcornADFS : IFilesystem { diff --git a/Aaru.Filesystems/AmigaDOS.cs b/Aaru.Filesystems/AmigaDOS.cs index 4cc95224f..5dbececd7 100644 --- a/Aaru.Filesystems/AmigaDOS.cs +++ b/Aaru.Filesystems/AmigaDOS.cs @@ -34,14 +34,14 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class AmigaDOSPlugin : IFilesystem { diff --git a/Aaru.Filesystems/AppleCommon/Consts.cs b/Aaru.Filesystems/AppleCommon/Consts.cs index c2f03d72a..189cf191a 100644 --- a/Aaru.Filesystems/AppleCommon/Consts.cs +++ b/Aaru.Filesystems/AppleCommon/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleCommon/Enums.cs b/Aaru.Filesystems/AppleCommon/Enums.cs index d6a6d43a9..b6529c06b 100644 --- a/Aaru.Filesystems/AppleCommon/Enums.cs +++ b/Aaru.Filesystems/AppleCommon/Enums.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleCommon/Info.cs b/Aaru.Filesystems/AppleCommon/Info.cs index 79602e4f3..e241111a0 100644 --- a/Aaru.Filesystems/AppleCommon/Info.cs +++ b/Aaru.Filesystems/AppleCommon/Info.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Text; -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleCommon/Structs.cs b/Aaru.Filesystems/AppleCommon/Structs.cs index 429ab7ee8..defffd7ee 100644 --- a/Aaru.Filesystems/AppleCommon/Structs.cs +++ b/Aaru.Filesystems/AppleCommon/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs index ba31115c3..1bb5a307e 100644 --- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs +++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS : IReadOnlyFilesystem { diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs index 851471180..a87c2573d 100644 --- a/Aaru.Filesystems/AppleDOS/Dir.cs +++ b/Aaru.Filesystems/AppleDOS/Dir.cs @@ -34,10 +34,10 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleDOS/File.cs b/Aaru.Filesystems/AppleDOS/File.cs index dd8b4c41b..04361d184 100644 --- a/Aaru.Filesystems/AppleDOS/File.cs +++ b/Aaru.Filesystems/AppleDOS/File.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleDOS/Info.cs b/Aaru.Filesystems/AppleDOS/Info.cs index cba9040cc..9ca82109a 100644 --- a/Aaru.Filesystems/AppleDOS/Info.cs +++ b/Aaru.Filesystems/AppleDOS/Info.cs @@ -32,13 +32,13 @@ using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleDOS/Structs.cs b/Aaru.Filesystems/AppleDOS/Structs.cs index c0e8d4c77..e89d36b06 100644 --- a/Aaru.Filesystems/AppleDOS/Structs.cs +++ b/Aaru.Filesystems/AppleDOS/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs index c82aa9788..ce1aacb07 100644 --- a/Aaru.Filesystems/AppleDOS/Super.cs +++ b/Aaru.Filesystems/AppleDOS/Super.cs @@ -32,15 +32,15 @@ using System.Collections.Generic; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Helpers; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleDOS/Xattr.cs b/Aaru.Filesystems/AppleDOS/Xattr.cs index d62bdbdc0..2457e8bbb 100644 --- a/Aaru.Filesystems/AppleDOS/Xattr.cs +++ b/Aaru.Filesystems/AppleDOS/Xattr.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems.AppleDOS +namespace Aaru.Filesystems.AppleDOS { public partial class AppleDOS { diff --git a/Aaru.Filesystems/AppleHFS/AppleHFS.cs b/Aaru.Filesystems/AppleHFS/AppleHFS.cs index c695358cf..7dcd2ca8e 100644 --- a/Aaru.Filesystems/AppleHFS/AppleHFS.cs +++ b/Aaru.Filesystems/AppleHFS/AppleHFS.cs @@ -32,10 +32,10 @@ using System; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleHFS/Consts.cs b/Aaru.Filesystems/AppleHFS/Consts.cs index 496b9a0f9..7d6e18b5a 100644 --- a/Aaru.Filesystems/AppleHFS/Consts.cs +++ b/Aaru.Filesystems/AppleHFS/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleHFS/Enums.cs b/Aaru.Filesystems/AppleHFS/Enums.cs index 8aef7275f..e8735a3fd 100644 --- a/Aaru.Filesystems/AppleHFS/Enums.cs +++ b/Aaru.Filesystems/AppleHFS/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class AppleHFS { diff --git a/Aaru.Filesystems/AppleHFS/Info.cs b/Aaru.Filesystems/AppleHFS/Info.cs index eb5d3ec5b..8a6875a7a 100644 --- a/Aaru.Filesystems/AppleHFS/Info.cs +++ b/Aaru.Filesystems/AppleHFS/Info.cs @@ -32,12 +32,12 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleHFS/Structs.cs b/Aaru.Filesystems/AppleHFS/Structs.cs index d21ce39b3..ceac93bef 100644 --- a/Aaru.Filesystems/AppleHFS/Structs.cs +++ b/Aaru.Filesystems/AppleHFS/Structs.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; // ReSharper disable IdentifierTypo // ReSharper disable MemberCanBePrivate.Local -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Macintosh // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf diff --git a/Aaru.Filesystems/AppleHFSPlus.cs b/Aaru.Filesystems/AppleHFSPlus.cs index e64c34515..a0bd41bbe 100644 --- a/Aaru.Filesystems/AppleHFSPlus.cs +++ b/Aaru.Filesystems/AppleHFSPlus.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Apple TechNote 1150: https://developer.apple.com/legacy/library/technotes/tn/tn1150.html public class AppleHFSPlus : IFilesystem diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs index c17b9e84d..e5f94e938 100644 --- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs +++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS : IReadOnlyFilesystem diff --git a/Aaru.Filesystems/AppleMFS/Consts.cs b/Aaru.Filesystems/AppleMFS/Consts.cs index b9587bb49..0de5b569f 100644 --- a/Aaru.Filesystems/AppleMFS/Consts.cs +++ b/Aaru.Filesystems/AppleMFS/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs index d62b14954..2d564634c 100644 --- a/Aaru.Filesystems/AppleMFS/Dir.cs +++ b/Aaru.Filesystems/AppleMFS/Dir.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AppleMFS/File.cs b/Aaru.Filesystems/AppleMFS/File.cs index 14c0b456e..fc3fb1ea9 100644 --- a/Aaru.Filesystems/AppleMFS/File.cs +++ b/Aaru.Filesystems/AppleMFS/File.cs @@ -32,12 +32,12 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AppleMFS/Info.cs b/Aaru.Filesystems/AppleMFS/Info.cs index 898acf995..8774a09c7 100644 --- a/Aaru.Filesystems/AppleMFS/Info.cs +++ b/Aaru.Filesystems/AppleMFS/Info.cs @@ -33,12 +33,12 @@ using System; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AppleMFS/Structs.cs b/Aaru.Filesystems/AppleMFS/Structs.cs index f0b8908f4..bfd5237c9 100644 --- a/Aaru.Filesystems/AppleMFS/Structs.cs +++ b/Aaru.Filesystems/AppleMFS/Structs.cs @@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis; #pragma warning disable 169 -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "NotAccessedField.Local")] diff --git a/Aaru.Filesystems/AppleMFS/Super.cs b/Aaru.Filesystems/AppleMFS/Super.cs index b97171284..ff71a8972 100644 --- a/Aaru.Filesystems/AppleMFS/Super.cs +++ b/Aaru.Filesystems/AppleMFS/Super.cs @@ -33,13 +33,13 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AppleMFS/Xattr.cs b/Aaru.Filesystems/AppleMFS/Xattr.cs index 659829af4..dc9037c07 100644 --- a/Aaru.Filesystems/AppleMFS/Xattr.cs +++ b/Aaru.Filesystems/AppleMFS/Xattr.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.AppleMFS +namespace Aaru.Filesystems.AppleMFS { // Information from Inside Macintosh Volume II public partial class AppleMFS diff --git a/Aaru.Filesystems/AtheOS.cs b/Aaru.Filesystems/AtheOS.cs index c058e4ddb..692bcff2b 100644 --- a/Aaru.Filesystems/AtheOS.cs +++ b/Aaru.Filesystems/AtheOS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class AtheOS : IFilesystem { diff --git a/Aaru.Filesystems/BFS.cs b/Aaru.Filesystems/BFS.cs index 0f670dacf..13147f505 100644 --- a/Aaru.Filesystems/BFS.cs +++ b/Aaru.Filesystems/BFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Practical Filesystem Design, ISBN 1-55860-497-9 public class BeFS : IFilesystem diff --git a/Aaru.Filesystems/BTRFS.cs b/Aaru.Filesystems/BTRFS.cs index 0e63eb376..898647c6c 100644 --- a/Aaru.Filesystems/BTRFS.cs +++ b/Aaru.Filesystems/BTRFS.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class BTRFS : IFilesystem { diff --git a/Aaru.Filesystems/CBM.cs b/Aaru.Filesystems/CBM.cs index af5355328..28e302034 100644 --- a/Aaru.Filesystems/CBM.cs +++ b/Aaru.Filesystems/CBM.cs @@ -34,13 +34,13 @@ using System; using System.Runtime.InteropServices; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class CBM : IFilesystem { diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs index 7de22c0b9..60babeca5 100644 --- a/Aaru.Filesystems/CPM/CPM.cs +++ b/Aaru.Filesystems/CPM/CPM.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM : IReadOnlyFilesystem { diff --git a/Aaru.Filesystems/CPM/Consts.cs b/Aaru.Filesystems/CPM/Consts.cs index c8713746d..c2343ccda 100644 --- a/Aaru.Filesystems/CPM/Consts.cs +++ b/Aaru.Filesystems/CPM/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Definitions.cs b/Aaru.Filesystems/CPM/Definitions.cs index ab6a455bf..042486f17 100644 --- a/Aaru.Filesystems/CPM/Definitions.cs +++ b/Aaru.Filesystems/CPM/Definitions.cs @@ -36,7 +36,7 @@ using System.Reflection; using System.Xml; using System.Xml.Serialization; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Dir.cs b/Aaru.Filesystems/CPM/Dir.cs index 5df0774fc..0400777d1 100644 --- a/Aaru.Filesystems/CPM/Dir.cs +++ b/Aaru.Filesystems/CPM/Dir.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/File.cs b/Aaru.Filesystems/CPM/File.cs index ee07eee32..e722a44b3 100644 --- a/Aaru.Filesystems/CPM/File.cs +++ b/Aaru.Filesystems/CPM/File.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs index 790ad79a9..27e1627b2 100644 --- a/Aaru.Filesystems/CPM/Info.cs +++ b/Aaru.Filesystems/CPM/Info.cs @@ -34,13 +34,13 @@ using System; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Structs.cs b/Aaru.Filesystems/CPM/Structs.cs index ad02d2797..afd1eb1d4 100644 --- a/Aaru.Filesystems/CPM/Structs.cs +++ b/Aaru.Filesystems/CPM/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs index 37e2892c8..858bc6e0c 100644 --- a/Aaru.Filesystems/CPM/Super.cs +++ b/Aaru.Filesystems/CPM/Super.cs @@ -37,16 +37,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Helpers; using Schemas; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; -using FileSystemInfo = DiscImageChef.CommonTypes.Structs.FileSystemInfo; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; +using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/CPM/Xattr.cs b/Aaru.Filesystems/CPM/Xattr.cs index 4f4d01548..31125062b 100644 --- a/Aaru.Filesystems/CPM/Xattr.cs +++ b/Aaru.Filesystems/CPM/Xattr.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems.CPM +namespace Aaru.Filesystems.CPM { partial class CPM { diff --git a/Aaru.Filesystems/Cram.cs b/Aaru.Filesystems/Cram.cs index 3dc0bc3d2..870ff1c44 100644 --- a/Aaru.Filesystems/Cram.cs +++ b/Aaru.Filesystems/Cram.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Cram : IFilesystem { diff --git a/Aaru.Filesystems/ECMA67.cs b/Aaru.Filesystems/ECMA67.cs index e7b3418eb..7f76042dd 100644 --- a/Aaru.Filesystems/ECMA67.cs +++ b/Aaru.Filesystems/ECMA67.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class ECMA67 : IFilesystem { diff --git a/Aaru.Filesystems/EFS.cs b/Aaru.Filesystems/EFS.cs index 9db330b57..03274202d 100644 --- a/Aaru.Filesystems/EFS.cs +++ b/Aaru.Filesystems/EFS.cs @@ -34,14 +34,14 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class EFS : IFilesystem { diff --git a/Aaru.Filesystems/F2FS.cs b/Aaru.Filesystems/F2FS.cs index a58c08773..f15245002 100644 --- a/Aaru.Filesystems/F2FS.cs +++ b/Aaru.Filesystems/F2FS.cs @@ -34,12 +34,12 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class F2FS : IFilesystem { diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs index 0378ab9fc..fb226cfb3 100644 --- a/Aaru.Filesystems/FAT/BPB.cs +++ b/Aaru.Filesystems/FAT/BPB.cs @@ -34,13 +34,13 @@ using System; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Consts.cs b/Aaru.Filesystems/FAT/Consts.cs index 91e95ce5d..7a63a0ddf 100644 --- a/Aaru.Filesystems/FAT/Consts.cs +++ b/Aaru.Filesystems/FAT/Consts.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs index 413f81594..b80b37b92 100644 --- a/Aaru.Filesystems/FAT/Dir.cs +++ b/Aaru.Filesystems/FAT/Dir.cs @@ -35,10 +35,10 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs index 788b26b4c..7284d7118 100644 --- a/Aaru.Filesystems/FAT/FAT.cs +++ b/Aaru.Filesystems/FAT/FAT.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { // TODO: Differentiate between Atari and X68k FAT, as this one uses a standard BPB. // X68K uses cdate/adate from direntry for extending filename diff --git a/Aaru.Filesystems/FAT/File.cs b/Aaru.Filesystems/FAT/File.cs index 2f811c2b5..8159752fc 100644 --- a/Aaru.Filesystems/FAT/File.cs +++ b/Aaru.Filesystems/FAT/File.cs @@ -34,10 +34,10 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes.Structs; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs index 7cfd6e333..770d87541 100644 --- a/Aaru.Filesystems/FAT/Info.cs +++ b/Aaru.Filesystems/FAT/Info.cs @@ -34,15 +34,15 @@ using System; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Structs.cs b/Aaru.Filesystems/FAT/Structs.cs index c08156060..48a6e3e81 100644 --- a/Aaru.Filesystems/FAT/Structs.cs +++ b/Aaru.Filesystems/FAT/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs index 7732c7a27..63a142439 100644 --- a/Aaru.Filesystems/FAT/Super.cs +++ b/Aaru.Filesystems/FAT/Super.cs @@ -37,16 +37,16 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; using Schemas; -using FileSystemInfo = DiscImageChef.CommonTypes.Structs.FileSystemInfo; -using Marshal = DiscImageChef.Helpers.Marshal; +using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FAT/Xattr.cs b/Aaru.Filesystems/FAT/Xattr.cs index 75c92954e..6474996fd 100644 --- a/Aaru.Filesystems/FAT/Xattr.cs +++ b/Aaru.Filesystems/FAT/Xattr.cs @@ -35,10 +35,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.FAT +namespace Aaru.Filesystems.FAT { public partial class FAT { diff --git a/Aaru.Filesystems/FATX/Consts.cs b/Aaru.Filesystems/FATX/Consts.cs index db466bf20..e5a801f6a 100644 --- a/Aaru.Filesystems/FATX/Consts.cs +++ b/Aaru.Filesystems/FATX/Consts.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FATX/Dir.cs b/Aaru.Filesystems/FATX/Dir.cs index d9def41a8..bf73c618f 100644 --- a/Aaru.Filesystems/FATX/Dir.cs +++ b/Aaru.Filesystems/FATX/Dir.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs index 93e0be81a..3419041e5 100644 --- a/Aaru.Filesystems/FATX/FATX.cs +++ b/Aaru.Filesystems/FATX/FATX.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin : IReadOnlyFilesystem { diff --git a/Aaru.Filesystems/FATX/File.cs b/Aaru.Filesystems/FATX/File.cs index b2c6243ec..ee531f0eb 100644 --- a/Aaru.Filesystems/FATX/File.cs +++ b/Aaru.Filesystems/FATX/File.cs @@ -34,10 +34,10 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes.Structs; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FATX/Info.cs b/Aaru.Filesystems/FATX/Info.cs index 3a16dc998..ca31b1ec3 100644 --- a/Aaru.Filesystems/FATX/Info.cs +++ b/Aaru.Filesystems/FATX/Info.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FATX/Structs.cs b/Aaru.Filesystems/FATX/Structs.cs index 2f764c6e2..fe3b5179e 100644 --- a/Aaru.Filesystems/FATX/Structs.cs +++ b/Aaru.Filesystems/FATX/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs index bdf884249..c93e86846 100644 --- a/Aaru.Filesystems/FATX/Super.cs +++ b/Aaru.Filesystems/FATX/Super.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.Globalization; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems.FATX +namespace Aaru.Filesystems.FATX { public partial class XboxFatPlugin { diff --git a/Aaru.Filesystems/FFS.cs b/Aaru.Filesystems/FFS.cs index 95f95edb4..06bd17160 100644 --- a/Aaru.Filesystems/FFS.cs +++ b/Aaru.Filesystems/FFS.cs @@ -35,15 +35,15 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; using time_t = System.Int32; using ufs_daddr_t = System.Int32; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Using information from Linux kernel headers [SuppressMessage("ReSharper", "InconsistentNaming")] diff --git a/Aaru.Filesystems/Fossil.cs b/Aaru.Filesystems/Fossil.cs index a67d2ebef..387866bbc 100644 --- a/Aaru.Filesystems/Fossil.cs +++ b/Aaru.Filesystems/Fossil.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Fossil : IFilesystem { diff --git a/Aaru.Filesystems/HAMMER.cs b/Aaru.Filesystems/HAMMER.cs index 7efabcdb8..eb5535cb0 100644 --- a/Aaru.Filesystems/HAMMER.cs +++ b/Aaru.Filesystems/HAMMER.cs @@ -34,17 +34,17 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; using hammer_crc_t = System.UInt32; using hammer_off_t = System.UInt64; using hammer_tid_t = System.UInt64; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; #pragma warning disable 169 -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class HAMMER : IFilesystem { diff --git a/Aaru.Filesystems/HPFS.cs b/Aaru.Filesystems/HPFS.cs index b3f0e7dd5..35b01b9a5 100644 --- a/Aaru.Filesystems/HPFS.cs +++ b/Aaru.Filesystems/HPFS.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from an old unnamed document public class HPFS : IFilesystem diff --git a/Aaru.Filesystems/HPOFS.cs b/Aaru.Filesystems/HPOFS.cs index 7418166ab..802b81778 100644 --- a/Aaru.Filesystems/HPOFS.cs +++ b/Aaru.Filesystems/HPOFS.cs @@ -35,13 +35,13 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from test floppy images created with OS/2 HPOFS 2.0 // Need to get IBM document GA32-0224 -> IBM 3995 Optical Library Dataserver Products: Optical Disk Format diff --git a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs index cb4316bcd..1d46a5955 100644 --- a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs +++ b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs index 850ed6a13..49fbd37e1 100644 --- a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs +++ b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/Apple.cs b/Aaru.Filesystems/ISO9660/Consts/Apple.cs index 10b07ff6e..67272b00c 100644 --- a/Aaru.Filesystems/ISO9660/Consts/Apple.cs +++ b/Aaru.Filesystems/ISO9660/Consts/Apple.cs @@ -31,7 +31,7 @@ // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24 // ****************************************************************************/ -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/CDi.cs b/Aaru.Filesystems/ISO9660/Consts/CDi.cs index a0c201460..9ce85921d 100644 --- a/Aaru.Filesystems/ISO9660/Consts/CDi.cs +++ b/Aaru.Filesystems/ISO9660/Consts/CDi.cs @@ -32,9 +32,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs index d8e4944a5..3583828ec 100644 --- a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs +++ b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs index 018b857a4..592f96c00 100644 --- a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs +++ b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs @@ -31,9 +31,9 @@ // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24 // ****************************************************************************/ -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/ISO.cs b/Aaru.Filesystems/ISO9660/Consts/ISO.cs index ae5ed6659..e3f4041a7 100644 --- a/Aaru.Filesystems/ISO9660/Consts/ISO.cs +++ b/Aaru.Filesystems/ISO9660/Consts/ISO.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/Internal.cs b/Aaru.Filesystems/ISO9660/Consts/Internal.cs index 7d63dee67..eabeb3a3f 100644 --- a/Aaru.Filesystems/ISO9660/Consts/Internal.cs +++ b/Aaru.Filesystems/ISO9660/Consts/Internal.cs @@ -31,9 +31,9 @@ // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24 // ****************************************************************************/ -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs index 404e1c3fc..4c9af11ac 100644 --- a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs +++ b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs index 6ffd0b905..69b4d8cb8 100644 --- a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs +++ b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs @@ -31,7 +31,7 @@ // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24 // ****************************************************************************/ -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/XA.cs b/Aaru.Filesystems/ISO9660/Consts/XA.cs index 04eb0deb8..419c4dd17 100644 --- a/Aaru.Filesystems/ISO9660/Consts/XA.cs +++ b/Aaru.Filesystems/ISO9660/Consts/XA.cs @@ -33,7 +33,7 @@ using System; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs index 57522efe0..7725211d4 100644 --- a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs +++ b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs @@ -31,7 +31,7 @@ // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24 // ****************************************************************************/ -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Date.cs b/Aaru.Filesystems/ISO9660/Date.cs index 503ac414c..68f3052f2 100644 --- a/Aaru.Filesystems/ISO9660/Date.cs +++ b/Aaru.Filesystems/ISO9660/Date.cs @@ -32,9 +32,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Dir.cs b/Aaru.Filesystems/ISO9660/Dir.cs index 962955089..aa5228481 100644 --- a/Aaru.Filesystems/ISO9660/Dir.cs +++ b/Aaru.Filesystems/ISO9660/Dir.cs @@ -37,10 +37,10 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/File.cs b/Aaru.Filesystems/ISO9660/File.cs index 613c4f4c4..76d33cfe4 100644 --- a/Aaru.Filesystems/ISO9660/File.cs +++ b/Aaru.Filesystems/ISO9660/File.cs @@ -36,11 +36,11 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs index 0bb1aa00b..c20136312 100644 --- a/Aaru.Filesystems/ISO9660/ISO9660.cs +++ b/Aaru.Filesystems/ISO9660/ISO9660.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { // This is coded following ECMA-119. public partial class ISO9660 : IReadOnlyFilesystem diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs index de508430e..e8c8cbb64 100644 --- a/Aaru.Filesystems/ISO9660/Info.cs +++ b/Aaru.Filesystems/ISO9660/Info.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Decoders.Sega; -using DiscImageChef.Helpers; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Decoders.Sega; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs index 6d7a00dd2..638e6ef93 100644 --- a/Aaru.Filesystems/ISO9660/Mode2.cs +++ b/Aaru.Filesystems/ISO9660/Mode2.cs @@ -33,7 +33,7 @@ using System.IO; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/PathTable.cs b/Aaru.Filesystems/ISO9660/PathTable.cs index 4034db232..51a3a0d42 100644 --- a/Aaru.Filesystems/ISO9660/PathTable.cs +++ b/Aaru.Filesystems/ISO9660/PathTable.cs @@ -32,9 +32,9 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs index c72db466c..3046fe803 100644 --- a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs +++ b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/Apple.cs b/Aaru.Filesystems/ISO9660/Structs/Apple.cs index 1e7e45611..9f30741eb 100644 --- a/Aaru.Filesystems/ISO9660/Structs/Apple.cs +++ b/Aaru.Filesystems/ISO9660/Structs/Apple.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/CDi.cs b/Aaru.Filesystems/ISO9660/Structs/CDi.cs index e59c879d4..993c30c30 100644 --- a/Aaru.Filesystems/ISO9660/Structs/CDi.cs +++ b/Aaru.Filesystems/ISO9660/Structs/CDi.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs index 511d78374..1a5db6893 100644 --- a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs +++ b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs index 3e6182716..eeb9aa5cb 100644 --- a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs +++ b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs @@ -35,7 +35,7 @@ using System; using System.Runtime.InteropServices; using System.Text; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/ISO.cs b/Aaru.Filesystems/ISO9660/Structs/ISO.cs index e5c26e88e..c32005fa3 100644 --- a/Aaru.Filesystems/ISO9660/Structs/ISO.cs +++ b/Aaru.Filesystems/ISO9660/Structs/ISO.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/Internal.cs b/Aaru.Filesystems/ISO9660/Structs/Internal.cs index 1a40ffb5b..0faa91bed 100644 --- a/Aaru.Filesystems/ISO9660/Structs/Internal.cs +++ b/Aaru.Filesystems/ISO9660/Structs/Internal.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs index 4a290d60b..0758bb18d 100644 --- a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs +++ b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs @@ -34,7 +34,7 @@ using System; using System.Text; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs index d7cf67b3d..e19165205 100644 --- a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs +++ b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs index 225d13534..01da81e38 100644 --- a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs +++ b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/XA.cs b/Aaru.Filesystems/ISO9660/Structs/XA.cs index 95b19b7c2..1941285c6 100644 --- a/Aaru.Filesystems/ISO9660/Structs/XA.cs +++ b/Aaru.Filesystems/ISO9660/Structs/XA.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs index 797b55f05..8bceb6f86 100644 --- a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs +++ b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs index 0c1919ce0..5c7e4a02c 100644 --- a/Aaru.Filesystems/ISO9660/Super.cs +++ b/Aaru.Filesystems/ISO9660/Super.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.Sega; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.Sega; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/ISO9660/Xattr.cs b/Aaru.Filesystems/ISO9660/Xattr.cs index 0475dc207..60fed52d5 100644 --- a/Aaru.Filesystems/ISO9660/Xattr.cs +++ b/Aaru.Filesystems/ISO9660/Xattr.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems.ISO9660 +namespace Aaru.Filesystems.ISO9660 { public partial class ISO9660 { diff --git a/Aaru.Filesystems/JFS.cs b/Aaru.Filesystems/JFS.cs index acb137230..e7dd49c5a 100644 --- a/Aaru.Filesystems/JFS.cs +++ b/Aaru.Filesystems/JFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class JFS : IFilesystem { diff --git a/Aaru.Filesystems/LIF.cs b/Aaru.Filesystems/LIF.cs index 32fa2cb8a..25c3e2cae 100644 --- a/Aaru.Filesystems/LIF.cs +++ b/Aaru.Filesystems/LIF.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from http://www.hp9845.net/9845/projects/hpdir/#lif_filesystem public class LIF : IFilesystem diff --git a/Aaru.Filesystems/LisaFS/Consts.cs b/Aaru.Filesystems/LisaFS/Consts.cs index 45f96c9f7..0bf8f4637 100644 --- a/Aaru.Filesystems/LisaFS/Consts.cs +++ b/Aaru.Filesystems/LisaFS/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs index a8cfa27e0..21a55c0b0 100644 --- a/Aaru.Filesystems/LisaFS/Dir.cs +++ b/Aaru.Filesystems/LisaFS/Dir.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs index a587143de..b82e069da 100644 --- a/Aaru.Filesystems/LisaFS/Extent.cs +++ b/Aaru.Filesystems/LisaFS/Extent.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs index 95c74fc2b..0e2124104 100644 --- a/Aaru.Filesystems/LisaFS/File.cs +++ b/Aaru.Filesystems/LisaFS/File.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs index a56392a2d..fb401fbd4 100644 --- a/Aaru.Filesystems/LisaFS/Info.cs +++ b/Aaru.Filesystems/LisaFS/Info.cs @@ -33,15 +33,15 @@ using System; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Decoders; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Decoders; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/LisaFS.cs b/Aaru.Filesystems/LisaFS/LisaFS.cs index e9ea4c617..5f74aa240 100644 --- a/Aaru.Filesystems/LisaFS/LisaFS.cs +++ b/Aaru.Filesystems/LisaFS/LisaFS.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { // All information by Natalia Portillo // Variable names from Lisa API diff --git a/Aaru.Filesystems/LisaFS/Structs.cs b/Aaru.Filesystems/LisaFS/Structs.cs index 665154790..81a8c7788 100644 --- a/Aaru.Filesystems/LisaFS/Structs.cs +++ b/Aaru.Filesystems/LisaFS/Structs.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs index 6fd4910f2..d383c80d2 100644 --- a/Aaru.Filesystems/LisaFS/Super.cs +++ b/Aaru.Filesystems/LisaFS/Super.cs @@ -33,16 +33,16 @@ using System; using System.Collections.Generic; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/LisaFS/Xattr.cs b/Aaru.Filesystems/LisaFS/Xattr.cs index 9f644e39c..245c08fa5 100644 --- a/Aaru.Filesystems/LisaFS/Xattr.cs +++ b/Aaru.Filesystems/LisaFS/Xattr.cs @@ -34,10 +34,10 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders; -namespace DiscImageChef.Filesystems.LisaFS +namespace Aaru.Filesystems.LisaFS { public partial class LisaFS { diff --git a/Aaru.Filesystems/Locus.cs b/Aaru.Filesystems/Locus.cs index 6bb1cfd25..0569be9dc 100644 --- a/Aaru.Filesystems/Locus.cs +++ b/Aaru.Filesystems/Locus.cs @@ -34,9 +34,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; // Commit count using commitcnt_t = System.Int32; @@ -48,13 +48,13 @@ using fstore_t = System.Int32; using gfs_t = System.Int32; // Inode number using ino_t = System.Int32; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; // Filesystem pack number using pckno_t = System.Int16; // Timestamp using time_t = System.Int32; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Locus : IFilesystem { diff --git a/Aaru.Filesystems/MicroDOS.cs b/Aaru.Filesystems/MicroDOS.cs index 0ddfb6b69..e807d9124 100644 --- a/Aaru.Filesystems/MicroDOS.cs +++ b/Aaru.Filesystems/MicroDOS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from http://www.owg.ru/mkt/BK/MKDOS.TXT // Thanks to tarlabnor for translating it diff --git a/Aaru.Filesystems/MinixFS.cs b/Aaru.Filesystems/MinixFS.cs index 5cf369757..9719ed2bc 100644 --- a/Aaru.Filesystems/MinixFS.cs +++ b/Aaru.Filesystems/MinixFS.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel public class MinixFS : IFilesystem diff --git a/Aaru.Filesystems/NILFS2.cs b/Aaru.Filesystems/NILFS2.cs index dc4a21836..c7edfcec4 100644 --- a/Aaru.Filesystems/NILFS2.cs +++ b/Aaru.Filesystems/NILFS2.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class NILFS2 : IFilesystem { diff --git a/Aaru.Filesystems/NTFS.cs b/Aaru.Filesystems/NTFS.cs index c52970aec..f048cc9b8 100644 --- a/Aaru.Filesystems/NTFS.cs +++ b/Aaru.Filesystems/NTFS.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Inside Windows NT public class NTFS : IFilesystem diff --git a/Aaru.Filesystems/Nintendo.cs b/Aaru.Filesystems/Nintendo.cs index ccf386fc1..392044b06 100644 --- a/Aaru.Filesystems/Nintendo.cs +++ b/Aaru.Filesystems/Nintendo.cs @@ -32,12 +32,12 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class NintendoPlugin : IFilesystem { diff --git a/Aaru.Filesystems/ODS.cs b/Aaru.Filesystems/ODS.cs index ad0c2a11b..a3a79e9c6 100644 --- a/Aaru.Filesystems/ODS.cs +++ b/Aaru.Filesystems/ODS.cs @@ -33,14 +33,14 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from VMS File System Internals by Kirby McCoy // ISBN: 1-55558-056-4 diff --git a/Aaru.Filesystems/Opera/Consts.cs b/Aaru.Filesystems/Opera/Consts.cs index 3bd1af546..13b1d98bc 100644 --- a/Aaru.Filesystems/Opera/Consts.cs +++ b/Aaru.Filesystems/Opera/Consts.cs @@ -1,6 +1,6 @@ -using DiscImageChef.Helpers; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/Opera/Dir.cs b/Aaru.Filesystems/Opera/Dir.cs index 3ee208542..7db8409ba 100644 --- a/Aaru.Filesystems/Opera/Dir.cs +++ b/Aaru.Filesystems/Opera/Dir.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/Opera/File.cs b/Aaru.Filesystems/Opera/File.cs index a2739cee7..11da93e62 100644 --- a/Aaru.Filesystems/Opera/File.cs +++ b/Aaru.Filesystems/Opera/File.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/Opera/Info.cs b/Aaru.Filesystems/Opera/Info.cs index 846727ebd..cb5a27491 100644 --- a/Aaru.Filesystems/Opera/Info.cs +++ b/Aaru.Filesystems/Opera/Info.cs @@ -1,11 +1,11 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/Opera/Opera.cs b/Aaru.Filesystems/Opera/Opera.cs index 0d0be2557..410ea6d97 100644 --- a/Aaru.Filesystems/Opera/Opera.cs +++ b/Aaru.Filesystems/Opera/Opera.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS : IReadOnlyFilesystem { diff --git a/Aaru.Filesystems/Opera/Structs.cs b/Aaru.Filesystems/Opera/Structs.cs index 984bf281c..65a40af7e 100644 --- a/Aaru.Filesystems/Opera/Structs.cs +++ b/Aaru.Filesystems/Opera/Structs.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/Opera/Super.cs b/Aaru.Filesystems/Opera/Super.cs index 6a334e779..8681a3878 100644 --- a/Aaru.Filesystems/Opera/Super.cs +++ b/Aaru.Filesystems/Opera/Super.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public partial class OperaFS { diff --git a/Aaru.Filesystems/PCEngine.cs b/Aaru.Filesystems/PCEngine.cs index 6575a57bc..9f3b3ede5 100644 --- a/Aaru.Filesystems/PCEngine.cs +++ b/Aaru.Filesystems/PCEngine.cs @@ -32,11 +32,11 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class PCEnginePlugin : IFilesystem { diff --git a/Aaru.Filesystems/PCFX.cs b/Aaru.Filesystems/PCFX.cs index c2720e35a..3b2876ea1 100644 --- a/Aaru.Filesystems/PCFX.cs +++ b/Aaru.Filesystems/PCFX.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Not a filesystem, more like an executable header public class PCFX : IFilesystem diff --git a/Aaru.Filesystems/PFS.cs b/Aaru.Filesystems/PFS.cs index 195f7667a..f5e292b23 100644 --- a/Aaru.Filesystems/PFS.cs +++ b/Aaru.Filesystems/PFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class PFS : IFilesystem { diff --git a/Aaru.Filesystems/ProDOS.cs b/Aaru.Filesystems/ProDOS.cs index 3a7fa24c6..c47d736c5 100644 --- a/Aaru.Filesystems/ProDOS.cs +++ b/Aaru.Filesystems/ProDOS.cs @@ -34,13 +34,13 @@ using System; using System.Linq; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from Apple ProDOS 8 Technical Reference public class ProDOSPlugin : IFilesystem diff --git a/Aaru.Filesystems/QNX4.cs b/Aaru.Filesystems/QNX4.cs index 549922bdf..023b2a52f 100644 --- a/Aaru.Filesystems/QNX4.cs +++ b/Aaru.Filesystems/QNX4.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class QNX4 : IFilesystem { diff --git a/Aaru.Filesystems/QNX6.cs b/Aaru.Filesystems/QNX6.cs index 9950186ac..d9dcf6637 100644 --- a/Aaru.Filesystems/QNX6.cs +++ b/Aaru.Filesystems/QNX6.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class QNX6 : IFilesystem { diff --git a/Aaru.Filesystems/RBF.cs b/Aaru.Filesystems/RBF.cs index 9e7532157..c3cecc3d7 100644 --- a/Aaru.Filesystems/RBF.cs +++ b/Aaru.Filesystems/RBF.cs @@ -33,13 +33,13 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class RBF : IFilesystem { diff --git a/Aaru.Filesystems/RT11.cs b/Aaru.Filesystems/RT11.cs index a05826776..cf8623b22 100644 --- a/Aaru.Filesystems/RT11.cs +++ b/Aaru.Filesystems/RT11.cs @@ -34,13 +34,13 @@ using System; using System.Runtime.InteropServices; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from http://www.trailing-edge.com/~shoppa/rt11fs/ // TODO: Implement Radix-50 diff --git a/Aaru.Filesystems/ReFS.cs b/Aaru.Filesystems/ReFS.cs index 994885cbb..ef2b189b7 100644 --- a/Aaru.Filesystems/ReFS.cs +++ b/Aaru.Filesystems/ReFS.cs @@ -34,13 +34,13 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class ReFS : IFilesystem { diff --git a/Aaru.Filesystems/Register.cs b/Aaru.Filesystems/Register.cs index 73b1c711c..87b012f3d 100644 --- a/Aaru.Filesystems/Register.cs +++ b/Aaru.Filesystems/Register.cs @@ -40,9 +40,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Register : IPluginRegister { diff --git a/Aaru.Filesystems/Reiser.cs b/Aaru.Filesystems/Reiser.cs index 93f461110..249818b31 100644 --- a/Aaru.Filesystems/Reiser.cs +++ b/Aaru.Filesystems/Reiser.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Reiser : IFilesystem { diff --git a/Aaru.Filesystems/Reiser4.cs b/Aaru.Filesystems/Reiser4.cs index c22bc21df..4ce9ba88b 100644 --- a/Aaru.Filesystems/Reiser4.cs +++ b/Aaru.Filesystems/Reiser4.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Reiser4 : IFilesystem { diff --git a/Aaru.Filesystems/SFS.cs b/Aaru.Filesystems/SFS.cs index 4997545d9..7b4dae59e 100644 --- a/Aaru.Filesystems/SFS.cs +++ b/Aaru.Filesystems/SFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class SFS : IFilesystem { diff --git a/Aaru.Filesystems/SolarFS.cs b/Aaru.Filesystems/SolarFS.cs index 7dd2f65c6..7a1bde478 100644 --- a/Aaru.Filesystems/SolarFS.cs +++ b/Aaru.Filesystems/SolarFS.cs @@ -32,12 +32,12 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Based on FAT's BPB, cannot find a FAT or directory public class SolarFS : IFilesystem diff --git a/Aaru.Filesystems/Squash.cs b/Aaru.Filesystems/Squash.cs index 6a3695943..285ef2b2c 100644 --- a/Aaru.Filesystems/Squash.cs +++ b/Aaru.Filesystems/Squash.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class Squash : IFilesystem { diff --git a/Aaru.Filesystems/SysV.cs b/Aaru.Filesystems/SysV.cs index 5eb0f374f..f733b5fd6 100644 --- a/Aaru.Filesystems/SysV.cs +++ b/Aaru.Filesystems/SysV.cs @@ -34,11 +34,11 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel [SuppressMessage("ReSharper", "InconsistentNaming")] diff --git a/Aaru.Filesystems/UCSDPascal/Consts.cs b/Aaru.Filesystems/UCSDPascal/Consts.cs index 5d6062c49..570021f67 100644 --- a/Aaru.Filesystems/UCSDPascal/Consts.cs +++ b/Aaru.Filesystems/UCSDPascal/Consts.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs index 5b76e1a7c..31ee91dd3 100644 --- a/Aaru.Filesystems/UCSDPascal/Dir.cs +++ b/Aaru.Filesystems/UCSDPascal/Dir.cs @@ -33,9 +33,9 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs index 5067732af..758f31bed 100644 --- a/Aaru.Filesystems/UCSDPascal/File.cs +++ b/Aaru.Filesystems/UCSDPascal/File.cs @@ -32,9 +32,9 @@ using System; using System.Linq; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs index 606243cdb..eca49ae59 100644 --- a/Aaru.Filesystems/UCSDPascal/Info.cs +++ b/Aaru.Filesystems/UCSDPascal/Info.cs @@ -33,13 +33,13 @@ using System; using System.Text; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/Structs.cs b/Aaru.Filesystems/UCSDPascal/Structs.cs index b8bc370a5..7d0f325e1 100644 --- a/Aaru.Filesystems/UCSDPascal/Structs.cs +++ b/Aaru.Filesystems/UCSDPascal/Structs.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/Super.cs b/Aaru.Filesystems/UCSDPascal/Super.cs index a71e570b0..514137e12 100644 --- a/Aaru.Filesystems/UCSDPascal/Super.cs +++ b/Aaru.Filesystems/UCSDPascal/Super.cs @@ -33,13 +33,13 @@ using System; using System.Collections.Generic; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; using Encoding = System.Text.Encoding; -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin diff --git a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs index aeb828910..7f0fc56bf 100644 --- a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs +++ b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.Filesystems.UCSDPascal +namespace Aaru.Filesystems.UCSDPascal { // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure public partial class PascalPlugin : IReadOnlyFilesystem diff --git a/Aaru.Filesystems/UDF.cs b/Aaru.Filesystems/UDF.cs index 86b2b615c..3a264d4b5 100644 --- a/Aaru.Filesystems/UDF.cs +++ b/Aaru.Filesystems/UDF.cs @@ -34,13 +34,13 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // TODO: Detect bootable public class UDF : IFilesystem diff --git a/Aaru.Filesystems/UNICOS.cs b/Aaru.Filesystems/UNICOS.cs index a1c417deb..da5878116 100644 --- a/Aaru.Filesystems/UNICOS.cs +++ b/Aaru.Filesystems/UNICOS.cs @@ -34,9 +34,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; // UNICOS is ILP64 so let's think everything is 64-bit using blkno_t = System.Int64; @@ -44,10 +44,10 @@ using daddr_t = System.Int64; using dev_t = System.Int64; using extent_t = System.Int64; using ino_t = System.Int64; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; using time_t = System.Int64; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class UNICOS : IFilesystem { diff --git a/Aaru.Filesystems/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS.cs index b4275314b..318642ed1 100644 --- a/Aaru.Filesystems/UNIXBFS.cs +++ b/Aaru.Filesystems/UNIXBFS.cs @@ -32,12 +32,12 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel public class BFS : IFilesystem diff --git a/Aaru.Filesystems/VMfs.cs b/Aaru.Filesystems/VMfs.cs index 7722c14ae..72ff4ed98 100644 --- a/Aaru.Filesystems/VMfs.cs +++ b/Aaru.Filesystems/VMfs.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class VMfs : IFilesystem { diff --git a/Aaru.Filesystems/VxFS.cs b/Aaru.Filesystems/VxFS.cs index 1a66f3276..846a83d2f 100644 --- a/Aaru.Filesystems/VxFS.cs +++ b/Aaru.Filesystems/VxFS.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class VxFS : IFilesystem { diff --git a/Aaru.Filesystems/XFS.cs b/Aaru.Filesystems/XFS.cs index ca3f65550..826d8a093 100644 --- a/Aaru.Filesystems/XFS.cs +++ b/Aaru.Filesystems/XFS.cs @@ -33,14 +33,14 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { public class XFS : IFilesystem { diff --git a/Aaru.Filesystems/Xia.cs b/Aaru.Filesystems/Xia.cs index 8fe41991c..01e7e2624 100644 --- a/Aaru.Filesystems/Xia.cs +++ b/Aaru.Filesystems/Xia.cs @@ -33,12 +33,12 @@ using System; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel public class Xia : IFilesystem diff --git a/Aaru.Filesystems/ZFS.cs b/Aaru.Filesystems/ZFS.cs index fd704c84a..958edb230 100644 --- a/Aaru.Filesystems/ZFS.cs +++ b/Aaru.Filesystems/ZFS.cs @@ -35,11 +35,11 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { /* * The ZFS on-disk structure is quite undocumented, so this has been checked using several test images and reading the comments and headers (but not the code) diff --git a/Aaru.Filesystems/dump.cs b/Aaru.Filesystems/dump.cs index 8a3640efb..4fbf6db1a 100644 --- a/Aaru.Filesystems/dump.cs +++ b/Aaru.Filesystems/dump.cs @@ -34,14 +34,14 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; using ufs_daddr_t = System.Int32; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { [SuppressMessage("ReSharper", "InconsistentNaming")] public class dump : IFilesystem diff --git a/Aaru.Filesystems/exFAT.cs b/Aaru.Filesystems/exFAT.cs index 63f8a3182..e46f06aad 100644 --- a/Aaru.Filesystems/exFAT.cs +++ b/Aaru.Filesystems/exFAT.cs @@ -34,12 +34,12 @@ using System; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from https://www.sans.org/reading-room/whitepapers/forensics/reverse-engineering-microsoft-exfat-file-system-33274 public class exFAT : IFilesystem diff --git a/Aaru.Filesystems/ext2FS.cs b/Aaru.Filesystems/ext2FS.cs index 934cb6395..2912f4140 100644 --- a/Aaru.Filesystems/ext2FS.cs +++ b/Aaru.Filesystems/ext2FS.cs @@ -34,12 +34,12 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel public class ext2FS : IFilesystem diff --git a/Aaru.Filesystems/extFS.cs b/Aaru.Filesystems/extFS.cs index 01fb969ba..e12814d0a 100644 --- a/Aaru.Filesystems/extFS.cs +++ b/Aaru.Filesystems/extFS.cs @@ -33,11 +33,11 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; using Schemas; -namespace DiscImageChef.Filesystems +namespace Aaru.Filesystems { // Information from the Linux kernel public class extFS : IFilesystem diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj index fa0ed87b1..ad2352de4 100644 --- a/Aaru.Filters/Aaru.Filters.csproj +++ b/Aaru.Filters/Aaru.Filters.csproj @@ -6,7 +6,7 @@ 2.0 {D571B8EF-903D-4353-BDD5-B834F9F029EF} Library - DiscImageChef.Filters + Aaru.Filters Aaru.Filters $(Version) false diff --git a/Aaru.Filters/AppleDouble.cs b/Aaru.Filters/AppleDouble.cs index 737003ffd..651315779 100644 --- a/Aaru.Filters/AppleDouble.cs +++ b/Aaru.Filters/AppleDouble.cs @@ -34,10 +34,10 @@ using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decodes AppleDouble files diff --git a/Aaru.Filters/AppleSingle.cs b/Aaru.Filters/AppleSingle.cs index 37e8ad2c3..4bfcec787 100644 --- a/Aaru.Filters/AppleSingle.cs +++ b/Aaru.Filters/AppleSingle.cs @@ -34,10 +34,10 @@ using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decodes AppleSingle files diff --git a/Aaru.Filters/BZip2.cs b/Aaru.Filters/BZip2.cs index e583ccd31..ec77f32b8 100644 --- a/Aaru.Filters/BZip2.cs +++ b/Aaru.Filters/BZip2.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using SharpCompress.Compressors; using SharpCompress.Compressors.BZip2; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decompress bz2 files while reading diff --git a/Aaru.Filters/ForcedSeekStream.cs b/Aaru.Filters/ForcedSeekStream.cs index 16576bef8..da7140d66 100644 --- a/Aaru.Filters/ForcedSeekStream.cs +++ b/Aaru.Filters/ForcedSeekStream.cs @@ -33,7 +33,7 @@ using System; using System.IO; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// ForcedSeekStream allows to seek a forward-readable stream (like System.IO.Compression streams) @@ -48,7 +48,7 @@ namespace DiscImageChef.Filters long streamLength; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The real (uncompressed) length of the stream. /// Parameters that are used to create the base stream. @@ -62,7 +62,7 @@ namespace DiscImageChef.Filters } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// Parameters that are used to create the base stream. public ForcedSeekStream(params object[] args) diff --git a/Aaru.Filters/GZip.cs b/Aaru.Filters/GZip.cs index 2f93c86fd..f136e6680 100644 --- a/Aaru.Filters/GZip.cs +++ b/Aaru.Filters/GZip.cs @@ -33,9 +33,9 @@ using System; using System.IO; using System.IO.Compression; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decompress gzip files while reading diff --git a/Aaru.Filters/LZip.cs b/Aaru.Filters/LZip.cs index 2164a31dd..bd6bdde3e 100644 --- a/Aaru.Filters/LZip.cs +++ b/Aaru.Filters/LZip.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using SharpCompress.Compressors; using SharpCompress.Compressors.LZMA; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decompress lzip files while reading diff --git a/Aaru.Filters/MacBinary.cs b/Aaru.Filters/MacBinary.cs index b89bcc8d3..a829d063b 100644 --- a/Aaru.Filters/MacBinary.cs +++ b/Aaru.Filters/MacBinary.cs @@ -34,10 +34,10 @@ using System; using System.IO; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Filters +namespace Aaru.Filters { // TODO: Interpret fdScript /// diff --git a/Aaru.Filters/OffsetStream.cs b/Aaru.Filters/OffsetStream.cs index d521135df..48e6129ac 100644 --- a/Aaru.Filters/OffsetStream.cs +++ b/Aaru.Filters/OffsetStream.cs @@ -38,7 +38,7 @@ using Microsoft.Win32.SafeHandles; using System.Security.AccessControl; #endif -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Creates a stream that is a subset of another stream. diff --git a/Aaru.Filters/PCExchange.cs b/Aaru.Filters/PCExchange.cs index 2d1a148f3..fb81ffb1f 100644 --- a/Aaru.Filters/PCExchange.cs +++ b/Aaru.Filters/PCExchange.cs @@ -36,9 +36,9 @@ using System.Globalization; using System.IO; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decodes PCExchange files @@ -118,7 +118,7 @@ namespace DiscImageChef.Filters PCExchangeEntry datEntry = new PCExchangeEntry(); byte[] datEntry_b = new byte[Marshal.SizeOf(datEntry)]; finderDatStream.Read(datEntry_b, 0, Marshal.SizeOf(datEntry)); - datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian(datEntry_b); + datEntry = Aaru.Helpers.Marshal.ByteArrayToStructureBigEndian(datEntry_b); // TODO: Add support for encoding on filters string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh")); @@ -175,7 +175,7 @@ namespace DiscImageChef.Filters PCExchangeEntry datEntry = new PCExchangeEntry(); byte[] datEntry_b = new byte[Marshal.SizeOf(datEntry)]; finderDatStream.Read(datEntry_b, 0, Marshal.SizeOf(datEntry)); - datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian(datEntry_b); + datEntry = Aaru.Helpers.Marshal.ByteArrayToStructureBigEndian(datEntry_b); string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh")); byte[] tmpDosName_b = new byte[8]; diff --git a/Aaru.Filters/Register.cs b/Aaru.Filters/Register.cs index 950bf6d4b..751d43b93 100644 --- a/Aaru.Filters/Register.cs +++ b/Aaru.Filters/Register.cs @@ -40,9 +40,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Filters +namespace Aaru.Filters { public class Register : IPluginRegister { diff --git a/Aaru.Filters/XZ.cs b/Aaru.Filters/XZ.cs index d6f72933b..94547bbf5 100644 --- a/Aaru.Filters/XZ.cs +++ b/Aaru.Filters/XZ.cs @@ -32,10 +32,10 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using SharpCompress.Compressors.Xz; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// Decompress xz files while reading diff --git a/Aaru.Filters/ZZZNoFilter.cs b/Aaru.Filters/ZZZNoFilter.cs index d678cae71..3ba7c08e9 100644 --- a/Aaru.Filters/ZZZNoFilter.cs +++ b/Aaru.Filters/ZZZNoFilter.cs @@ -32,9 +32,9 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Filters +namespace Aaru.Filters { /// /// No filter for reading files not recognized by any filter diff --git a/Aaru.Gtk/Program.cs b/Aaru.Gtk/Program.cs index b96d77d45..648ccab79 100644 --- a/Aaru.Gtk/Program.cs +++ b/Aaru.Gtk/Program.cs @@ -2,14 +2,14 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Gui.Forms; +using Aaru.Core; +using Aaru.Database; +using Aaru.Gui.Forms; using Eto; using Eto.Forms; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Gtk +namespace Aaru.Gtk { class Program { diff --git a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj index f2b67d1b3..e84e7aeda 100644 --- a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj +++ b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj @@ -6,7 +6,7 @@ {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF} {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - DiscImageChef.Gui.XamMac + Aaru.Gui.XamMac DiscImageChef.Gui.XamMac v2.0 Xamarin.Mac diff --git a/Aaru.Gui.XamMac/Program.cs b/Aaru.Gui.XamMac/Program.cs index 8abb4438a..b4dab21d9 100644 --- a/Aaru.Gui.XamMac/Program.cs +++ b/Aaru.Gui.XamMac/Program.cs @@ -32,14 +32,14 @@ using System; using System.Reflection; using System.Threading.Tasks; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Gui.Forms; +using Aaru.Core; +using Aaru.Database; +using Aaru.Gui.Forms; using Eto; using Eto.Forms; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Gtk +namespace Aaru.XamMac { class Program { diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj index 235ef93c7..c5cbc818a 100644 --- a/Aaru.Gui/Aaru.Gui.csproj +++ b/Aaru.Gui/Aaru.Gui.csproj @@ -1,6 +1,6 @@  - DiscImageChef.Gui + Aaru.Gui Aaru.Gui $(Version) true diff --git a/Aaru.Gui/ConsoleHandler.cs b/Aaru.Gui/ConsoleHandler.cs index ad1a504dd..6604554d8 100644 --- a/Aaru.Gui/ConsoleHandler.cs +++ b/Aaru.Gui/ConsoleHandler.cs @@ -33,9 +33,9 @@ using System; using System.Collections.ObjectModel; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.Gui +namespace Aaru.Gui { static class ConsoleHandler { diff --git a/Aaru.Gui/Controls/BlockMap.cs b/Aaru.Gui/Controls/BlockMap.cs index 09c3e669c..ef9cba6c7 100644 --- a/Aaru.Gui/Controls/BlockMap.cs +++ b/Aaru.Gui/Controls/BlockMap.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -namespace DiscImageChef.Gui.Controls +namespace Aaru.Gui.Controls { public class BlockMap : ColoredGrid { diff --git a/Aaru.Gui/Controls/ColoredGrid.cs b/Aaru.Gui/Controls/ColoredGrid.cs index 005866ef4..460441e4d 100644 --- a/Aaru.Gui/Controls/ColoredGrid.cs +++ b/Aaru.Gui/Controls/ColoredGrid.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using Eto.Drawing; using Eto.Forms; -namespace DiscImageChef.Gui.Controls +namespace Aaru.Gui.Controls { /// /// Draws a grid of colored blocks diff --git a/Aaru.Gui/Controls/LineChart.cs b/Aaru.Gui/Controls/LineChart.cs index 52be25c09..8676078c2 100644 --- a/Aaru.Gui/Controls/LineChart.cs +++ b/Aaru.Gui/Controls/LineChart.cs @@ -3,7 +3,7 @@ using System.Collections.Specialized; using Eto.Drawing; using Eto.Forms; -namespace DiscImageChef.Gui.Controls +namespace Aaru.Gui.Controls { /// /// Draws a line chart diff --git a/Aaru.Gui/Controls/SvgImageView.cs b/Aaru.Gui/Controls/SvgImageView.cs index f903fb0c6..6846d207e 100644 --- a/Aaru.Gui/Controls/SvgImageView.cs +++ b/Aaru.Gui/Controls/SvgImageView.cs @@ -35,7 +35,7 @@ using System.IO; using Eto.Drawing; using Eto.Forms; -namespace DiscImageChef.Gui.Controls +namespace Aaru.Gui.Controls { public class SvgImageView : ImageView { diff --git a/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs b/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs index d59cae740..4d22555a2 100644 --- a/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs +++ b/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs @@ -38,7 +38,7 @@ using System.Text; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Dialogs +namespace Aaru.Gui.Dialogs { public class dlgEncodings : Dialog { diff --git a/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs b/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs index 60cbd332e..6468a6e0b 100644 --- a/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs +++ b/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs @@ -33,13 +33,13 @@ using System; using System.Collections.ObjectModel; using System.Reflection; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Core; -using DiscImageChef.Partitions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Core; +using Aaru.Partitions; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Dialogs +namespace Aaru.Gui.Dialogs { public class dlgPlugins : Dialog { diff --git a/Aaru.Gui/Dialogs/dlgSettings.xeto.cs b/Aaru.Gui/Dialogs/dlgSettings.xeto.cs index 81be9454b..c7fd80ce6 100644 --- a/Aaru.Gui/Dialogs/dlgSettings.xeto.cs +++ b/Aaru.Gui/Dialogs/dlgSettings.xeto.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Settings; +using Aaru.Settings; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Dialogs +namespace Aaru.Gui.Dialogs { public class dlgSettings : Dialog { @@ -73,7 +73,7 @@ namespace DiscImageChef.Gui.Dialogs chkSaveReportsGlobally.Text = "Do you want to save device reports in shared folder of your computer? (Y/N): "; - chkSaveReportsGlobally.Checked = Settings.Settings.Current.SaveReportsGlobally; + chkSaveReportsGlobally.Checked = Aaru.Settings.Settings.Current.SaveReportsGlobally; lblShareReports.Text = "Sharing a report with us will send it to our server, that's in the european union territory, where it\n" + @@ -83,7 +83,7 @@ namespace DiscImageChef.Gui.Dialogs "devices to other open-source projects. In any case, no information linking the report to you will be stored."; chkShareReports.Text = "Do you want to share your device reports with us? (Y/N): "; - chkShareReports.Checked = Settings.Settings.Current.ShareReports; + chkShareReports.Checked = Aaru.Settings.Settings.Current.ShareReports; #endregion Device reports #region Statistics @@ -95,44 +95,44 @@ namespace DiscImageChef.Gui.Dialogs chkSaveStats.Text = "Do you want to save stats about your DiscImageChef usage? (Y/N): "; - if(Settings.Settings.Current.Stats != null) + if(Aaru.Settings.Settings.Current.Stats != null) { chkSaveStats.Checked = true; stkStatistics.Visible = true; chkShareStats.Text = "Do you want to share your stats anonymously? (Y/N): "; - chkShareStats.Checked = Settings.Settings.Current.Stats.ShareStats; + chkShareStats.Checked = Aaru.Settings.Settings.Current.Stats.ShareStats; chkCommandStats.Text = "Do you want to gather statistics about command usage? (Y/N): "; - chkCommandStats.Checked = Settings.Settings.Current.Stats.CommandStats; + chkCommandStats.Checked = Aaru.Settings.Settings.Current.Stats.CommandStats; chkDeviceStats.Text = "Do you want to gather statistics about found devices? (Y/N): "; - chkDeviceStats.Checked = Settings.Settings.Current.Stats.DeviceStats; + chkDeviceStats.Checked = Aaru.Settings.Settings.Current.Stats.DeviceStats; chkFilesystemStats.Text = "Do you want to gather statistics about found filesystems? (Y/N): "; - chkFilesystemStats.Checked = Settings.Settings.Current.Stats.FilesystemStats; + chkFilesystemStats.Checked = Aaru.Settings.Settings.Current.Stats.FilesystemStats; chkFilterStats.Text = "Do you want to gather statistics about found file filters? (Y/N): "; - chkFilterStats.Checked = Settings.Settings.Current.Stats.FilterStats; + chkFilterStats.Checked = Aaru.Settings.Settings.Current.Stats.FilterStats; chkMediaImageStats.Text = "Do you want to gather statistics about found media image formats? (Y/N): "; - chkMediaImageStats.Checked = Settings.Settings.Current.Stats.MediaImageStats; + chkMediaImageStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaImageStats; chkMediaScanStats.Text = "Do you want to gather statistics about scanned media? (Y/N): "; - chkMediaScanStats.Checked = Settings.Settings.Current.Stats.MediaScanStats; + chkMediaScanStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaScanStats; chkPartitionStats.Text = "Do you want to gather statistics about found partitioning schemes? (Y/N): "; - chkPartitionStats.Checked = Settings.Settings.Current.Stats.PartitionStats; + chkPartitionStats.Checked = Aaru.Settings.Settings.Current.Stats.PartitionStats; chkMediaStats.Text = "Do you want to gather statistics about media types? (Y/N): "; - chkMediaStats.Checked = Settings.Settings.Current.Stats.MediaStats; + chkMediaStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaStats; chkVerifyStats.Text = "Do you want to gather statistics about media image verifications? (Y/N): "; - chkVerifyStats.Checked = Settings.Settings.Current.Stats.VerifyStats; + chkVerifyStats.Checked = Aaru.Settings.Settings.Current.Stats.VerifyStats; } else { @@ -146,11 +146,11 @@ namespace DiscImageChef.Gui.Dialogs protected void OnBtnSave(object sender, EventArgs e) { - Settings.Settings.Current.SaveReportsGlobally = chkSaveReportsGlobally.Checked == true; - Settings.Settings.Current.ShareReports = chkShareReports.Checked == true; + Aaru.Settings.Settings.Current.SaveReportsGlobally = chkSaveReportsGlobally.Checked == true; + Aaru.Settings.Settings.Current.ShareReports = chkShareReports.Checked == true; if(chkSaveStats.Checked == true) - Settings.Settings.Current.Stats = new StatsSettings + Aaru.Settings.Settings.Current.Stats = new StatsSettings { ShareStats = chkShareStats.Checked == true, CommandStats = chkCommandStats.Checked == true, @@ -163,10 +163,10 @@ namespace DiscImageChef.Gui.Dialogs VerifyStats = chkVerifyStats.Checked == true }; else - Settings.Settings.Current.Stats = null; + Aaru.Settings.Settings.Current.Stats = null; - Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel; - Settings.Settings.SaveSettings(); + Aaru.Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel; + Aaru.Settings.Settings.SaveSettings(); Close(); } diff --git a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs index 127990ed2..06c45f70d 100644 --- a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs +++ b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs @@ -32,12 +32,12 @@ using System; using System.Linq; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; +using Aaru.Database; +using Aaru.Database.Models; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Dialogs +namespace Aaru.Gui.Dialogs { public class dlgStatistics : Dialog { @@ -45,7 +45,7 @@ namespace DiscImageChef.Gui.Dialogs { XamlReader.Load(this); - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); if(ctx.Commands.Any()) { diff --git a/Aaru.Gui/Forms/frmConsole.xeto.cs b/Aaru.Gui/Forms/frmConsole.xeto.cs index 4e471fe2f..846dda575 100644 --- a/Aaru.Gui/Forms/frmConsole.xeto.cs +++ b/Aaru.Gui/Forms/frmConsole.xeto.cs @@ -35,15 +35,15 @@ using System.ComponentModel; using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interop; +using Aaru.Console; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmConsole : Form { diff --git a/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs b/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs index 9b5540f18..6a7705c19 100644 --- a/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs +++ b/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs @@ -33,26 +33,26 @@ using System; using System.Collections.ObjectModel; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.Bluray; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Decoders.Xbox; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.ATA; +using Aaru.Decoders.Bluray; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Decoders.Xbox; using Eto.Forms; using Eto.Serialization.Xaml; -using BCA = DiscImageChef.Decoders.Bluray.BCA; -using Cartridge = DiscImageChef.Decoders.Bluray.Cartridge; -using DDS = DiscImageChef.Decoders.DVD.DDS; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; -using Spare = DiscImageChef.Decoders.DVD.Spare; +using BCA = Aaru.Decoders.Bluray.BCA; +using Cartridge = Aaru.Decoders.Bluray.Cartridge; +using DDS = Aaru.Decoders.DVD.DDS; +using DMI = Aaru.Decoders.Xbox.DMI; +using Inquiry = Aaru.Decoders.SCSI.Inquiry; +using Spare = Aaru.Decoders.DVD.Spare; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { // TODO: Decode long sector components // TODO: Panel with string representation of contents diff --git a/Aaru.Gui/Forms/frmDump.xeto.cs b/Aaru.Gui/Forms/frmDump.xeto.cs index 25219fe6d..48a841db2 100644 --- a/Aaru.Gui/Forms/frmDump.xeto.cs +++ b/Aaru.Gui/Forms/frmDump.xeto.cs @@ -39,24 +39,24 @@ using System.Linq; using System.Text; using System.Threading; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Core; -using DiscImageChef.Core.Devices.Dumping; -using DiscImageChef.Core.Logging; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Devices; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.Core; +using Aaru.Core.Devices.Dumping; +using Aaru.Core.Logging; +using Aaru.Core.Media.Info; +using Aaru.Devices; using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; -using MediaType = DiscImageChef.CommonTypes.MediaType; +using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; +using MediaType = Aaru.CommonTypes.MediaType; // ReSharper disable UnusedMember.Local -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmDump : Form { diff --git a/Aaru.Gui/Forms/frmImageChecksum.xeto.cs b/Aaru.Gui/Forms/frmImageChecksum.xeto.cs index c09dc1d74..fb3766d08 100644 --- a/Aaru.Gui/Forms/frmImageChecksum.xeto.cs +++ b/Aaru.Gui/Forms/frmImageChecksum.xeto.cs @@ -32,15 +32,15 @@ using System; using System.Threading; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmImageChecksum : Form { diff --git a/Aaru.Gui/Forms/frmImageConvert.xeto.cs b/Aaru.Gui/Forms/frmImageConvert.xeto.cs index 119dceef0..d4f669e87 100644 --- a/Aaru.Gui/Forms/frmImageConvert.xeto.cs +++ b/Aaru.Gui/Forms/frmImageConvert.xeto.cs @@ -38,20 +38,20 @@ using System.IO; using System.Linq; using System.Threading; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -using ImageInfo = DiscImageChef.CommonTypes.Structs.ImageInfo; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmImageConvert : Form { diff --git a/Aaru.Gui/Forms/frmImageEntropy.xeto.cs b/Aaru.Gui/Forms/frmImageEntropy.xeto.cs index 1348baea0..e534749ac 100644 --- a/Aaru.Gui/Forms/frmImageEntropy.xeto.cs +++ b/Aaru.Gui/Forms/frmImageEntropy.xeto.cs @@ -32,13 +32,13 @@ using System; using System.Threading; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmImageEntropy : Form { diff --git a/Aaru.Gui/Forms/frmImageSidecar.xeto.cs b/Aaru.Gui/Forms/frmImageSidecar.xeto.cs index d72a48da1..77a208cf7 100644 --- a/Aaru.Gui/Forms/frmImageSidecar.xeto.cs +++ b/Aaru.Gui/Forms/frmImageSidecar.xeto.cs @@ -35,14 +35,14 @@ using System.IO; using System.Threading; using System.Xml.Serialization; using Claunia.Encoding; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmImageSidecar : Form { diff --git a/Aaru.Gui/Forms/frmImageVerify.xeto.cs b/Aaru.Gui/Forms/frmImageVerify.xeto.cs index c0e9c2c07..f0d6e1050 100644 --- a/Aaru.Gui/Forms/frmImageVerify.xeto.cs +++ b/Aaru.Gui/Forms/frmImageVerify.xeto.cs @@ -33,14 +33,14 @@ using System; using System.Collections.Generic; using System.Threading; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmImageVerify : Form { diff --git a/Aaru.Gui/Forms/frmMain.xeto.cs b/Aaru.Gui/Forms/frmMain.xeto.cs index 22e43957c..ce2687b24 100644 --- a/Aaru.Gui/Forms/frmMain.xeto.cs +++ b/Aaru.Gui/Forms/frmMain.xeto.cs @@ -35,27 +35,27 @@ using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Database; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; -using DiscImageChef.Gui.Dialogs; -using DiscImageChef.Gui.Panels; -using DiscImageChef.Settings; +using Aaru.Gui.Dialogs; +using Aaru.Gui.Panels; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Core; +using Aaru.Core.Media.Info; +using Aaru.Database; +using Aaru.Decoders.SCSI; +using Aaru.Devices; +using Aaru.Settings; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; -using ImageFormat = DiscImageChef.Core.ImageFormat; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; +using ImageFormat = Aaru.Core.ImageFormat; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmMain : Form { @@ -305,7 +305,7 @@ namespace DiscImageChef.Gui.Forms { base.OnLoad(e); - if(Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) + if(Aaru.Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) new dlgSettings(true).ShowModal(this); } @@ -425,7 +425,7 @@ namespace DiscImageChef.Gui.Forms DicConsole.WriteLine("Identifying filesystem on partition"); - Core.Filesystems.Identify(imageFormat, out idPlugins, partition); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partition); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); @@ -487,7 +487,7 @@ namespace DiscImageChef.Gui.Forms Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize }; - Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); @@ -696,7 +696,7 @@ namespace DiscImageChef.Gui.Forms protected void OnMenuStatistics(object sender, EventArgs e) { - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); if(!ctx.Commands.Any() && !ctx.Filesystems.Any() && diff --git a/Aaru.Gui/Forms/frmMediaScan.xeto.cs b/Aaru.Gui/Forms/frmMediaScan.xeto.cs index af08359ec..92a2f3e63 100644 --- a/Aaru.Gui/Forms/frmMediaScan.xeto.cs +++ b/Aaru.Gui/Forms/frmMediaScan.xeto.cs @@ -32,17 +32,17 @@ using System; using System.Threading; -using DiscImageChef.Core; -using DiscImageChef.Core.Devices.Scanning; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Devices; -using DiscImageChef.Gui.Controls; +using Aaru.Gui.Controls; +using Aaru.Core; +using Aaru.Core.Devices.Scanning; +using Aaru.Core.Media.Info; +using Aaru.Devices; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; -using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; +using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { public class frmMediaScan : Form { diff --git a/Aaru.Gui/Forms/frmPrintHex.xeto.cs b/Aaru.Gui/Forms/frmPrintHex.xeto.cs index 54eac02e2..405522e13 100644 --- a/Aaru.Gui/Forms/frmPrintHex.xeto.cs +++ b/Aaru.Gui/Forms/frmPrintHex.xeto.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Forms +namespace Aaru.Gui.Forms { // TODO: Decode long sector components // TODO: Panel with string representation of contents diff --git a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs index b57e7c95e..9767c4a9e 100644 --- a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs +++ b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs @@ -32,14 +32,14 @@ using System; using System.IO; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; -using DiscImageChef.Gui.Tabs; +using Aaru.Gui.Tabs; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; using Eto.Forms; using Eto.Serialization.Xaml; -using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; +using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { public class pnlDeviceInfo : Panel { diff --git a/Aaru.Gui/Panels/pnlFilesystem.xeto.cs b/Aaru.Gui/Panels/pnlFilesystem.xeto.cs index 22c661981..225303b7d 100644 --- a/Aaru.Gui/Panels/pnlFilesystem.xeto.cs +++ b/Aaru.Gui/Panels/pnlFilesystem.xeto.cs @@ -34,7 +34,7 @@ using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { public class pnlFilesystem : Panel { diff --git a/Aaru.Gui/Panels/pnlImageInfo.xeto.cs b/Aaru.Gui/Panels/pnlImageInfo.xeto.cs index eba4aca8a..b7db5b7a1 100644 --- a/Aaru.Gui/Panels/pnlImageInfo.xeto.cs +++ b/Aaru.Gui/Panels/pnlImageInfo.xeto.cs @@ -34,25 +34,25 @@ using System; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.Xbox; -using DiscImageChef.Gui.Controls; -using DiscImageChef.Gui.Forms; -using DiscImageChef.Gui.Tabs; +using Aaru.Gui.Controls; +using Aaru.Gui.Forms; +using Aaru.Gui.Tabs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.Xbox; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; using Schemas; -using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Inquiry = Aaru.Decoders.SCSI.Inquiry; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { public class pnlImageInfo : Panel { diff --git a/Aaru.Gui/Panels/pnlListFiles.xeto.cs b/Aaru.Gui/Panels/pnlListFiles.xeto.cs index ebbcf2485..7692b1113 100644 --- a/Aaru.Gui/Panels/pnlListFiles.xeto.cs +++ b/Aaru.Gui/Panels/pnlListFiles.xeto.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Core; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Structs; +using Aaru.Core; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { // TODO: Resize columns // TODO: File icons? diff --git a/Aaru.Gui/Panels/pnlPartition.xeto.cs b/Aaru.Gui/Panels/pnlPartition.xeto.cs index e61cc6542..983a62762 100644 --- a/Aaru.Gui/Panels/pnlPartition.xeto.cs +++ b/Aaru.Gui/Panels/pnlPartition.xeto.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; +using Aaru.CommonTypes; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { public class pnlPartition : Panel { diff --git a/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs b/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs index 36a8b45dc..237f24f46 100644 --- a/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs +++ b/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs @@ -33,17 +33,17 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Gui.Controls; -using DiscImageChef.Gui.Forms; -using DiscImageChef.Gui.Tabs; +using Aaru.Gui.Controls; +using Aaru.Gui.Forms; +using Aaru.Gui.Tabs; +using Aaru.CommonTypes; +using Aaru.Core.Media.Info; +using Aaru.Decoders.SCSI.SSC; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Panels +namespace Aaru.Gui.Panels { public class pnlScsiInfo : Panel { diff --git a/Aaru.Gui/ResourceHandler.cs b/Aaru.Gui/ResourceHandler.cs index deb34ce16..c9c151ed0 100644 --- a/Aaru.Gui/ResourceHandler.cs +++ b/Aaru.Gui/ResourceHandler.cs @@ -33,7 +33,7 @@ using System.IO; using System.Reflection; -namespace DiscImageChef.Gui +namespace Aaru.Gui { static class ResourceHandler { diff --git a/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs b/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs index b8c5d9590..4c42ea103 100644 --- a/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.Decoders.ATA; +using Aaru.Decoders.ATA; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabAtaInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs b/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs index 39701f77a..6dda0f274 100644 --- a/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.Decoders.Bluray; +using Aaru.Decoders.Bluray; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabBlurayInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs b/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs index d09a050fb..4e21c3d11 100644 --- a/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI.MMC; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI.MMC; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabCompactDiscInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs b/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs index a62babc2d..27af70137 100644 --- a/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs @@ -32,12 +32,12 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.Decoders.DVD; +using Aaru.CommonTypes; +using Aaru.Decoders.DVD; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabDvdInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs b/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs index 2424b4793..6249b2fc8 100644 --- a/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs @@ -32,12 +32,12 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.Decoders.DVD; +using Aaru.CommonTypes; +using Aaru.Decoders.DVD; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabDvdWritableInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs b/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs index bfde759e2..a0e03f139 100644 --- a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.Console; -using DiscImageChef.Decoders.PCMCIA; +using Aaru.Console; +using Aaru.Decoders.PCMCIA; using Eto.Forms; using Eto.Serialization.Xaml; -using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; +using Tuple = Aaru.Decoders.PCMCIA.Tuple; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabPcmciaInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs b/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs index af3c8a75d..b5ed7ce95 100644 --- a/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; using Eto.Forms; using Eto.Serialization.Xaml; -using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; +using Inquiry = Aaru.Decoders.SCSI.Inquiry; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabScsiInfo : TabPage { diff --git a/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs b/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs index a8f3a83ed..0011f9095 100644 --- a/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs @@ -30,11 +30,12 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes.Enums; +using Aaru.Decoders.MMC; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabSdMmcInfo : TabPage { @@ -54,25 +55,25 @@ namespace DiscImageChef.Gui.Tabs if(cid != null) { tabCid.Visible = true; - txtCid.Text = Decoders.MMC.Decoders.PrettifyCID(cid); + txtCid.Text = Aaru.Decoders.MMC.Decoders.PrettifyCID(cid); } if(csd != null) { tabCsd.Visible = true; - txtCid.Text = Decoders.MMC.Decoders.PrettifyCSD(csd); + txtCid.Text = Aaru.Decoders.MMC.Decoders.PrettifyCSD(csd); } if(ocr != null) { tabOcr.Visible = true; - txtCid.Text = Decoders.MMC.Decoders.PrettifyOCR(ocr); + txtCid.Text = Aaru.Decoders.MMC.Decoders.PrettifyOCR(ocr); } if(extendedCsd != null) { tabExtendedCsd.Visible = true; - txtCid.Text = Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd); + txtCid.Text = Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd); } } break; diff --git a/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs b/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs index 47c3fea97..3d98c4ac2 100644 --- a/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs +++ b/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs @@ -32,12 +32,12 @@ using System; using System.IO; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Decoders.Xbox; +using Aaru.Core.Media.Info; +using Aaru.Decoders.Xbox; using Eto.Forms; using Eto.Serialization.Xaml; -namespace DiscImageChef.Gui.Tabs +namespace Aaru.Gui.Tabs { public class tabXboxInfo : TabPage { diff --git a/Aaru.Helpers b/Aaru.Helpers index bce9d5b1d..c8e7a167b 160000 --- a/Aaru.Helpers +++ b/Aaru.Helpers @@ -1 +1 @@ -Subproject commit bce9d5b1dc8b2591262f6a5664fcf79f3ef75312 +Subproject commit c8e7a167b73c115586d790e377ddab015e7616cd diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj index d3bf47241..98298138c 100644 --- a/Aaru.Images/Aaru.Images.csproj +++ b/Aaru.Images/Aaru.Images.csproj @@ -6,7 +6,7 @@ 2.0 {74032CBC-339B-42F3-AF6F-E96C261F3E6A} Library - DiscImageChef.DiscImages + Aaru.DiscImages Aaru.Images $(Version) false diff --git a/Aaru.Images/Alcohol120/Alcohol120.cs b/Aaru.Images/Alcohol120/Alcohol120.cs index 50e90d081..4e9797c3c 100644 --- a/Aaru.Images/Alcohol120/Alcohol120.cs +++ b/Aaru.Images/Alcohol120/Alcohol120.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 : IWritableOpticalImage { diff --git a/Aaru.Images/Alcohol120/Constants.cs b/Aaru.Images/Alcohol120/Constants.cs index 3405d4aa6..c79bd51e3 100644 --- a/Aaru.Images/Alcohol120/Constants.cs +++ b/Aaru.Images/Alcohol120/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Enums.cs b/Aaru.Images/Alcohol120/Enums.cs index db6cb7ee6..4f00b02f9 100644 --- a/Aaru.Images/Alcohol120/Enums.cs +++ b/Aaru.Images/Alcohol120/Enums.cs @@ -32,7 +32,7 @@ using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Helpers.cs b/Aaru.Images/Alcohol120/Helpers.cs index 4cd728bbc..dc3d5f7c5 100644 --- a/Aaru.Images/Alcohol120/Helpers.cs +++ b/Aaru.Images/Alcohol120/Helpers.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Identify.cs b/Aaru.Images/Alcohol120/Identify.cs index 91d68754d..d91287d91 100644 --- a/Aaru.Images/Alcohol120/Identify.cs +++ b/Aaru.Images/Alcohol120/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs index 5ac9dbbd7..ac40b072f 100644 --- a/Aaru.Images/Alcohol120/Properties.cs +++ b/Aaru.Images/Alcohol120/Properties.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index e28ed5106..e0f9765ac 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -35,19 +35,19 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Helpers; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Helpers; +using DMI = Aaru.Decoders.Xbox.DMI; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Structs.cs b/Aaru.Images/Alcohol120/Structs.cs index 91c36b2e5..18618f513 100644 --- a/Aaru.Images/Alcohol120/Structs.cs +++ b/Aaru.Images/Alcohol120/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Verify.cs b/Aaru.Images/Alcohol120/Verify.cs index a55c8907b..2ccc7b995 100644 --- a/Aaru.Images/Alcohol120/Verify.cs +++ b/Aaru.Images/Alcohol120/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Alcohol120/Write.cs b/Aaru.Images/Alcohol120/Write.cs index 34e96f25c..c7a1218dd 100644 --- a/Aaru.Images/Alcohol120/Write.cs +++ b/Aaru.Images/Alcohol120/Write.cs @@ -35,15 +35,15 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders.CD; +using Aaru.Helpers; using Schemas; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Alcohol120 { diff --git a/Aaru.Images/Anex86/Anex86.cs b/Aaru.Images/Anex86/Anex86.cs index 46854967b..9c8d935fc 100644 --- a/Aaru.Images/Anex86/Anex86.cs +++ b/Aaru.Images/Anex86/Anex86.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 : IWritableImage { diff --git a/Aaru.Images/Anex86/Identify.cs b/Aaru.Images/Anex86/Identify.cs index fe2427cb9..390747a36 100644 --- a/Aaru.Images/Anex86/Identify.cs +++ b/Aaru.Images/Anex86/Identify.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 { diff --git a/Aaru.Images/Anex86/Properties.cs b/Aaru.Images/Anex86/Properties.cs index ee7a92b7d..d94a9dbe3 100644 --- a/Aaru.Images/Anex86/Properties.cs +++ b/Aaru.Images/Anex86/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 { diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs index fe3ee20e2..6f0cc2027 100644 --- a/Aaru.Images/Anex86/Read.cs +++ b/Aaru.Images/Anex86/Read.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 { diff --git a/Aaru.Images/Anex86/Structs.cs b/Aaru.Images/Anex86/Structs.cs index 88ec84426..b3718a0e6 100644 --- a/Aaru.Images/Anex86/Structs.cs +++ b/Aaru.Images/Anex86/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 { diff --git a/Aaru.Images/Anex86/Unsupported.cs b/Aaru.Images/Anex86/Unsupported.cs index 9d8a2c533..55dda1c05 100644 --- a/Aaru.Images/Anex86/Unsupported.cs +++ b/Aaru.Images/Anex86/Unsupported.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 : IWritableImage { diff --git a/Aaru.Images/Anex86/Write.cs b/Aaru.Images/Anex86/Write.cs index dfa525d49..96d0210a0 100644 --- a/Aaru.Images/Anex86/Write.cs +++ b/Aaru.Images/Anex86/Write.cs @@ -34,13 +34,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Anex86 { diff --git a/Aaru.Images/Apple2MG/Apple2MG.cs b/Aaru.Images/Apple2MG/Apple2MG.cs index 85b4db5b7..39cdf277d 100644 --- a/Aaru.Images/Apple2MG/Apple2MG.cs +++ b/Aaru.Images/Apple2MG/Apple2MG.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg : IWritableImage { diff --git a/Aaru.Images/Apple2MG/Constants.cs b/Aaru.Images/Apple2MG/Constants.cs index 59c62aacb..b957c1f20 100644 --- a/Aaru.Images/Apple2MG/Constants.cs +++ b/Aaru.Images/Apple2MG/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Enums.cs b/Aaru.Images/Apple2MG/Enums.cs index 4c23663dc..387ba7dc6 100644 --- a/Aaru.Images/Apple2MG/Enums.cs +++ b/Aaru.Images/Apple2MG/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Helpers.cs b/Aaru.Images/Apple2MG/Helpers.cs index 12ffb9479..4c0525013 100644 --- a/Aaru.Images/Apple2MG/Helpers.cs +++ b/Aaru.Images/Apple2MG/Helpers.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; +using Aaru.CommonTypes; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Identify.cs b/Aaru.Images/Apple2MG/Identify.cs index 45bada763..f4c2a6e17 100644 --- a/Aaru.Images/Apple2MG/Identify.cs +++ b/Aaru.Images/Apple2MG/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Properties.cs b/Aaru.Images/Apple2MG/Properties.cs index e4f690ad8..e1e5877b8 100644 --- a/Aaru.Images/Apple2MG/Properties.cs +++ b/Aaru.Images/Apple2MG/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs index 823470ee0..30f4b4055 100644 --- a/Aaru.Images/Apple2MG/Read.cs +++ b/Aaru.Images/Apple2MG/Read.cs @@ -33,14 +33,14 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Filters; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Filters; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Structs.cs b/Aaru.Images/Apple2MG/Structs.cs index f2e4ca77b..26e9b1f2f 100644 --- a/Aaru.Images/Apple2MG/Structs.cs +++ b/Aaru.Images/Apple2MG/Structs.cs @@ -33,7 +33,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Unsupported.cs b/Aaru.Images/Apple2MG/Unsupported.cs index 5bfa77d76..93981ac89 100644 --- a/Aaru.Images/Apple2MG/Unsupported.cs +++ b/Aaru.Images/Apple2MG/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/Apple2MG/Write.cs b/Aaru.Images/Apple2MG/Write.cs index 2e477d854..62def2745 100644 --- a/Aaru.Images/Apple2MG/Write.cs +++ b/Aaru.Images/Apple2MG/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apple2Mg { diff --git a/Aaru.Images/AppleDOS/AppleDOS.cs b/Aaru.Images/AppleDOS/AppleDOS.cs index 7e09c0f6a..a9210beb8 100644 --- a/Aaru.Images/AppleDOS/AppleDOS.cs +++ b/Aaru.Images/AppleDOS/AppleDOS.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos : IWritableImage { diff --git a/Aaru.Images/AppleDOS/Constants.cs b/Aaru.Images/AppleDOS/Constants.cs index 4628ce8f6..72b9e82cb 100644 --- a/Aaru.Images/AppleDOS/Constants.cs +++ b/Aaru.Images/AppleDOS/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleDOS/Identify.cs b/Aaru.Images/AppleDOS/Identify.cs index e1b2baa34..2685ea32b 100644 --- a/Aaru.Images/AppleDOS/Identify.cs +++ b/Aaru.Images/AppleDOS/Identify.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleDOS/Properties.cs b/Aaru.Images/AppleDOS/Properties.cs index b847b19b9..98991182b 100644 --- a/Aaru.Images/AppleDOS/Properties.cs +++ b/Aaru.Images/AppleDOS/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleDOS/Read.cs b/Aaru.Images/AppleDOS/Read.cs index 96ae1e5be..da37fc447 100644 --- a/Aaru.Images/AppleDOS/Read.cs +++ b/Aaru.Images/AppleDOS/Read.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleDOS/Unsupported.cs b/Aaru.Images/AppleDOS/Unsupported.cs index 829f1e7f5..40478d2db 100644 --- a/Aaru.Images/AppleDOS/Unsupported.cs +++ b/Aaru.Images/AppleDOS/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleDOS/Write.cs b/Aaru.Images/AppleDOS/Write.cs index 7a22a851e..76f26abd1 100644 --- a/Aaru.Images/AppleDOS/Write.cs +++ b/Aaru.Images/AppleDOS/Write.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleDos { diff --git a/Aaru.Images/AppleNIB/AppleNIB.cs b/Aaru.Images/AppleNIB/AppleNIB.cs index c010d0972..323ac0354 100644 --- a/Aaru.Images/AppleNIB/AppleNIB.cs +++ b/Aaru.Images/AppleNIB/AppleNIB.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Checksum sectors public partial class AppleNib : IMediaImage diff --git a/Aaru.Images/AppleNIB/Constants.cs b/Aaru.Images/AppleNIB/Constants.cs index 6b967bf09..9f4fc9ec4 100644 --- a/Aaru.Images/AppleNIB/Constants.cs +++ b/Aaru.Images/AppleNIB/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/AppleNIB/Helpers.cs b/Aaru.Images/AppleNIB/Helpers.cs index c4f7db367..e8e6f1f91 100644 --- a/Aaru.Images/AppleNIB/Helpers.cs +++ b/Aaru.Images/AppleNIB/Helpers.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; +using Aaru.CommonTypes; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/AppleNIB/Identify.cs b/Aaru.Images/AppleNIB/Identify.cs index d7f79eff8..81bd8183c 100644 --- a/Aaru.Images/AppleNIB/Identify.cs +++ b/Aaru.Images/AppleNIB/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Decoders.Floppy; +using Aaru.CommonTypes.Interfaces; +using Aaru.Decoders.Floppy; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/AppleNIB/Properties.cs b/Aaru.Images/AppleNIB/Properties.cs index b1b9bc7b8..0b7e4ab4a 100644 --- a/Aaru.Images/AppleNIB/Properties.cs +++ b/Aaru.Images/AppleNIB/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs index 82e182d5f..0c571df3a 100644 --- a/Aaru.Images/AppleNIB/Read.cs +++ b/Aaru.Images/AppleNIB/Read.cs @@ -34,14 +34,14 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Decoders.Floppy; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Decoders.Floppy; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/AppleNIB/Unsupported.cs b/Aaru.Images/AppleNIB/Unsupported.cs index 8dbcd1e3e..99618502f 100644 --- a/Aaru.Images/AppleNIB/Unsupported.cs +++ b/Aaru.Images/AppleNIB/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class AppleNib { diff --git a/Aaru.Images/Apridisk/Apridisk.cs b/Aaru.Images/Apridisk/Apridisk.cs index 10834a236..b7eb725b7 100644 --- a/Aaru.Images/Apridisk/Apridisk.cs +++ b/Aaru.Images/Apridisk/Apridisk.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Check writing public partial class Apridisk : IWritableImage diff --git a/Aaru.Images/Apridisk/Compression.cs b/Aaru.Images/Apridisk/Compression.cs index 0ea9e89b8..361efd0e8 100644 --- a/Aaru.Images/Apridisk/Compression.cs +++ b/Aaru.Images/Apridisk/Compression.cs @@ -33,7 +33,7 @@ using System; using System.IO; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Constants.cs b/Aaru.Images/Apridisk/Constants.cs index c97c91726..143ab19c3 100644 --- a/Aaru.Images/Apridisk/Constants.cs +++ b/Aaru.Images/Apridisk/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Enums.cs b/Aaru.Images/Apridisk/Enums.cs index f88cc6939..8b0df35fa 100644 --- a/Aaru.Images/Apridisk/Enums.cs +++ b/Aaru.Images/Apridisk/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Helpers.cs b/Aaru.Images/Apridisk/Helpers.cs index e32782b53..de0cd37ea 100644 --- a/Aaru.Images/Apridisk/Helpers.cs +++ b/Aaru.Images/Apridisk/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Identify.cs b/Aaru.Images/Apridisk/Identify.cs index 9351e0688..675928682 100644 --- a/Aaru.Images/Apridisk/Identify.cs +++ b/Aaru.Images/Apridisk/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Properties.cs b/Aaru.Images/Apridisk/Properties.cs index 16f76cbe4..de4d543d7 100644 --- a/Aaru.Images/Apridisk/Properties.cs +++ b/Aaru.Images/Apridisk/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs index 1ba5da481..77342b676 100644 --- a/Aaru.Images/Apridisk/Read.cs +++ b/Aaru.Images/Apridisk/Read.cs @@ -32,14 +32,14 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Structs.cs b/Aaru.Images/Apridisk/Structs.cs index b85007012..df68288dd 100644 --- a/Aaru.Images/Apridisk/Structs.cs +++ b/Aaru.Images/Apridisk/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Unsupported.cs b/Aaru.Images/Apridisk/Unsupported.cs index 11049971e..60e44e7be 100644 --- a/Aaru.Images/Apridisk/Unsupported.cs +++ b/Aaru.Images/Apridisk/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/Apridisk/Write.cs b/Aaru.Images/Apridisk/Write.cs index 0c0689c65..8bf8e6133 100644 --- a/Aaru.Images/Apridisk/Write.cs +++ b/Aaru.Images/Apridisk/Write.cs @@ -35,13 +35,13 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Apridisk { diff --git a/Aaru.Images/BLU/BLU.cs b/Aaru.Images/BLU/BLU.cs index 2e031429b..b01ad0d0f 100644 --- a/Aaru.Images/BLU/BLU.cs +++ b/Aaru.Images/BLU/BLU.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu : IWritableImage, IVerifiableSectorsImage { diff --git a/Aaru.Images/BLU/Constants.cs b/Aaru.Images/BLU/Constants.cs index 9c1de6f8c..745d9829b 100644 --- a/Aaru.Images/BLU/Constants.cs +++ b/Aaru.Images/BLU/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Identify.cs b/Aaru.Images/BLU/Identify.cs index f3fb8a9b8..795c02a6b 100644 --- a/Aaru.Images/BLU/Identify.cs +++ b/Aaru.Images/BLU/Identify.cs @@ -32,9 +32,9 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Properties.cs b/Aaru.Images/BLU/Properties.cs index 4a98304b7..3e7a2793c 100644 --- a/Aaru.Images/BLU/Properties.cs +++ b/Aaru.Images/BLU/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs index 05544bd94..ad3c98593 100644 --- a/Aaru.Images/BLU/Read.cs +++ b/Aaru.Images/BLU/Read.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Unsupported.cs b/Aaru.Images/BLU/Unsupported.cs index bd499f97b..3e0aee6a9 100644 --- a/Aaru.Images/BLU/Unsupported.cs +++ b/Aaru.Images/BLU/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Verify.cs b/Aaru.Images/BLU/Verify.cs index 2c0135531..d4e559798 100644 --- a/Aaru.Images/BLU/Verify.cs +++ b/Aaru.Images/BLU/Verify.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs index b309ab4dc..fb7ebe525 100644 --- a/Aaru.Images/BLU/Write.cs +++ b/Aaru.Images/BLU/Write.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders; using Schemas; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Blu { diff --git a/Aaru.Images/BlindWrite4/BlindWrite4.cs b/Aaru.Images/BlindWrite4/BlindWrite4.cs index e2474a79d..2cf102d29 100644 --- a/Aaru.Images/BlindWrite4/BlindWrite4.cs +++ b/Aaru.Images/BlindWrite4/BlindWrite4.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Too many unknowns, plus a completely unknown footer, to make this writable public partial class BlindWrite4 : IOpticalMediaImage diff --git a/Aaru.Images/BlindWrite4/Constants.cs b/Aaru.Images/BlindWrite4/Constants.cs index a6e4d86ac..9dc457a32 100644 --- a/Aaru.Images/BlindWrite4/Constants.cs +++ b/Aaru.Images/BlindWrite4/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Enums.cs b/Aaru.Images/BlindWrite4/Enums.cs index ff35f7ed8..321a3bd4a 100644 --- a/Aaru.Images/BlindWrite4/Enums.cs +++ b/Aaru.Images/BlindWrite4/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Identify.cs b/Aaru.Images/BlindWrite4/Identify.cs index 013a086a6..9b2859513 100644 --- a/Aaru.Images/BlindWrite4/Identify.cs +++ b/Aaru.Images/BlindWrite4/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Properties.cs b/Aaru.Images/BlindWrite4/Properties.cs index de9fa199f..c65d963e2 100644 --- a/Aaru.Images/BlindWrite4/Properties.cs +++ b/Aaru.Images/BlindWrite4/Properties.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs index 464b9b982..9388ca845 100644 --- a/Aaru.Images/BlindWrite4/Read.cs +++ b/Aaru.Images/BlindWrite4/Read.cs @@ -36,16 +36,16 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Structs.cs b/Aaru.Images/BlindWrite4/Structs.cs index 55c552c5c..ec5f018de 100644 --- a/Aaru.Images/BlindWrite4/Structs.cs +++ b/Aaru.Images/BlindWrite4/Structs.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite4/Verify.cs b/Aaru.Images/BlindWrite4/Verify.cs index 3395f879d..2dd5535d9 100644 --- a/Aaru.Images/BlindWrite4/Verify.cs +++ b/Aaru.Images/BlindWrite4/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite4 { diff --git a/Aaru.Images/BlindWrite5/BlindWrite5.cs b/Aaru.Images/BlindWrite5/BlindWrite5.cs index 18c137baa..7552dc7e4 100644 --- a/Aaru.Images/BlindWrite5/BlindWrite5.cs +++ b/Aaru.Images/BlindWrite5/BlindWrite5.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Too many unknowns to make this writable public partial class BlindWrite5 : IOpticalMediaImage diff --git a/Aaru.Images/BlindWrite5/Constants.cs b/Aaru.Images/BlindWrite5/Constants.cs index 9831e2f1f..46f4f02f3 100644 --- a/Aaru.Images/BlindWrite5/Constants.cs +++ b/Aaru.Images/BlindWrite5/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Enums.cs b/Aaru.Images/BlindWrite5/Enums.cs index e32d59551..3dbeac357 100644 --- a/Aaru.Images/BlindWrite5/Enums.cs +++ b/Aaru.Images/BlindWrite5/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Helpers.cs b/Aaru.Images/BlindWrite5/Helpers.cs index 4e144fb25..430682feb 100644 --- a/Aaru.Images/BlindWrite5/Helpers.cs +++ b/Aaru.Images/BlindWrite5/Helpers.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Decoders.SCSI.MMC; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.Decoders.SCSI.MMC; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Identify.cs b/Aaru.Images/BlindWrite5/Identify.cs index ffcf4a85d..cf10f3a7e 100644 --- a/Aaru.Images/BlindWrite5/Identify.cs +++ b/Aaru.Images/BlindWrite5/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Properties.cs b/Aaru.Images/BlindWrite5/Properties.cs index de094c8e2..93eec93b5 100644 --- a/Aaru.Images/BlindWrite5/Properties.cs +++ b/Aaru.Images/BlindWrite5/Properties.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs index 118cfeac4..04f85c0cc 100644 --- a/Aaru.Images/BlindWrite5/Read.cs +++ b/Aaru.Images/BlindWrite5/Read.cs @@ -36,22 +36,22 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI.Modes; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Helpers; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI.Modes; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Helpers; +using DMI = Aaru.Decoders.Xbox.DMI; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Structs.cs b/Aaru.Images/BlindWrite5/Structs.cs index d1c1915d8..13972d57f 100644 --- a/Aaru.Images/BlindWrite5/Structs.cs +++ b/Aaru.Images/BlindWrite5/Structs.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Decoders.SCSI.MMC; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Decoders.SCSI.MMC; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/BlindWrite5/Verify.cs b/Aaru.Images/BlindWrite5/Verify.cs index 712a29d7e..0bd4c32ee 100644 --- a/Aaru.Images/BlindWrite5/Verify.cs +++ b/Aaru.Images/BlindWrite5/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class BlindWrite5 { diff --git a/Aaru.Images/CDRDAO/CDRDAO.cs b/Aaru.Images/CDRDAO/CDRDAO.cs index 48231ccb0..e6e51a6ec 100644 --- a/Aaru.Images/CDRDAO/CDRDAO.cs +++ b/Aaru.Images/CDRDAO/CDRDAO.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Doesn't support compositing from several files // TODO: Doesn't support silences that are not in files diff --git a/Aaru.Images/CDRDAO/Constants.cs b/Aaru.Images/CDRDAO/Constants.cs index 575ec4695..8026f0356 100644 --- a/Aaru.Images/CDRDAO/Constants.cs +++ b/Aaru.Images/CDRDAO/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Helpers.cs b/Aaru.Images/CDRDAO/Helpers.cs index d810ca986..7c515999d 100644 --- a/Aaru.Images/CDRDAO/Helpers.cs +++ b/Aaru.Images/CDRDAO/Helpers.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs index dd0f74027..f4290a964 100644 --- a/Aaru.Images/CDRDAO/Identify.cs +++ b/Aaru.Images/CDRDAO/Identify.cs @@ -33,10 +33,10 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs index 4bf90647f..9f82ae326 100644 --- a/Aaru.Images/CDRDAO/Properties.cs +++ b/Aaru.Images/CDRDAO/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs index db84bdc1f..3239abe34 100644 --- a/Aaru.Images/CDRDAO/Read.cs +++ b/Aaru.Images/CDRDAO/Read.cs @@ -36,16 +36,16 @@ using System.IO; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Structs.cs b/Aaru.Images/CDRDAO/Structs.cs index c96ecb37a..de70025b6 100644 --- a/Aaru.Images/CDRDAO/Structs.cs +++ b/Aaru.Images/CDRDAO/Structs.cs @@ -32,10 +32,10 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Verify.cs b/Aaru.Images/CDRDAO/Verify.cs index 767d3f1a3..bc02e91de 100644 --- a/Aaru.Images/CDRDAO/Verify.cs +++ b/Aaru.Images/CDRDAO/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRDAO/Write.cs b/Aaru.Images/CDRDAO/Write.cs index bc11e1bc5..48441f2c1 100644 --- a/Aaru.Images/CDRDAO/Write.cs +++ b/Aaru.Images/CDRDAO/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cdrdao { diff --git a/Aaru.Images/CDRWin/CDRWin.cs b/Aaru.Images/CDRWin/CDRWin.cs index 5c0fb965e..6c0092e01 100644 --- a/Aaru.Images/CDRWin/CDRWin.cs +++ b/Aaru.Images/CDRWin/CDRWin.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Implement track flags public partial class CdrWin : IWritableOpticalImage, IVerifiableImage diff --git a/Aaru.Images/CDRWin/Constants.cs b/Aaru.Images/CDRWin/Constants.cs index 4a46a182c..9ad3df79e 100644 --- a/Aaru.Images/CDRWin/Constants.cs +++ b/Aaru.Images/CDRWin/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Helpers.cs b/Aaru.Images/CDRWin/Helpers.cs index 4f138a6e5..2028d2566 100644 --- a/Aaru.Images/CDRWin/Helpers.cs +++ b/Aaru.Images/CDRWin/Helpers.cs @@ -30,11 +30,11 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Identify.cs b/Aaru.Images/CDRWin/Identify.cs index 93f4fdfc0..684bc801b 100644 --- a/Aaru.Images/CDRWin/Identify.cs +++ b/Aaru.Images/CDRWin/Identify.cs @@ -33,10 +33,10 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs index 665eea96d..8cde8aca9 100644 --- a/Aaru.Images/CDRWin/Properties.cs +++ b/Aaru.Images/CDRWin/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 076967cda..d43b788d8 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -36,17 +36,17 @@ using System.IO; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; using Schemas; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Structs.cs b/Aaru.Images/CDRWin/Structs.cs index b8e25512c..0bec25358 100644 --- a/Aaru.Images/CDRWin/Structs.cs +++ b/Aaru.Images/CDRWin/Structs.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Verify.cs b/Aaru.Images/CDRWin/Verify.cs index 02bdf1035..19ba9ad1f 100644 --- a/Aaru.Images/CDRWin/Verify.cs +++ b/Aaru.Images/CDRWin/Verify.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs index eec7cac90..1d7e86337 100644 --- a/Aaru.Images/CDRWin/Write.cs +++ b/Aaru.Images/CDRWin/Write.cs @@ -35,12 +35,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CdrWin { diff --git a/Aaru.Images/CHD/CHD.cs b/Aaru.Images/CHD/CHD.cs index f8ed2a0aa..65bd74e7e 100644 --- a/Aaru.Images/CHD/CHD.cs +++ b/Aaru.Images/CHD/CHD.cs @@ -32,12 +32,12 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Implement PCMCIA support public partial class Chd : IOpticalMediaImage, IVerifiableImage diff --git a/Aaru.Images/CHD/Constants.cs b/Aaru.Images/CHD/Constants.cs index ac6613439..9b3e25fef 100644 --- a/Aaru.Images/CHD/Constants.cs +++ b/Aaru.Images/CHD/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Enums.cs b/Aaru.Images/CHD/Enums.cs index fa9c10b6f..da8926e42 100644 --- a/Aaru.Images/CHD/Enums.cs +++ b/Aaru.Images/CHD/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs index c27822754..02b83fa5f 100644 --- a/Aaru.Images/CHD/Helpers.cs +++ b/Aaru.Images/CHD/Helpers.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Identify.cs b/Aaru.Images/CHD/Identify.cs index dbb744084..6d4051c77 100644 --- a/Aaru.Images/CHD/Identify.cs +++ b/Aaru.Images/CHD/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Properties.cs b/Aaru.Images/CHD/Properties.cs index c1a92fd29..de3a3df3b 100644 --- a/Aaru.Images/CHD/Properties.cs +++ b/Aaru.Images/CHD/Properties.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs index 5eaa83dac..331e2ab6d 100644 --- a/Aaru.Images/CHD/Read.cs +++ b/Aaru.Images/CHD/Read.cs @@ -36,18 +36,18 @@ using System.IO; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Helpers; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Helpers; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { @@ -978,7 +978,7 @@ namespace DiscImageChef.DiscImages // "IDNT" case HARD_DISK_IDENT_METADATA: - Identify.IdentifyDevice? idnt = CommonTypes.Structs.Devices.ATA.Identify.Decode(meta); + Identify.IdentifyDevice? idnt = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(meta); if(idnt.HasValue) { diff --git a/Aaru.Images/CHD/Structs.cs b/Aaru.Images/CHD/Structs.cs index ec62fe9d3..fac5915d8 100644 --- a/Aaru.Images/CHD/Structs.cs +++ b/Aaru.Images/CHD/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CHD/Verify.cs b/Aaru.Images/CHD/Verify.cs index 11cde8cf7..0e39df4ca 100644 --- a/Aaru.Images/CHD/Verify.cs +++ b/Aaru.Images/CHD/Verify.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.Checksums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Chd { diff --git a/Aaru.Images/CPCDSK/CPCDSK.cs b/Aaru.Images/CPCDSK/CPCDSK.cs index d4db3d698..103b68e30 100644 --- a/Aaru.Images/CPCDSK/CPCDSK.cs +++ b/Aaru.Images/CPCDSK/CPCDSK.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk : IMediaImage { diff --git a/Aaru.Images/CPCDSK/Constants.cs b/Aaru.Images/CPCDSK/Constants.cs index 2659a472e..93de3854b 100644 --- a/Aaru.Images/CPCDSK/Constants.cs +++ b/Aaru.Images/CPCDSK/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Helpers.cs b/Aaru.Images/CPCDSK/Helpers.cs index 528377e1a..042d3bfc9 100644 --- a/Aaru.Images/CPCDSK/Helpers.cs +++ b/Aaru.Images/CPCDSK/Helpers.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Decoders.Floppy; +using Aaru.Decoders.Floppy; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs index baafbe1cb..92091c392 100644 --- a/Aaru.Images/CPCDSK/Identify.cs +++ b/Aaru.Images/CPCDSK/Identify.cs @@ -32,11 +32,11 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Properties.cs b/Aaru.Images/CPCDSK/Properties.cs index 1b162b7ef..2628930b2 100644 --- a/Aaru.Images/CPCDSK/Properties.cs +++ b/Aaru.Images/CPCDSK/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs index 84d554792..26e17c969 100644 --- a/Aaru.Images/CPCDSK/Read.cs +++ b/Aaru.Images/CPCDSK/Read.cs @@ -34,16 +34,16 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Decoders.Floppy; -using DiscImageChef.Helpers; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Decoders.Floppy; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Structs.cs b/Aaru.Images/CPCDSK/Structs.cs index fe8c329aa..d894c46a9 100644 --- a/Aaru.Images/CPCDSK/Structs.cs +++ b/Aaru.Images/CPCDSK/Structs.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.Decoders.Floppy; +using Aaru.Decoders.Floppy; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CPCDSK/Unsupported.cs b/Aaru.Images/CPCDSK/Unsupported.cs index a6f0ef4c0..c3eb7bec7 100644 --- a/Aaru.Images/CPCDSK/Unsupported.cs +++ b/Aaru.Images/CPCDSK/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Cpcdsk { diff --git a/Aaru.Images/CisCopy/CisCopy.cs b/Aaru.Images/CisCopy/CisCopy.cs index a43368544..476a06764 100644 --- a/Aaru.Images/CisCopy/CisCopy.cs +++ b/Aaru.Images/CisCopy/CisCopy.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { /* This is a very simple format created by a German application called CisCopy, aka CCOPY.EXE, with extension .DCF. * First byte indicates the floppy type, limited to standard formats. diff --git a/Aaru.Images/CisCopy/Enums.cs b/Aaru.Images/CisCopy/Enums.cs index 99aca68e9..6bef7801c 100644 --- a/Aaru.Images/CisCopy/Enums.cs +++ b/Aaru.Images/CisCopy/Enums.cs @@ -32,7 +32,7 @@ using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CisCopy/Identify.cs b/Aaru.Images/CisCopy/Identify.cs index 1ba92b4e6..dc817e4b5 100644 --- a/Aaru.Images/CisCopy/Identify.cs +++ b/Aaru.Images/CisCopy/Identify.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CisCopy/Properties.cs b/Aaru.Images/CisCopy/Properties.cs index 53dd58fbd..384ce60e2 100644 --- a/Aaru.Images/CisCopy/Properties.cs +++ b/Aaru.Images/CisCopy/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs index 5f2792fc0..e74c8ff7b 100644 --- a/Aaru.Images/CisCopy/Read.cs +++ b/Aaru.Images/CisCopy/Read.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CisCopy/Unsupported.cs b/Aaru.Images/CisCopy/Unsupported.cs index 2bece1634..3fce07569 100644 --- a/Aaru.Images/CisCopy/Unsupported.cs +++ b/Aaru.Images/CisCopy/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CisCopy/Write.cs b/Aaru.Images/CisCopy/Write.cs index e209956a6..8926166c7 100644 --- a/Aaru.Images/CisCopy/Write.cs +++ b/Aaru.Images/CisCopy/Write.cs @@ -33,12 +33,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CisCopy { diff --git a/Aaru.Images/CloneCD/CloneCD.cs b/Aaru.Images/CloneCD/CloneCD.cs index 747d494b8..deb5d9d94 100644 --- a/Aaru.Images/CloneCD/CloneCD.cs +++ b/Aaru.Images/CloneCD/CloneCD.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: CloneCD stores subchannel deinterleaved public partial class CloneCd : IWritableOpticalImage diff --git a/Aaru.Images/CloneCD/Constants.cs b/Aaru.Images/CloneCD/Constants.cs index c0edbe031..23184d56c 100644 --- a/Aaru.Images/CloneCD/Constants.cs +++ b/Aaru.Images/CloneCD/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Helpers.cs b/Aaru.Images/CloneCD/Helpers.cs index 8599b3444..b051537da 100644 --- a/Aaru.Images/CloneCD/Helpers.cs +++ b/Aaru.Images/CloneCD/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Identify.cs b/Aaru.Images/CloneCD/Identify.cs index 9f47cfb0c..f9050d8d2 100644 --- a/Aaru.Images/CloneCD/Identify.cs +++ b/Aaru.Images/CloneCD/Identify.cs @@ -33,10 +33,10 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs index e883a6219..daed00c6d 100644 --- a/Aaru.Images/CloneCD/Properties.cs +++ b/Aaru.Images/CloneCD/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index e05a005a3..316100006 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -35,16 +35,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Verify.cs b/Aaru.Images/CloneCD/Verify.cs index 8fb372a4e..79bdf5842 100644 --- a/Aaru.Images/CloneCD/Verify.cs +++ b/Aaru.Images/CloneCD/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs index 38a20c182..4a4c2c801 100644 --- a/Aaru.Images/CloneCD/Write.cs +++ b/Aaru.Images/CloneCD/Write.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Decoders.CD; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Decoders.CD; using Schemas; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CloneCd { diff --git a/Aaru.Images/CopyQM/Constants.cs b/Aaru.Images/CopyQM/Constants.cs index 318acdc2b..b70e13b7b 100644 --- a/Aaru.Images/CopyQM/Constants.cs +++ b/Aaru.Images/CopyQM/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyQM/CopyQM.cs b/Aaru.Images/CopyQM/CopyQM.cs index c7cffd40e..a4c1a1bed 100644 --- a/Aaru.Images/CopyQM/CopyQM.cs +++ b/Aaru.Images/CopyQM/CopyQM.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm : IMediaImage, IVerifiableImage { diff --git a/Aaru.Images/CopyQM/Identify.cs b/Aaru.Images/CopyQM/Identify.cs index 26653bd39..e1741cbda 100644 --- a/Aaru.Images/CopyQM/Identify.cs +++ b/Aaru.Images/CopyQM/Identify.cs @@ -32,9 +32,9 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyQM/Properties.cs b/Aaru.Images/CopyQM/Properties.cs index 4d5b907bf..5734915a5 100644 --- a/Aaru.Images/CopyQM/Properties.cs +++ b/Aaru.Images/CopyQM/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyQM/Read.cs b/Aaru.Images/CopyQM/Read.cs index 1e35a4046..9cf04dd1a 100644 --- a/Aaru.Images/CopyQM/Read.cs +++ b/Aaru.Images/CopyQM/Read.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyQM/Structs.cs b/Aaru.Images/CopyQM/Structs.cs index fde3e10bb..395e3c6b8 100644 --- a/Aaru.Images/CopyQM/Structs.cs +++ b/Aaru.Images/CopyQM/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyQM/Unsupported.cs b/Aaru.Images/CopyQM/Unsupported.cs index d2bdd54bf..5ff6eaef4 100644 --- a/Aaru.Images/CopyQM/Unsupported.cs +++ b/Aaru.Images/CopyQM/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class CopyQm { diff --git a/Aaru.Images/CopyTape/Constants.cs b/Aaru.Images/CopyTape/Constants.cs index 1ab5a28a9..599ad2ef4 100644 --- a/Aaru.Images/CopyTape/Constants.cs +++ b/Aaru.Images/CopyTape/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/CopyTape/CopyTape.cs b/Aaru.Images/CopyTape/CopyTape.cs index e8edebdf7..6241cc741 100644 --- a/Aaru.Images/CopyTape/CopyTape.cs +++ b/Aaru.Images/CopyTape/CopyTape.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape : IWritableTapeImage { diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs index 96cbbf664..2c8f8f621 100644 --- a/Aaru.Images/CopyTape/Identify.cs +++ b/Aaru.Images/CopyTape/Identify.cs @@ -33,9 +33,9 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/CopyTape/Properties.cs b/Aaru.Images/CopyTape/Properties.cs index 1cbb1ae0f..1549edab4 100644 --- a/Aaru.Images/CopyTape/Properties.cs +++ b/Aaru.Images/CopyTape/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs index 922000303..cf31826b2 100644 --- a/Aaru.Images/CopyTape/Read.cs +++ b/Aaru.Images/CopyTape/Read.cs @@ -35,12 +35,12 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/CopyTape/Unsupported.cs b/Aaru.Images/CopyTape/Unsupported.cs index f71184d99..7186ef113 100644 --- a/Aaru.Images/CopyTape/Unsupported.cs +++ b/Aaru.Images/CopyTape/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs index 1f9184e52..faa92e3e3 100644 --- a/Aaru.Images/CopyTape/Write.cs +++ b/Aaru.Images/CopyTape/Write.cs @@ -34,12 +34,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages.CopyTape +namespace Aaru.DiscImages.CopyTape { public partial class CopyTape { diff --git a/Aaru.Images/D88/Constants.cs b/Aaru.Images/D88/Constants.cs index d80d47852..48353dcbc 100644 --- a/Aaru.Images/D88/Constants.cs +++ b/Aaru.Images/D88/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/D88.cs b/Aaru.Images/D88/D88.cs index 273423dd2..50d0e7f84 100644 --- a/Aaru.Images/D88/D88.cs +++ b/Aaru.Images/D88/D88.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Information from Quasi88's FORMAT.TXT file // Japanese comments copied from there diff --git a/Aaru.Images/D88/Enums.cs b/Aaru.Images/D88/Enums.cs index bc063131a..ca36ec90b 100644 --- a/Aaru.Images/D88/Enums.cs +++ b/Aaru.Images/D88/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs index 52f16f9e7..b36f57471 100644 --- a/Aaru.Images/D88/Identify.cs +++ b/Aaru.Images/D88/Identify.cs @@ -33,11 +33,11 @@ using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/Properties.cs b/Aaru.Images/D88/Properties.cs index 257b9fb06..655bc71bb 100644 --- a/Aaru.Images/D88/Properties.cs +++ b/Aaru.Images/D88/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs index e3c33ce9f..e28c11d9e 100644 --- a/Aaru.Images/D88/Read.cs +++ b/Aaru.Images/D88/Read.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Decoders.Floppy; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Decoders.Floppy; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/Structs.cs b/Aaru.Images/D88/Structs.cs index 8cadc631b..3730a9a1f 100644 --- a/Aaru.Images/D88/Structs.cs +++ b/Aaru.Images/D88/Structs.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.Decoders.Floppy; +using Aaru.Decoders.Floppy; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/D88/Unsupported.cs b/Aaru.Images/D88/Unsupported.cs index 0e96fb8c3..07aa4debe 100644 --- a/Aaru.Images/D88/Unsupported.cs +++ b/Aaru.Images/D88/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class D88 { diff --git a/Aaru.Images/DART/Constants.cs b/Aaru.Images/DART/Constants.cs index 1621b6e88..b7448ed7e 100644 --- a/Aaru.Images/DART/Constants.cs +++ b/Aaru.Images/DART/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DART/DART.cs b/Aaru.Images/DART/DART.cs index 428b60b93..3c7805c9e 100644 --- a/Aaru.Images/DART/DART.cs +++ b/Aaru.Images/DART/DART.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart : IMediaImage { diff --git a/Aaru.Images/DART/Identify.cs b/Aaru.Images/DART/Identify.cs index d97f476ed..d63939dc9 100644 --- a/Aaru.Images/DART/Identify.cs +++ b/Aaru.Images/DART/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DART/Properties.cs b/Aaru.Images/DART/Properties.cs index ad6c4d994..cd46df42e 100644 --- a/Aaru.Images/DART/Properties.cs +++ b/Aaru.Images/DART/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs index fd55d4664..6407de264 100644 --- a/Aaru.Images/DART/Read.cs +++ b/Aaru.Images/DART/Read.cs @@ -35,16 +35,16 @@ using System.IO; using System.Text.RegularExpressions; using Claunia.Encoding; using Claunia.RsrcFork; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Compression; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Compression; +using Aaru.Console; +using Aaru.Helpers; using Version = Resources.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DART/Structs.cs b/Aaru.Images/DART/Structs.cs index eeb4c89c0..99d416bb2 100644 --- a/Aaru.Images/DART/Structs.cs +++ b/Aaru.Images/DART/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DART/Unsupported.cs b/Aaru.Images/DART/Unsupported.cs index cfdafc420..34e0ef82d 100644 --- a/Aaru.Images/DART/Unsupported.cs +++ b/Aaru.Images/DART/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dart { diff --git a/Aaru.Images/DIM/Constants.cs b/Aaru.Images/DIM/Constants.cs index 8a7bfb2d1..085bd983b 100644 --- a/Aaru.Images/DIM/Constants.cs +++ b/Aaru.Images/DIM/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DIM/DIM.cs b/Aaru.Images/DIM/DIM.cs index 2b50a9b5d..8ba185643 100644 --- a/Aaru.Images/DIM/DIM.cs +++ b/Aaru.Images/DIM/DIM.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: What are the real supported floppies for this image format? public partial class Dim : IMediaImage diff --git a/Aaru.Images/DIM/Enums.cs b/Aaru.Images/DIM/Enums.cs index 1a41d8a1a..e003569b0 100644 --- a/Aaru.Images/DIM/Enums.cs +++ b/Aaru.Images/DIM/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DIM/Identify.cs b/Aaru.Images/DIM/Identify.cs index 3b1636fd6..dfc5f4cf1 100644 --- a/Aaru.Images/DIM/Identify.cs +++ b/Aaru.Images/DIM/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DIM/Properties.cs b/Aaru.Images/DIM/Properties.cs index ab926cc65..5936040ae 100644 --- a/Aaru.Images/DIM/Properties.cs +++ b/Aaru.Images/DIM/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs index 2fb40c631..914ac9ebb 100644 --- a/Aaru.Images/DIM/Read.cs +++ b/Aaru.Images/DIM/Read.cs @@ -34,12 +34,12 @@ using System; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DIM/Unsupported.cs b/Aaru.Images/DIM/Unsupported.cs index 35dd2e6f0..4f863237f 100644 --- a/Aaru.Images/DIM/Unsupported.cs +++ b/Aaru.Images/DIM/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Dim { diff --git a/Aaru.Images/DiscFerret/Constants.cs b/Aaru.Images/DiscFerret/Constants.cs index 8456a5ec3..eb1543db4 100644 --- a/Aaru.Images/DiscFerret/Constants.cs +++ b/Aaru.Images/DiscFerret/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscFerret/DiscFerret.cs b/Aaru.Images/DiscFerret/DiscFerret.cs index 192922346..c7b0a462e 100644 --- a/Aaru.Images/DiscFerret/DiscFerret.cs +++ b/Aaru.Images/DiscFerret/DiscFerret.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret : IMediaImage, IVerifiableSectorsImage { diff --git a/Aaru.Images/DiscFerret/Identify.cs b/Aaru.Images/DiscFerret/Identify.cs index 454ef6e45..6c3fbd61b 100644 --- a/Aaru.Images/DiscFerret/Identify.cs +++ b/Aaru.Images/DiscFerret/Identify.cs @@ -32,9 +32,9 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscFerret/Properties.cs b/Aaru.Images/DiscFerret/Properties.cs index 1be93fcd0..cce6a06b2 100644 --- a/Aaru.Images/DiscFerret/Properties.cs +++ b/Aaru.Images/DiscFerret/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscFerret/Read.cs b/Aaru.Images/DiscFerret/Read.cs index 2c55fc1b2..3a20e6943 100644 --- a/Aaru.Images/DiscFerret/Read.cs +++ b/Aaru.Images/DiscFerret/Read.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscFerret/Structs.cs b/Aaru.Images/DiscFerret/Structs.cs index de0ccb7dc..5800fa21f 100644 --- a/Aaru.Images/DiscFerret/Structs.cs +++ b/Aaru.Images/DiscFerret/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscFerret/Verify.cs b/Aaru.Images/DiscFerret/Verify.cs index f7ec87d7b..deb1b98db 100644 --- a/Aaru.Images/DiscFerret/Verify.cs +++ b/Aaru.Images/DiscFerret/Verify.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscFerret { diff --git a/Aaru.Images/DiscImageChef/CdEcc.cs b/Aaru.Images/DiscImageChef/CdEcc.cs index 544405586..9200dff88 100644 --- a/Aaru.Images/DiscImageChef/CdEcc.cs +++ b/Aaru.Images/DiscImageChef/CdEcc.cs @@ -32,9 +32,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes.Enums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs b/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs index fb3439c68..af188536d 100644 --- a/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs +++ b/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Constants.cs b/Aaru.Images/DiscImageChef/Constants.cs index 75d5bad98..ec9829723 100644 --- a/Aaru.Images/DiscImageChef/Constants.cs +++ b/Aaru.Images/DiscImageChef/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/DiscImageChef.cs b/Aaru.Images/DiscImageChef/DiscImageChef.cs index 3a035d080..1bde03f2e 100644 --- a/Aaru.Images/DiscImageChef/DiscImageChef.cs +++ b/Aaru.Images/DiscImageChef/DiscImageChef.cs @@ -73,13 +73,13 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography; using CUETools.Codecs.FLAKE; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.Checksums; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; using SharpCompress.Compressors.LZMA; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef : IWritableOpticalImage, IVerifiableImage, IWritableTapeImage { diff --git a/Aaru.Images/DiscImageChef/Enums.cs b/Aaru.Images/DiscImageChef/Enums.cs index d0345cc82..cfeb5866b 100644 --- a/Aaru.Images/DiscImageChef/Enums.cs +++ b/Aaru.Images/DiscImageChef/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Helpers.cs b/Aaru.Images/DiscImageChef/Helpers.cs index f1a7e61ff..eada03bc5 100644 --- a/Aaru.Images/DiscImageChef/Helpers.cs +++ b/Aaru.Images/DiscImageChef/Helpers.cs @@ -31,14 +31,14 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Decoders.SecureDigital; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Decoders.SecureDigital; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { @@ -48,7 +48,7 @@ namespace DiscImageChef.DiscImages // Search for SecureDigital CID if(mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] sdCid)) { - CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(sdCid); + CID decoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCID(sdCid); if(string.IsNullOrWhiteSpace(imageInfo.DriveManufacturer)) imageInfo.DriveManufacturer = VendorString.Prettify(decoded.Manufacturer); @@ -67,10 +67,10 @@ namespace DiscImageChef.DiscImages // Search for MultiMediaCard CID if(mediaTags.TryGetValue(MediaTagType.MMC_CID, out byte[] mmcCid)) { - Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(mmcCid); + global::Aaru.Decoders.MMC.CID decoded = global::Aaru.Decoders.MMC.Decoders.DecodeCID(mmcCid); if(string.IsNullOrWhiteSpace(imageInfo.DriveManufacturer)) - imageInfo.DriveManufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer); + imageInfo.DriveManufacturer = global::Aaru.Decoders.MMC.VendorString.Prettify(decoded.Manufacturer); if(string.IsNullOrWhiteSpace(imageInfo.DriveModel)) imageInfo.DriveModel = decoded.ProductName; @@ -109,7 +109,7 @@ namespace DiscImageChef.DiscImages !mediaTags.TryGetValue(MediaTagType.ATAPI_IDENTIFY, out ataIdentify)) return; - Identify.IdentifyDevice? nullableIdentify = CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify); + Identify.IdentifyDevice? nullableIdentify = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify); if(!nullableIdentify.HasValue) return; diff --git a/Aaru.Images/DiscImageChef/Identify.cs b/Aaru.Images/DiscImageChef/Identify.cs index 8ec36317f..fac9197c5 100644 --- a/Aaru.Images/DiscImageChef/Identify.cs +++ b/Aaru.Images/DiscImageChef/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Properties.cs b/Aaru.Images/DiscImageChef/Properties.cs index 3720aef8d..c8ab7088f 100644 --- a/Aaru.Images/DiscImageChef/Properties.cs +++ b/Aaru.Images/DiscImageChef/Properties.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Read.cs b/Aaru.Images/DiscImageChef/Read.cs index 52a937780..f4e65e4ed 100644 --- a/Aaru.Images/DiscImageChef/Read.cs +++ b/Aaru.Images/DiscImageChef/Read.cs @@ -40,19 +40,19 @@ using System.Xml; using System.Xml.Serialization; using CUETools.Codecs; using CUETools.Codecs.FLAKE; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; using Schemas; using SharpCompress.Compressors.LZMA; -using Marshal = DiscImageChef.Helpers.Marshal; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using Marshal = Aaru.Helpers.Marshal; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Structs.cs b/Aaru.Images/DiscImageChef/Structs.cs index 1ff287bd0..ce59d7854 100644 --- a/Aaru.Images/DiscImageChef/Structs.cs +++ b/Aaru.Images/DiscImageChef/Structs.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Tape.cs b/Aaru.Images/DiscImageChef/Tape.cs index 17d32f30e..0ec364968 100644 --- a/Aaru.Images/DiscImageChef/Tape.cs +++ b/Aaru.Images/DiscImageChef/Tape.cs @@ -32,9 +32,9 @@ using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Verify.cs b/Aaru.Images/DiscImageChef/Verify.cs index 196caab00..5d7eff67d 100644 --- a/Aaru.Images/DiscImageChef/Verify.cs +++ b/Aaru.Images/DiscImageChef/Verify.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.Checksums; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscImageChef/Write.cs b/Aaru.Images/DiscImageChef/Write.cs index 326124325..be4b7afeb 100644 --- a/Aaru.Images/DiscImageChef/Write.cs +++ b/Aaru.Images/DiscImageChef/Write.cs @@ -41,19 +41,19 @@ using System.Xml; using System.Xml.Serialization; using CUETools.Codecs; using CUETools.Codecs.FLAKE; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders; using Schemas; using SharpCompress.Compressors.LZMA; -using Marshal = DiscImageChef.Helpers.Marshal; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using Marshal = Aaru.Helpers.Marshal; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscImageChef { diff --git a/Aaru.Images/DiscJuggler/DiscJuggler.cs b/Aaru.Images/DiscJuggler/DiscJuggler.cs index c1e95f72b..89f4df0f6 100644 --- a/Aaru.Images/DiscJuggler/DiscJuggler.cs +++ b/Aaru.Images/DiscJuggler/DiscJuggler.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Support separate data files? Never seen a DiscJuggler image using them anyways... // TODO: Too many unknowns to make this writable diff --git a/Aaru.Images/DiscJuggler/Helpers.cs b/Aaru.Images/DiscJuggler/Helpers.cs index 448cecbd7..e9b2167a6 100644 --- a/Aaru.Images/DiscJuggler/Helpers.cs +++ b/Aaru.Images/DiscJuggler/Helpers.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; +using Aaru.CommonTypes; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscJuggler { diff --git a/Aaru.Images/DiscJuggler/Identify.cs b/Aaru.Images/DiscJuggler/Identify.cs index 69e57f745..2671b6724 100644 --- a/Aaru.Images/DiscJuggler/Identify.cs +++ b/Aaru.Images/DiscJuggler/Identify.cs @@ -32,10 +32,10 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscJuggler { diff --git a/Aaru.Images/DiscJuggler/Properties.cs b/Aaru.Images/DiscJuggler/Properties.cs index e36ca623f..4fd10fdfa 100644 --- a/Aaru.Images/DiscJuggler/Properties.cs +++ b/Aaru.Images/DiscJuggler/Properties.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscJuggler { diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs index 31b90f85d..c0172e99a 100644 --- a/Aaru.Images/DiscJuggler/Read.cs +++ b/Aaru.Images/DiscJuggler/Read.cs @@ -35,16 +35,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscJuggler { diff --git a/Aaru.Images/DiscJuggler/Verify.cs b/Aaru.Images/DiscJuggler/Verify.cs index d6a46260b..6234f19dc 100644 --- a/Aaru.Images/DiscJuggler/Verify.cs +++ b/Aaru.Images/DiscJuggler/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiscJuggler { diff --git a/Aaru.Images/DiskCopy42/Constants.cs b/Aaru.Images/DiskCopy42/Constants.cs index 65b554217..77292a21f 100644 --- a/Aaru.Images/DiskCopy42/Constants.cs +++ b/Aaru.Images/DiskCopy42/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/DiskCopy42.cs b/Aaru.Images/DiskCopy42/DiskCopy42.cs index af229f1a9..dd77b2941 100644 --- a/Aaru.Images/DiskCopy42/DiskCopy42.cs +++ b/Aaru.Images/DiskCopy42/DiskCopy42.cs @@ -33,11 +33,11 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Checked using several images and strings inside Apple's DiskImages.framework [SuppressMessage("ReSharper", "InconsistentNaming")] diff --git a/Aaru.Images/DiskCopy42/Helpers.cs b/Aaru.Images/DiskCopy42/Helpers.cs index c9552e42a..01402ae75 100644 --- a/Aaru.Images/DiskCopy42/Helpers.cs +++ b/Aaru.Images/DiskCopy42/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs index 1d0babf72..386d08bcc 100644 --- a/Aaru.Images/DiskCopy42/Identify.cs +++ b/Aaru.Images/DiskCopy42/Identify.cs @@ -33,10 +33,10 @@ using System; using System.IO; using Claunia.Encoding; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Properties.cs b/Aaru.Images/DiskCopy42/Properties.cs index a5d9ac21e..4a718eb08 100644 --- a/Aaru.Images/DiskCopy42/Properties.cs +++ b/Aaru.Images/DiskCopy42/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs index 9d847872d..adb6ac8a4 100644 --- a/Aaru.Images/DiskCopy42/Read.cs +++ b/Aaru.Images/DiskCopy42/Read.cs @@ -35,14 +35,14 @@ using System.IO; using System.Text.RegularExpressions; using Claunia.Encoding; using Claunia.RsrcFork; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using Version = Resources.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Structs.cs b/Aaru.Images/DiskCopy42/Structs.cs index 5412ab7f5..58128affa 100644 --- a/Aaru.Images/DiskCopy42/Structs.cs +++ b/Aaru.Images/DiskCopy42/Structs.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Unsupported.cs b/Aaru.Images/DiskCopy42/Unsupported.cs index fe4f59850..4f0075b26 100644 --- a/Aaru.Images/DiskCopy42/Unsupported.cs +++ b/Aaru.Images/DiskCopy42/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Verify.cs b/Aaru.Images/DiskCopy42/Verify.cs index e52f3a25d..633c10136 100644 --- a/Aaru.Images/DiskCopy42/Verify.cs +++ b/Aaru.Images/DiskCopy42/Verify.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs index 13946fc3b..1655cede6 100644 --- a/Aaru.Images/DiskCopy42/Write.cs +++ b/Aaru.Images/DiskCopy42/Write.cs @@ -33,12 +33,12 @@ using System.Collections.Generic; using System.IO; using Claunia.Encoding; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DiskCopy42 { diff --git a/Aaru.Images/DriDiskCopy/Constants.cs b/Aaru.Images/DriDiskCopy/Constants.cs index d73a7012c..112fc3c8d 100644 --- a/Aaru.Images/DriDiskCopy/Constants.cs +++ b/Aaru.Images/DriDiskCopy/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs index 237737b55..09cc8752e 100644 --- a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs +++ b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy : IWritableImage { diff --git a/Aaru.Images/DriDiskCopy/Enums.cs b/Aaru.Images/DriDiskCopy/Enums.cs index 199250504..1b2d19466 100644 --- a/Aaru.Images/DriDiskCopy/Enums.cs +++ b/Aaru.Images/DriDiskCopy/Enums.cs @@ -32,7 +32,7 @@ using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Identify.cs b/Aaru.Images/DriDiskCopy/Identify.cs index dfeb2c202..216b2df55 100644 --- a/Aaru.Images/DriDiskCopy/Identify.cs +++ b/Aaru.Images/DriDiskCopy/Identify.cs @@ -32,11 +32,11 @@ using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Properties.cs b/Aaru.Images/DriDiskCopy/Properties.cs index 7c741ef58..6a3d283d0 100644 --- a/Aaru.Images/DriDiskCopy/Properties.cs +++ b/Aaru.Images/DriDiskCopy/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs index 42a67e076..f156ac4c9 100644 --- a/Aaru.Images/DriDiskCopy/Read.cs +++ b/Aaru.Images/DriDiskCopy/Read.cs @@ -33,13 +33,13 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Structs.cs b/Aaru.Images/DriDiskCopy/Structs.cs index 8d65a5415..9a5d9e345 100644 --- a/Aaru.Images/DriDiskCopy/Structs.cs +++ b/Aaru.Images/DriDiskCopy/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Unsupported.cs b/Aaru.Images/DriDiskCopy/Unsupported.cs index 61ff88314..8d216706f 100644 --- a/Aaru.Images/DriDiskCopy/Unsupported.cs +++ b/Aaru.Images/DriDiskCopy/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/DriDiskCopy/Write.cs b/Aaru.Images/DriDiskCopy/Write.cs index a404679cf..9ac95dc13 100644 --- a/Aaru.Images/DriDiskCopy/Write.cs +++ b/Aaru.Images/DriDiskCopy/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class DriDiskCopy { diff --git a/Aaru.Images/GDI/Constants.cs b/Aaru.Images/GDI/Constants.cs index 88556ec1a..fb667264e 100644 --- a/Aaru.Images/GDI/Constants.cs +++ b/Aaru.Images/GDI/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/GDI.cs b/Aaru.Images/GDI/GDI.cs index 97a5f4328..90663de32 100644 --- a/Aaru.Images/GDI/GDI.cs +++ b/Aaru.Images/GDI/GDI.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: There seems no be no clear definition on how to treat pregaps that are not included in the file, so this is just appending it to start of track // TODO: This format doesn't support to specify pregaps that are included in the file (like Redump ones) diff --git a/Aaru.Images/GDI/Identify.cs b/Aaru.Images/GDI/Identify.cs index adce72747..2b4fa4bc3 100644 --- a/Aaru.Images/GDI/Identify.cs +++ b/Aaru.Images/GDI/Identify.cs @@ -33,10 +33,10 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/Properties.cs b/Aaru.Images/GDI/Properties.cs index 47561a63a..861c16109 100644 --- a/Aaru.Images/GDI/Properties.cs +++ b/Aaru.Images/GDI/Properties.cs @@ -32,13 +32,13 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs index 97a40c209..a670143a5 100644 --- a/Aaru.Images/GDI/Read.cs +++ b/Aaru.Images/GDI/Read.cs @@ -35,14 +35,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/Structs.cs b/Aaru.Images/GDI/Structs.cs index 6455eafde..37f968f1a 100644 --- a/Aaru.Images/GDI/Structs.cs +++ b/Aaru.Images/GDI/Structs.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/Unsupported.cs b/Aaru.Images/GDI/Unsupported.cs index 9b8ac0188..086a095df 100644 --- a/Aaru.Images/GDI/Unsupported.cs +++ b/Aaru.Images/GDI/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/GDI/Verify.cs b/Aaru.Images/GDI/Verify.cs index 41fdc97f8..f6697d6ed 100644 --- a/Aaru.Images/GDI/Verify.cs +++ b/Aaru.Images/GDI/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Gdi { diff --git a/Aaru.Images/HDCopy/HDCopy.cs b/Aaru.Images/HDCopy/HDCopy.cs index f52099003..166fda4f5 100644 --- a/Aaru.Images/HDCopy/HDCopy.cs +++ b/Aaru.Images/HDCopy/HDCopy.cs @@ -64,11 +64,11 @@ */ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy : IMediaImage { diff --git a/Aaru.Images/HDCopy/Helpers.cs b/Aaru.Images/HDCopy/Helpers.cs index 77602020b..57478f9e0 100644 --- a/Aaru.Images/HDCopy/Helpers.cs +++ b/Aaru.Images/HDCopy/Helpers.cs @@ -34,7 +34,7 @@ using System; using System.IO; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/HDCopy/Identify.cs b/Aaru.Images/HDCopy/Identify.cs index 13a5cddbf..9f61a55e6 100644 --- a/Aaru.Images/HDCopy/Identify.cs +++ b/Aaru.Images/HDCopy/Identify.cs @@ -32,10 +32,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/HDCopy/Properties.cs b/Aaru.Images/HDCopy/Properties.cs index 5bc6bb841..ed0618003 100644 --- a/Aaru.Images/HDCopy/Properties.cs +++ b/Aaru.Images/HDCopy/Properties.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/HDCopy/Read.cs b/Aaru.Images/HDCopy/Read.cs index 75ed7e7ed..8bff311cb 100644 --- a/Aaru.Images/HDCopy/Read.cs +++ b/Aaru.Images/HDCopy/Read.cs @@ -33,13 +33,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/HDCopy/Structs.cs b/Aaru.Images/HDCopy/Structs.cs index ae349a3f6..545ba2e94 100644 --- a/Aaru.Images/HDCopy/Structs.cs +++ b/Aaru.Images/HDCopy/Structs.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/HDCopy/Unsupported.cs b/Aaru.Images/HDCopy/Unsupported.cs index e4619aa5d..da221ae74 100644 --- a/Aaru.Images/HDCopy/Unsupported.cs +++ b/Aaru.Images/HDCopy/Unsupported.cs @@ -31,10 +31,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class HdCopy { diff --git a/Aaru.Images/IMD/Constants.cs b/Aaru.Images/IMD/Constants.cs index 97ec16cd6..cffb28d54 100644 --- a/Aaru.Images/IMD/Constants.cs +++ b/Aaru.Images/IMD/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/IMD/Enums.cs b/Aaru.Images/IMD/Enums.cs index 87aebbac9..40b2428f1 100644 --- a/Aaru.Images/IMD/Enums.cs +++ b/Aaru.Images/IMD/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/IMD/IMD.cs b/Aaru.Images/IMD/IMD.cs index 94426b6b2..fb13f40a3 100644 --- a/Aaru.Images/IMD/IMD.cs +++ b/Aaru.Images/IMD/IMD.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd : IMediaImage { diff --git a/Aaru.Images/IMD/Identify.cs b/Aaru.Images/IMD/Identify.cs index c34adbe1a..de7682840 100644 --- a/Aaru.Images/IMD/Identify.cs +++ b/Aaru.Images/IMD/Identify.cs @@ -33,9 +33,9 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/IMD/Properties.cs b/Aaru.Images/IMD/Properties.cs index 851487c65..09603796f 100644 --- a/Aaru.Images/IMD/Properties.cs +++ b/Aaru.Images/IMD/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs index 1060e59df..bd38648a3 100644 --- a/Aaru.Images/IMD/Read.cs +++ b/Aaru.Images/IMD/Read.cs @@ -33,13 +33,13 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/IMD/Unsupported.cs b/Aaru.Images/IMD/Unsupported.cs index 36f72d901..457a959a0 100644 --- a/Aaru.Images/IMD/Unsupported.cs +++ b/Aaru.Images/IMD/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Imd { diff --git a/Aaru.Images/KryoFlux/Constants.cs b/Aaru.Images/KryoFlux/Constants.cs index 8a7860a42..94e7b31ec 100644 --- a/Aaru.Images/KryoFlux/Constants.cs +++ b/Aaru.Images/KryoFlux/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/Enums.cs b/Aaru.Images/KryoFlux/Enums.cs index 298aba555..927a389b0 100644 --- a/Aaru.Images/KryoFlux/Enums.cs +++ b/Aaru.Images/KryoFlux/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/Identify.cs b/Aaru.Images/KryoFlux/Identify.cs index 6f4201d8e..1fc0429b6 100644 --- a/Aaru.Images/KryoFlux/Identify.cs +++ b/Aaru.Images/KryoFlux/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/KryoFlux.cs b/Aaru.Images/KryoFlux/KryoFlux.cs index 4d84d203f..50da12a57 100644 --- a/Aaru.Images/KryoFlux/KryoFlux.cs +++ b/Aaru.Images/KryoFlux/KryoFlux.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { [SuppressMessage("ReSharper", "InconsistentNaming")] public partial class KryoFlux : IMediaImage, IVerifiableSectorsImage diff --git a/Aaru.Images/KryoFlux/Properties.cs b/Aaru.Images/KryoFlux/Properties.cs index c13633801..aa1919ae6 100644 --- a/Aaru.Images/KryoFlux/Properties.cs +++ b/Aaru.Images/KryoFlux/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/Read.cs b/Aaru.Images/KryoFlux/Read.cs index becf89f43..81cc47469 100644 --- a/Aaru.Images/KryoFlux/Read.cs +++ b/Aaru.Images/KryoFlux/Read.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Filters; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Filters; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/Structs.cs b/Aaru.Images/KryoFlux/Structs.cs index 1e7e3dc26..984ad4fa3 100644 --- a/Aaru.Images/KryoFlux/Structs.cs +++ b/Aaru.Images/KryoFlux/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/KryoFlux/Verify.cs b/Aaru.Images/KryoFlux/Verify.cs index 7ae58452b..aa3997e8c 100644 --- a/Aaru.Images/KryoFlux/Verify.cs +++ b/Aaru.Images/KryoFlux/Verify.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class KryoFlux { diff --git a/Aaru.Images/MaxiDisk/Enums.cs b/Aaru.Images/MaxiDisk/Enums.cs index 999a175ac..27677a507 100644 --- a/Aaru.Images/MaxiDisk/Enums.cs +++ b/Aaru.Images/MaxiDisk/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/Identify.cs b/Aaru.Images/MaxiDisk/Identify.cs index e3b7b22e5..10789c396 100644 --- a/Aaru.Images/MaxiDisk/Identify.cs +++ b/Aaru.Images/MaxiDisk/Identify.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/MaxiDisk.cs b/Aaru.Images/MaxiDisk/MaxiDisk.cs index f2a297116..eca6530cb 100644 --- a/Aaru.Images/MaxiDisk/MaxiDisk.cs +++ b/Aaru.Images/MaxiDisk/MaxiDisk.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk : IWritableImage { diff --git a/Aaru.Images/MaxiDisk/Properties.cs b/Aaru.Images/MaxiDisk/Properties.cs index e2e04cba1..b74db4228 100644 --- a/Aaru.Images/MaxiDisk/Properties.cs +++ b/Aaru.Images/MaxiDisk/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/Read.cs b/Aaru.Images/MaxiDisk/Read.cs index 5377b48f2..4d1ff4353 100644 --- a/Aaru.Images/MaxiDisk/Read.cs +++ b/Aaru.Images/MaxiDisk/Read.cs @@ -32,12 +32,12 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/Structs.cs b/Aaru.Images/MaxiDisk/Structs.cs index 8eff0ee0f..ee2ec65a4 100644 --- a/Aaru.Images/MaxiDisk/Structs.cs +++ b/Aaru.Images/MaxiDisk/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/Unsupported.cs b/Aaru.Images/MaxiDisk/Unsupported.cs index 3bb471821..5635a16e4 100644 --- a/Aaru.Images/MaxiDisk/Unsupported.cs +++ b/Aaru.Images/MaxiDisk/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/MaxiDisk/Write.cs b/Aaru.Images/MaxiDisk/Write.cs index 82b7157d2..76bd9d109 100644 --- a/Aaru.Images/MaxiDisk/Write.cs +++ b/Aaru.Images/MaxiDisk/Write.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class MaxiDisk { diff --git a/Aaru.Images/NDIF/Constants.cs b/Aaru.Images/NDIF/Constants.cs index ec778d3df..1f707099e 100644 --- a/Aaru.Images/NDIF/Constants.cs +++ b/Aaru.Images/NDIF/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NDIF/Identify.cs b/Aaru.Images/NDIF/Identify.cs index 51a2ce05b..8f780148c 100644 --- a/Aaru.Images/NDIF/Identify.cs +++ b/Aaru.Images/NDIF/Identify.cs @@ -32,9 +32,9 @@ using System; using Claunia.RsrcFork; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NDIF/NDIF.cs b/Aaru.Images/NDIF/NDIF.cs index 5ea795767..004bb5d4f 100644 --- a/Aaru.Images/NDIF/NDIF.cs +++ b/Aaru.Images/NDIF/NDIF.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Detect OS X encrypted images // TODO: Check checksum diff --git a/Aaru.Images/NDIF/Properties.cs b/Aaru.Images/NDIF/Properties.cs index eec82d55f..bcf39f75d 100644 --- a/Aaru.Images/NDIF/Properties.cs +++ b/Aaru.Images/NDIF/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs index 3dfde0881..1811cb774 100644 --- a/Aaru.Images/NDIF/Read.cs +++ b/Aaru.Images/NDIF/Read.cs @@ -36,17 +36,17 @@ using System.IO; using System.Linq; using Claunia.Encoding; using Claunia.RsrcFork; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Compression; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Compression; +using Aaru.Console; +using Aaru.Helpers; using SharpCompress.Compressors.ADC; using Version = Resources.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NDIF/Structs.cs b/Aaru.Images/NDIF/Structs.cs index b202cc2a4..3d9e8ca27 100644 --- a/Aaru.Images/NDIF/Structs.cs +++ b/Aaru.Images/NDIF/Structs.cs @@ -33,7 +33,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NDIF/Unsupported.cs b/Aaru.Images/NDIF/Unsupported.cs index 2456f53b1..f4d3c66c4 100644 --- a/Aaru.Images/NDIF/Unsupported.cs +++ b/Aaru.Images/NDIF/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Ndif { diff --git a/Aaru.Images/NHDr0/Constants.cs b/Aaru.Images/NHDr0/Constants.cs index 2e7e6d417..62248052f 100644 --- a/Aaru.Images/NHDr0/Constants.cs +++ b/Aaru.Images/NHDr0/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs index a13cf8fb9..e06ec18ca 100644 --- a/Aaru.Images/NHDr0/Identify.cs +++ b/Aaru.Images/NHDr0/Identify.cs @@ -33,11 +33,11 @@ using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/NHDr0.cs b/Aaru.Images/NHDr0/NHDr0.cs index 3374ec6da..ebea76ca1 100644 --- a/Aaru.Images/NHDr0/NHDr0.cs +++ b/Aaru.Images/NHDr0/NHDr0.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Info from http://www.geocities.jp/t98next/nhdr0.txt public partial class Nhdr0 : IWritableImage diff --git a/Aaru.Images/NHDr0/Properties.cs b/Aaru.Images/NHDr0/Properties.cs index 5991cdda8..55ac88dd8 100644 --- a/Aaru.Images/NHDr0/Properties.cs +++ b/Aaru.Images/NHDr0/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/Read.cs b/Aaru.Images/NHDr0/Read.cs index 5ee0e48ca..762570c35 100644 --- a/Aaru.Images/NHDr0/Read.cs +++ b/Aaru.Images/NHDr0/Read.cs @@ -33,12 +33,12 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/Structs.cs b/Aaru.Images/NHDr0/Structs.cs index 19fdeca17..1dae26e31 100644 --- a/Aaru.Images/NHDr0/Structs.cs +++ b/Aaru.Images/NHDr0/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/Unsupported.cs b/Aaru.Images/NHDr0/Unsupported.cs index f30f80b5b..a38004b3f 100644 --- a/Aaru.Images/NHDr0/Unsupported.cs +++ b/Aaru.Images/NHDr0/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/NHDr0/Write.cs b/Aaru.Images/NHDr0/Write.cs index 3ab14ba7b..27ab6acc0 100644 --- a/Aaru.Images/NHDr0/Write.cs +++ b/Aaru.Images/NHDr0/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nhdr0 { diff --git a/Aaru.Images/Nero/Constants.cs b/Aaru.Images/Nero/Constants.cs index 715bbf599..12920fdf2 100644 --- a/Aaru.Images/Nero/Constants.cs +++ b/Aaru.Images/Nero/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Enums.cs b/Aaru.Images/Nero/Enums.cs index 5085c41d7..68785feb4 100644 --- a/Aaru.Images/Nero/Enums.cs +++ b/Aaru.Images/Nero/Enums.cs @@ -33,7 +33,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Helpers.cs b/Aaru.Images/Nero/Helpers.cs index 573894cd3..0645c8b7a 100644 --- a/Aaru.Images/Nero/Helpers.cs +++ b/Aaru.Images/Nero/Helpers.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs index 5062e86f1..07df4ae66 100644 --- a/Aaru.Images/Nero/Identify.cs +++ b/Aaru.Images/Nero/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Nero.cs b/Aaru.Images/Nero/Nero.cs index cb2b7d6da..28c967e45 100644 --- a/Aaru.Images/Nero/Nero.cs +++ b/Aaru.Images/Nero/Nero.cs @@ -33,15 +33,15 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; #pragma warning disable 414 #pragma warning disable 169 -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { [SuppressMessage("ReSharper", "NotAccessedField.Local")] [SuppressMessage("ReSharper", "CollectionNeverQueried.Local")] diff --git a/Aaru.Images/Nero/Properties.cs b/Aaru.Images/Nero/Properties.cs index 6051c8ec7..50b842677 100644 --- a/Aaru.Images/Nero/Properties.cs +++ b/Aaru.Images/Nero/Properties.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs index da96cde99..7eff28aeb 100644 --- a/Aaru.Images/Nero/Read.cs +++ b/Aaru.Images/Nero/Read.cs @@ -35,16 +35,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using Session = DiscImageChef.CommonTypes.Structs.Session; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Decoders.CD; +using Session = Aaru.CommonTypes.Structs.Session; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Structs.cs b/Aaru.Images/Nero/Structs.cs index 549342fd4..c9b687834 100644 --- a/Aaru.Images/Nero/Structs.cs +++ b/Aaru.Images/Nero/Structs.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Nero/Verify.cs b/Aaru.Images/Nero/Verify.cs index 2265147b5..a48a23180 100644 --- a/Aaru.Images/Nero/Verify.cs +++ b/Aaru.Images/Nero/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Nero { diff --git a/Aaru.Images/Parallels/Constants.cs b/Aaru.Images/Parallels/Constants.cs index b56637c2d..0c91f318e 100644 --- a/Aaru.Images/Parallels/Constants.cs +++ b/Aaru.Images/Parallels/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Identify.cs b/Aaru.Images/Parallels/Identify.cs index 3a77f695f..a889b3fe3 100644 --- a/Aaru.Images/Parallels/Identify.cs +++ b/Aaru.Images/Parallels/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Parallels.cs b/Aaru.Images/Parallels/Parallels.cs index 5098ca24d..e23300c36 100644 --- a/Aaru.Images/Parallels/Parallels.cs +++ b/Aaru.Images/Parallels/Parallels.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels : IWritableImage { diff --git a/Aaru.Images/Parallels/Properties.cs b/Aaru.Images/Parallels/Properties.cs index 1fa49e65e..93d63807e 100644 --- a/Aaru.Images/Parallels/Properties.cs +++ b/Aaru.Images/Parallels/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Read.cs b/Aaru.Images/Parallels/Read.cs index c281ad0d3..2a1b7d9e2 100644 --- a/Aaru.Images/Parallels/Read.cs +++ b/Aaru.Images/Parallels/Read.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Structs.cs b/Aaru.Images/Parallels/Structs.cs index 937cf287c..8b42db65c 100644 --- a/Aaru.Images/Parallels/Structs.cs +++ b/Aaru.Images/Parallels/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Unsupported.cs b/Aaru.Images/Parallels/Unsupported.cs index 345970631..fbfdec62f 100644 --- a/Aaru.Images/Parallels/Unsupported.cs +++ b/Aaru.Images/Parallels/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/Parallels/Write.cs b/Aaru.Images/Parallels/Write.cs index 1b4f0f0c0..5abdcaff5 100644 --- a/Aaru.Images/Parallels/Write.cs +++ b/Aaru.Images/Parallels/Write.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Parallels { diff --git a/Aaru.Images/PartClone/Constants.cs b/Aaru.Images/PartClone/Constants.cs index 3f12f39c1..6c4ea2ee1 100644 --- a/Aaru.Images/PartClone/Constants.cs +++ b/Aaru.Images/PartClone/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Helpers.cs b/Aaru.Images/PartClone/Helpers.cs index 6465dc0ed..eb342c593 100644 --- a/Aaru.Images/PartClone/Helpers.cs +++ b/Aaru.Images/PartClone/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Identify.cs b/Aaru.Images/PartClone/Identify.cs index 392b41fa6..1a3ef969a 100644 --- a/Aaru.Images/PartClone/Identify.cs +++ b/Aaru.Images/PartClone/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/PartClone.cs b/Aaru.Images/PartClone/PartClone.cs index f438ffd40..fdd446ef8 100644 --- a/Aaru.Images/PartClone/PartClone.cs +++ b/Aaru.Images/PartClone/PartClone.cs @@ -32,12 +32,12 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone : IMediaImage, IVerifiableImage { diff --git a/Aaru.Images/PartClone/Properties.cs b/Aaru.Images/PartClone/Properties.cs index 005ba4919..04041463b 100644 --- a/Aaru.Images/PartClone/Properties.cs +++ b/Aaru.Images/PartClone/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Read.cs b/Aaru.Images/PartClone/Read.cs index 22e05bbd0..8279562ef 100644 --- a/Aaru.Images/PartClone/Read.cs +++ b/Aaru.Images/PartClone/Read.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Structs.cs b/Aaru.Images/PartClone/Structs.cs index 9312b3edf..ce7edcb33 100644 --- a/Aaru.Images/PartClone/Structs.cs +++ b/Aaru.Images/PartClone/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Unsupported.cs b/Aaru.Images/PartClone/Unsupported.cs index edda52971..f55209ed8 100644 --- a/Aaru.Images/PartClone/Unsupported.cs +++ b/Aaru.Images/PartClone/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/PartClone/Verify.cs b/Aaru.Images/PartClone/Verify.cs index be9ea2479..99fb4659b 100644 --- a/Aaru.Images/PartClone/Verify.cs +++ b/Aaru.Images/PartClone/Verify.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class PartClone { diff --git a/Aaru.Images/Partimage/Constants.cs b/Aaru.Images/Partimage/Constants.cs index 53cf707f6..9f1aaa87b 100644 --- a/Aaru.Images/Partimage/Constants.cs +++ b/Aaru.Images/Partimage/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Enums.cs b/Aaru.Images/Partimage/Enums.cs index 5bacae6b7..dfb4ee325 100644 --- a/Aaru.Images/Partimage/Enums.cs +++ b/Aaru.Images/Partimage/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Helpers.cs b/Aaru.Images/Partimage/Helpers.cs index 9da93c9c5..a45aca191 100644 --- a/Aaru.Images/Partimage/Helpers.cs +++ b/Aaru.Images/Partimage/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Identify.cs b/Aaru.Images/Partimage/Identify.cs index d6c23ccd8..76eb0f92c 100644 --- a/Aaru.Images/Partimage/Identify.cs +++ b/Aaru.Images/Partimage/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Partimage.cs b/Aaru.Images/Partimage/Partimage.cs index 5a10dd377..9185a1d64 100644 --- a/Aaru.Images/Partimage/Partimage.cs +++ b/Aaru.Images/Partimage/Partimage.cs @@ -32,14 +32,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; #pragma warning disable 649 -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage : IMediaImage, IVerifiableImage { diff --git a/Aaru.Images/Partimage/Properties.cs b/Aaru.Images/Partimage/Properties.cs index ae3451dda..a10897952 100644 --- a/Aaru.Images/Partimage/Properties.cs +++ b/Aaru.Images/Partimage/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Read.cs b/Aaru.Images/Partimage/Read.cs index 7b1ee1ea8..786efc0a0 100644 --- a/Aaru.Images/Partimage/Read.cs +++ b/Aaru.Images/Partimage/Read.cs @@ -33,15 +33,15 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Extents; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Extents; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Structs.cs b/Aaru.Images/Partimage/Structs.cs index 2a8a61dc1..456cec2f3 100644 --- a/Aaru.Images/Partimage/Structs.cs +++ b/Aaru.Images/Partimage/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Unsupported.cs b/Aaru.Images/Partimage/Unsupported.cs index 23eef9956..08b9826b1 100644 --- a/Aaru.Images/Partimage/Unsupported.cs +++ b/Aaru.Images/Partimage/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/Partimage/Verify.cs b/Aaru.Images/Partimage/Verify.cs index a25fabb26..ac96e72b5 100644 --- a/Aaru.Images/Partimage/Verify.cs +++ b/Aaru.Images/Partimage/Verify.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Partimage { diff --git a/Aaru.Images/QCOW/Constants.cs b/Aaru.Images/QCOW/Constants.cs index 37ba00d18..ab36cda21 100644 --- a/Aaru.Images/QCOW/Constants.cs +++ b/Aaru.Images/QCOW/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/Identify.cs b/Aaru.Images/QCOW/Identify.cs index 4019745b9..747149fb0 100644 --- a/Aaru.Images/QCOW/Identify.cs +++ b/Aaru.Images/QCOW/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/Properties.cs b/Aaru.Images/QCOW/Properties.cs index 9e9115ebe..228abaec7 100644 --- a/Aaru.Images/QCOW/Properties.cs +++ b/Aaru.Images/QCOW/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/QCOW.cs b/Aaru.Images/QCOW/QCOW.cs index 3b36e74f7..b00e0ef9d 100644 --- a/Aaru.Images/QCOW/QCOW.cs +++ b/Aaru.Images/QCOW/QCOW.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow : IWritableImage { diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs index e08fb0ee9..969105ed1 100644 --- a/Aaru.Images/QCOW/Read.cs +++ b/Aaru.Images/QCOW/Read.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/Structs.cs b/Aaru.Images/QCOW/Structs.cs index 0f9414927..37ef17e0e 100644 --- a/Aaru.Images/QCOW/Structs.cs +++ b/Aaru.Images/QCOW/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/Unsupported.cs b/Aaru.Images/QCOW/Unsupported.cs index 05cacbfeb..b6a2d2851 100644 --- a/Aaru.Images/QCOW/Unsupported.cs +++ b/Aaru.Images/QCOW/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs index 896bf6f21..8e5c06316 100644 --- a/Aaru.Images/QCOW/Write.cs +++ b/Aaru.Images/QCOW/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow { diff --git a/Aaru.Images/QCOW2/Constants.cs b/Aaru.Images/QCOW2/Constants.cs index 40021c3d5..6458841e6 100644 --- a/Aaru.Images/QCOW2/Constants.cs +++ b/Aaru.Images/QCOW2/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/Identify.cs b/Aaru.Images/QCOW2/Identify.cs index 0b29adc90..5a49c10ca 100644 --- a/Aaru.Images/QCOW2/Identify.cs +++ b/Aaru.Images/QCOW2/Identify.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/Properties.cs b/Aaru.Images/QCOW2/Properties.cs index fafafd15a..15e893a8b 100644 --- a/Aaru.Images/QCOW2/Properties.cs +++ b/Aaru.Images/QCOW2/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/QCOW2.cs b/Aaru.Images/QCOW2/QCOW2.cs index 0eca87a07..a15b4cfd0 100644 --- a/Aaru.Images/QCOW2/QCOW2.cs +++ b/Aaru.Images/QCOW2/QCOW2.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 : IWritableImage { diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs index abc221e91..c3c5e8380 100644 --- a/Aaru.Images/QCOW2/Read.cs +++ b/Aaru.Images/QCOW2/Read.cs @@ -34,16 +34,16 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/Structs.cs b/Aaru.Images/QCOW2/Structs.cs index 6f0f29f8c..1621b065b 100644 --- a/Aaru.Images/QCOW2/Structs.cs +++ b/Aaru.Images/QCOW2/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/Unsupported.cs b/Aaru.Images/QCOW2/Unsupported.cs index 5fd3840f7..25f5c9f4d 100644 --- a/Aaru.Images/QCOW2/Unsupported.cs +++ b/Aaru.Images/QCOW2/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs index 4296c8f3e..4a6c3a740 100644 --- a/Aaru.Images/QCOW2/Write.cs +++ b/Aaru.Images/QCOW2/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qcow2 { diff --git a/Aaru.Images/QED/Constants.cs b/Aaru.Images/QED/Constants.cs index fb08fb975..11fb9c47a 100644 --- a/Aaru.Images/QED/Constants.cs +++ b/Aaru.Images/QED/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Helpers.cs b/Aaru.Images/QED/Helpers.cs index a684636e2..aca77a5c3 100644 --- a/Aaru.Images/QED/Helpers.cs +++ b/Aaru.Images/QED/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Identify.cs b/Aaru.Images/QED/Identify.cs index c4550425a..fa27f0e09 100644 --- a/Aaru.Images/QED/Identify.cs +++ b/Aaru.Images/QED/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Properties.cs b/Aaru.Images/QED/Properties.cs index b159f0bf6..6efff7a7d 100644 --- a/Aaru.Images/QED/Properties.cs +++ b/Aaru.Images/QED/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/QED.cs b/Aaru.Images/QED/QED.cs index 5a5fbe2b3..d9379bf34 100644 --- a/Aaru.Images/QED/QED.cs +++ b/Aaru.Images/QED/QED.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed : IWritableImage { diff --git a/Aaru.Images/QED/Read.cs b/Aaru.Images/QED/Read.cs index bf3be1326..e47303ef4 100644 --- a/Aaru.Images/QED/Read.cs +++ b/Aaru.Images/QED/Read.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Structs.cs b/Aaru.Images/QED/Structs.cs index b3fa4c7cd..e1c249c04 100644 --- a/Aaru.Images/QED/Structs.cs +++ b/Aaru.Images/QED/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Unsupported.cs b/Aaru.Images/QED/Unsupported.cs index b5bfaf2b8..189d23756 100644 --- a/Aaru.Images/QED/Unsupported.cs +++ b/Aaru.Images/QED/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs index b2cddc812..fb7decf97 100644 --- a/Aaru.Images/QED/Write.cs +++ b/Aaru.Images/QED/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Qed { diff --git a/Aaru.Images/RayDIM/Constants.cs b/Aaru.Images/RayDIM/Constants.cs index 973db05a4..dd9c362a9 100644 --- a/Aaru.Images/RayDIM/Constants.cs +++ b/Aaru.Images/RayDIM/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Enums.cs b/Aaru.Images/RayDIM/Enums.cs index a6b4b67aa..7a637a148 100644 --- a/Aaru.Images/RayDIM/Enums.cs +++ b/Aaru.Images/RayDIM/Enums.cs @@ -32,7 +32,7 @@ using System.Diagnostics.CodeAnalysis; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Identify.cs b/Aaru.Images/RayDIM/Identify.cs index c8188da4f..a8bbbf0a2 100644 --- a/Aaru.Images/RayDIM/Identify.cs +++ b/Aaru.Images/RayDIM/Identify.cs @@ -32,11 +32,11 @@ using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Properties.cs b/Aaru.Images/RayDIM/Properties.cs index c09ccd4cb..ef05bab2a 100644 --- a/Aaru.Images/RayDIM/Properties.cs +++ b/Aaru.Images/RayDIM/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/RayDIM.cs b/Aaru.Images/RayDIM/RayDIM.cs index 7faa3c152..3fdf3a46b 100644 --- a/Aaru.Images/RayDIM/RayDIM.cs +++ b/Aaru.Images/RayDIM/RayDIM.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim : IWritableImage { diff --git a/Aaru.Images/RayDIM/Read.cs b/Aaru.Images/RayDIM/Read.cs index 437e0be22..9dd7934a6 100644 --- a/Aaru.Images/RayDIM/Read.cs +++ b/Aaru.Images/RayDIM/Read.cs @@ -33,12 +33,12 @@ using System; using System.IO; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Structs.cs b/Aaru.Images/RayDIM/Structs.cs index ad9b05401..508959c29 100644 --- a/Aaru.Images/RayDIM/Structs.cs +++ b/Aaru.Images/RayDIM/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Unsupported.cs b/Aaru.Images/RayDIM/Unsupported.cs index 66325671d..9d4fbc5a0 100644 --- a/Aaru.Images/RayDIM/Unsupported.cs +++ b/Aaru.Images/RayDIM/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs index 7b7bee8d6..339f93dc4 100644 --- a/Aaru.Images/RayDIM/Write.cs +++ b/Aaru.Images/RayDIM/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RayDim { diff --git a/Aaru.Images/Register.cs b/Aaru.Images/Register.cs index 6a0a88823..a79d0b645 100644 --- a/Aaru.Images/Register.cs +++ b/Aaru.Images/Register.cs @@ -40,9 +40,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public class Register : IPluginRegister { diff --git a/Aaru.Images/RsIde/Constants.cs b/Aaru.Images/RsIde/Constants.cs index 93e70371c..849e54835 100644 --- a/Aaru.Images/RsIde/Constants.cs +++ b/Aaru.Images/RsIde/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Enums.cs b/Aaru.Images/RsIde/Enums.cs index e5a90aef8..d7985f6fa 100644 --- a/Aaru.Images/RsIde/Enums.cs +++ b/Aaru.Images/RsIde/Enums.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Helpers.cs b/Aaru.Images/RsIde/Helpers.cs index fae1cc28a..76c6b6037 100644 --- a/Aaru.Images/RsIde/Helpers.cs +++ b/Aaru.Images/RsIde/Helpers.cs @@ -33,7 +33,7 @@ using System; using System.Text; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Identify.cs b/Aaru.Images/RsIde/Identify.cs index a298c6801..fa274b7f6 100644 --- a/Aaru.Images/RsIde/Identify.cs +++ b/Aaru.Images/RsIde/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Properties.cs b/Aaru.Images/RsIde/Properties.cs index d988c8cb5..11f8be32e 100644 --- a/Aaru.Images/RsIde/Properties.cs +++ b/Aaru.Images/RsIde/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Read.cs b/Aaru.Images/RsIde/Read.cs index ad7fd7407..3064765f4 100644 --- a/Aaru.Images/RsIde/Read.cs +++ b/Aaru.Images/RsIde/Read.cs @@ -33,14 +33,14 @@ using System; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { @@ -73,7 +73,7 @@ namespace DiscImageChef.DiscImages { identify = new byte[512]; Array.Copy(hdr.identify, 0, identify, 0, hdr.identify.Length); - Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identify); + Identify.IdentifyDevice? ataId = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(identify); if(ataId.HasValue) { diff --git a/Aaru.Images/RsIde/RsIde.cs b/Aaru.Images/RsIde/RsIde.cs index cb04c88cd..18e614c20 100644 --- a/Aaru.Images/RsIde/RsIde.cs +++ b/Aaru.Images/RsIde/RsIde.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde : IWritableImage { diff --git a/Aaru.Images/RsIde/Structs.cs b/Aaru.Images/RsIde/Structs.cs index 15517f761..487a24f0a 100644 --- a/Aaru.Images/RsIde/Structs.cs +++ b/Aaru.Images/RsIde/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Unsupported.cs b/Aaru.Images/RsIde/Unsupported.cs index 9dabb27d5..76aebff59 100644 --- a/Aaru.Images/RsIde/Unsupported.cs +++ b/Aaru.Images/RsIde/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { diff --git a/Aaru.Images/RsIde/Write.cs b/Aaru.Images/RsIde/Write.cs index 15fafe687..513335106 100644 --- a/Aaru.Images/RsIde/Write.cs +++ b/Aaru.Images/RsIde/Write.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.Helpers; using Schemas; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class RsIde { @@ -243,22 +243,22 @@ namespace DiscImageChef.DiscImages var ataId = new Identify.IdentifyDevice { GeneralConfiguration = - CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE | - CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed | - CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM | - CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.SoftSector, + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE | + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed | + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM | + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.SoftSector, Cylinders = (ushort)imageInfo.Cylinders, Heads = (ushort)imageInfo.Heads, SectorsPerTrack = (ushort)imageInfo.SectorsPerTrack, VendorWord47 = 0x80, - Capabilities = CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport | - CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY | - CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.LBASupport, + Capabilities = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport | + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY | + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.LBASupport, ExtendedIdentify = - CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid, + global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid, CurrentCylinders = (ushort)imageInfo.Cylinders, CurrentHeads = (ushort)imageInfo.Heads, CurrentSectorsPerTrack = (ushort)imageInfo.SectorsPerTrack, CurrentSectors = (uint)imageInfo.Sectors, LBASectors = (uint)imageInfo.Sectors, - DMASupported = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0, - DMAActive = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0 + DMASupported = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0, + DMAActive = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0 }; if(string.IsNullOrEmpty(imageInfo.DriveManufacturer)) diff --git a/Aaru.Images/SaveDskF/Constants.cs b/Aaru.Images/SaveDskF/Constants.cs index 8c6e9ec30..fdde3bdcc 100644 --- a/Aaru.Images/SaveDskF/Constants.cs +++ b/Aaru.Images/SaveDskF/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Identify.cs b/Aaru.Images/SaveDskF/Identify.cs index 2013d1b2a..ab0e7f3ff 100644 --- a/Aaru.Images/SaveDskF/Identify.cs +++ b/Aaru.Images/SaveDskF/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Properties.cs b/Aaru.Images/SaveDskF/Properties.cs index 8f9c703bf..c51711cc3 100644 --- a/Aaru.Images/SaveDskF/Properties.cs +++ b/Aaru.Images/SaveDskF/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Read.cs b/Aaru.Images/SaveDskF/Read.cs index a914f8a05..17ad66e59 100644 --- a/Aaru.Images/SaveDskF/Read.cs +++ b/Aaru.Images/SaveDskF/Read.cs @@ -33,14 +33,14 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/SaveDskF.cs b/Aaru.Images/SaveDskF/SaveDskF.cs index 8163fceb1..994b238a4 100644 --- a/Aaru.Images/SaveDskF/SaveDskF.cs +++ b/Aaru.Images/SaveDskF/SaveDskF.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF : IWritableImage, IVerifiableImage { diff --git a/Aaru.Images/SaveDskF/Structs.cs b/Aaru.Images/SaveDskF/Structs.cs index efeecf44c..cbf50e256 100644 --- a/Aaru.Images/SaveDskF/Structs.cs +++ b/Aaru.Images/SaveDskF/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Unsupported.cs b/Aaru.Images/SaveDskF/Unsupported.cs index cf60b6100..f35227ec1 100644 --- a/Aaru.Images/SaveDskF/Unsupported.cs +++ b/Aaru.Images/SaveDskF/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Verify.cs b/Aaru.Images/SaveDskF/Verify.cs index 730946216..46d71c8af 100644 --- a/Aaru.Images/SaveDskF/Verify.cs +++ b/Aaru.Images/SaveDskF/Verify.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SaveDskF/Write.cs b/Aaru.Images/SaveDskF/Write.cs index fa9a92cd8..11fe3bec6 100644 --- a/Aaru.Images/SaveDskF/Write.cs +++ b/Aaru.Images/SaveDskF/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SaveDskF { diff --git a/Aaru.Images/SuperCardPro/Constants.cs b/Aaru.Images/SuperCardPro/Constants.cs index 564a0a10e..92c8b50e8 100644 --- a/Aaru.Images/SuperCardPro/Constants.cs +++ b/Aaru.Images/SuperCardPro/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Enums.cs b/Aaru.Images/SuperCardPro/Enums.cs index 0574fe72c..47e905aed 100644 --- a/Aaru.Images/SuperCardPro/Enums.cs +++ b/Aaru.Images/SuperCardPro/Enums.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Helpers.cs b/Aaru.Images/SuperCardPro/Helpers.cs index bc850bf0d..eb6692525 100644 --- a/Aaru.Images/SuperCardPro/Helpers.cs +++ b/Aaru.Images/SuperCardPro/Helpers.cs @@ -34,7 +34,7 @@ using System; using System.IO; using System.Text; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Identify.cs b/Aaru.Images/SuperCardPro/Identify.cs index a57a5d3a9..634e49678 100644 --- a/Aaru.Images/SuperCardPro/Identify.cs +++ b/Aaru.Images/SuperCardPro/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Properties.cs b/Aaru.Images/SuperCardPro/Properties.cs index 72d9dfde2..2aec27c82 100644 --- a/Aaru.Images/SuperCardPro/Properties.cs +++ b/Aaru.Images/SuperCardPro/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Read.cs b/Aaru.Images/SuperCardPro/Read.cs index 9904a5ce8..9bbd6fbd2 100644 --- a/Aaru.Images/SuperCardPro/Read.cs +++ b/Aaru.Images/SuperCardPro/Read.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/Structs.cs b/Aaru.Images/SuperCardPro/Structs.cs index f27b8c3c5..908035c73 100644 --- a/Aaru.Images/SuperCardPro/Structs.cs +++ b/Aaru.Images/SuperCardPro/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/SuperCardPro/SuperCardPro.cs b/Aaru.Images/SuperCardPro/SuperCardPro.cs index 4f61e37c8..fb1cf767e 100644 --- a/Aaru.Images/SuperCardPro/SuperCardPro.cs +++ b/Aaru.Images/SuperCardPro/SuperCardPro.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro : IMediaImage, IVerifiableImage, IVerifiableSectorsImage { diff --git a/Aaru.Images/SuperCardPro/Verify.cs b/Aaru.Images/SuperCardPro/Verify.cs index 7600368ff..2671013b2 100644 --- a/Aaru.Images/SuperCardPro/Verify.cs +++ b/Aaru.Images/SuperCardPro/Verify.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class SuperCardPro { diff --git a/Aaru.Images/T98/Identify.cs b/Aaru.Images/T98/Identify.cs index 9dcbea812..07dc2b9a1 100644 --- a/Aaru.Images/T98/Identify.cs +++ b/Aaru.Images/T98/Identify.cs @@ -32,10 +32,10 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 { diff --git a/Aaru.Images/T98/Properties.cs b/Aaru.Images/T98/Properties.cs index 130c245d3..c446446cc 100644 --- a/Aaru.Images/T98/Properties.cs +++ b/Aaru.Images/T98/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 { diff --git a/Aaru.Images/T98/Read.cs b/Aaru.Images/T98/Read.cs index 4ae2f63e8..03167e90d 100644 --- a/Aaru.Images/T98/Read.cs +++ b/Aaru.Images/T98/Read.cs @@ -32,11 +32,11 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 { diff --git a/Aaru.Images/T98/T98.cs b/Aaru.Images/T98/T98.cs index 5f05bb035..7b0be3de0 100644 --- a/Aaru.Images/T98/T98.cs +++ b/Aaru.Images/T98/T98.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 : IWritableImage { diff --git a/Aaru.Images/T98/Unsupported.cs b/Aaru.Images/T98/Unsupported.cs index 8cfa15eee..b37e32471 100644 --- a/Aaru.Images/T98/Unsupported.cs +++ b/Aaru.Images/T98/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 { diff --git a/Aaru.Images/T98/Write.cs b/Aaru.Images/T98/Write.cs index 9d392ef27..62bc7e8d0 100644 --- a/Aaru.Images/T98/Write.cs +++ b/Aaru.Images/T98/Write.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class T98 { diff --git a/Aaru.Images/TeleDisk/Constants.cs b/Aaru.Images/TeleDisk/Constants.cs index b08b4c521..51977b048 100644 --- a/Aaru.Images/TeleDisk/Constants.cs +++ b/Aaru.Images/TeleDisk/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs index 3fd791267..5d970b3f9 100644 --- a/Aaru.Images/TeleDisk/Helpers.cs +++ b/Aaru.Images/TeleDisk/Helpers.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.Console; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Exceptions; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Identify.cs b/Aaru.Images/TeleDisk/Identify.cs index 1453c25e1..e9ae7b1a6 100644 --- a/Aaru.Images/TeleDisk/Identify.cs +++ b/Aaru.Images/TeleDisk/Identify.cs @@ -32,10 +32,10 @@ using System; using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Properties.cs b/Aaru.Images/TeleDisk/Properties.cs index 5f3e1e037..835b184d6 100644 --- a/Aaru.Images/TeleDisk/Properties.cs +++ b/Aaru.Images/TeleDisk/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Read.cs b/Aaru.Images/TeleDisk/Read.cs index 20396baca..22d1abbbf 100644 --- a/Aaru.Images/TeleDisk/Read.cs +++ b/Aaru.Images/TeleDisk/Read.cs @@ -33,13 +33,13 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Compression; -using DiscImageChef.Console; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Compression; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Structs.cs b/Aaru.Images/TeleDisk/Structs.cs index b9abe6034..1a5ea998b 100644 --- a/Aaru.Images/TeleDisk/Structs.cs +++ b/Aaru.Images/TeleDisk/Structs.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/TeleDisk.cs b/Aaru.Images/TeleDisk/TeleDisk.cs index 6c6af2f87..cd81a7efe 100644 --- a/Aaru.Images/TeleDisk/TeleDisk.cs +++ b/Aaru.Images/TeleDisk/TeleDisk.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Created following notes from Dave Dunfield // http://www.classiccmp.org/dunfield/img54306/td0notes.txt diff --git a/Aaru.Images/TeleDisk/Unsupported.cs b/Aaru.Images/TeleDisk/Unsupported.cs index 871f0a459..907685560 100644 --- a/Aaru.Images/TeleDisk/Unsupported.cs +++ b/Aaru.Images/TeleDisk/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/TeleDisk/Verify.cs b/Aaru.Images/TeleDisk/Verify.cs index 8ea6f1242..f63c0930c 100644 --- a/Aaru.Images/TeleDisk/Verify.cs +++ b/Aaru.Images/TeleDisk/Verify.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class TeleDisk { diff --git a/Aaru.Images/UDIF/Constants.cs b/Aaru.Images/UDIF/Constants.cs index 3272a95ec..a45790936 100644 --- a/Aaru.Images/UDIF/Constants.cs +++ b/Aaru.Images/UDIF/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/Identify.cs b/Aaru.Images/UDIF/Identify.cs index e1e2ee6c5..44c1ee99b 100644 --- a/Aaru.Images/UDIF/Identify.cs +++ b/Aaru.Images/UDIF/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/Properties.cs b/Aaru.Images/UDIF/Properties.cs index 985d2e260..b0530dc05 100644 --- a/Aaru.Images/UDIF/Properties.cs +++ b/Aaru.Images/UDIF/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs index 7fe42083a..64ff4a8af 100644 --- a/Aaru.Images/UDIF/Read.cs +++ b/Aaru.Images/UDIF/Read.cs @@ -36,19 +36,19 @@ using System.IO; using System.Linq; using Claunia.PropertyList; using Claunia.RsrcFork; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Compression; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Compression; +using Aaru.Console; +using Aaru.Helpers; using Ionic.Zlib; using SharpCompress.Compressors.ADC; using SharpCompress.Compressors.BZip2; using Version = Resources.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/Structs.cs b/Aaru.Images/UDIF/Structs.cs index ea172376c..c4d764dca 100644 --- a/Aaru.Images/UDIF/Structs.cs +++ b/Aaru.Images/UDIF/Structs.cs @@ -33,7 +33,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/UDIF.cs b/Aaru.Images/UDIF/UDIF.cs index 219b37164..8f3584a52 100644 --- a/Aaru.Images/UDIF/UDIF.cs +++ b/Aaru.Images/UDIF/UDIF.cs @@ -32,14 +32,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.Checksums; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; #pragma warning disable 612 -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif : IWritableImage { diff --git a/Aaru.Images/UDIF/Unsupported.cs b/Aaru.Images/UDIF/Unsupported.cs index 81b53e98b..925809bd7 100644 --- a/Aaru.Images/UDIF/Unsupported.cs +++ b/Aaru.Images/UDIF/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs index 6c0a0b52b..62a1c9b6b 100644 --- a/Aaru.Images/UDIF/Write.cs +++ b/Aaru.Images/UDIF/Write.cs @@ -36,13 +36,13 @@ using System.IO; using System.Linq; using System.Text; using Claunia.PropertyList; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Udif { diff --git a/Aaru.Images/UkvFdi/Constants.cs b/Aaru.Images/UkvFdi/Constants.cs index 3abd8ae38..38de8694e 100644 --- a/Aaru.Images/UkvFdi/Constants.cs +++ b/Aaru.Images/UkvFdi/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Enums.cs b/Aaru.Images/UkvFdi/Enums.cs index 8c50a45be..83f2e572f 100644 --- a/Aaru.Images/UkvFdi/Enums.cs +++ b/Aaru.Images/UkvFdi/Enums.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Helpers.cs b/Aaru.Images/UkvFdi/Helpers.cs index f34ee21fb..364c2d447 100644 --- a/Aaru.Images/UkvFdi/Helpers.cs +++ b/Aaru.Images/UkvFdi/Helpers.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Identify.cs b/Aaru.Images/UkvFdi/Identify.cs index 7ad8c820a..577796710 100644 --- a/Aaru.Images/UkvFdi/Identify.cs +++ b/Aaru.Images/UkvFdi/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Properties.cs b/Aaru.Images/UkvFdi/Properties.cs index 0fa51279f..21a263f5a 100644 --- a/Aaru.Images/UkvFdi/Properties.cs +++ b/Aaru.Images/UkvFdi/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Read.cs b/Aaru.Images/UkvFdi/Read.cs index d7704605c..6700d8865 100644 --- a/Aaru.Images/UkvFdi/Read.cs +++ b/Aaru.Images/UkvFdi/Read.cs @@ -32,13 +32,13 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/Structs.cs b/Aaru.Images/UkvFdi/Structs.cs index 090d0f5b3..9c1b91b6f 100644 --- a/Aaru.Images/UkvFdi/Structs.cs +++ b/Aaru.Images/UkvFdi/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/UkvFdi/UkvFdi.cs b/Aaru.Images/UkvFdi/UkvFdi.cs index 2e1e9dc53..b5aaf8b3d 100644 --- a/Aaru.Images/UkvFdi/UkvFdi.cs +++ b/Aaru.Images/UkvFdi/UkvFdi.cs @@ -31,11 +31,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi : IMediaImage { diff --git a/Aaru.Images/UkvFdi/Unsupported.cs b/Aaru.Images/UkvFdi/Unsupported.cs index 20556feb0..61b306435 100644 --- a/Aaru.Images/UkvFdi/Unsupported.cs +++ b/Aaru.Images/UkvFdi/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class UkvFdi { diff --git a/Aaru.Images/VDI/Constants.cs b/Aaru.Images/VDI/Constants.cs index ccc0419bf..4fbb86469 100644 --- a/Aaru.Images/VDI/Constants.cs +++ b/Aaru.Images/VDI/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Enums.cs b/Aaru.Images/VDI/Enums.cs index 397176808..f5a2d3b85 100644 --- a/Aaru.Images/VDI/Enums.cs +++ b/Aaru.Images/VDI/Enums.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Identify.cs b/Aaru.Images/VDI/Identify.cs index 2631532f9..b82dee9f5 100644 --- a/Aaru.Images/VDI/Identify.cs +++ b/Aaru.Images/VDI/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Properties.cs b/Aaru.Images/VDI/Properties.cs index 3141ef632..cb737507b 100644 --- a/Aaru.Images/VDI/Properties.cs +++ b/Aaru.Images/VDI/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Read.cs b/Aaru.Images/VDI/Read.cs index f627a2b26..0dc21a2e9 100644 --- a/Aaru.Images/VDI/Read.cs +++ b/Aaru.Images/VDI/Read.cs @@ -34,14 +34,14 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Structs.cs b/Aaru.Images/VDI/Structs.cs index b79c670ec..335a6ecd3 100644 --- a/Aaru.Images/VDI/Structs.cs +++ b/Aaru.Images/VDI/Structs.cs @@ -33,7 +33,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/Unsupported.cs b/Aaru.Images/VDI/Unsupported.cs index efc67199d..0805a9163 100644 --- a/Aaru.Images/VDI/Unsupported.cs +++ b/Aaru.Images/VDI/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VDI/VDI.cs b/Aaru.Images/VDI/VDI.cs index c3e3f5af8..253a93495 100644 --- a/Aaru.Images/VDI/VDI.cs +++ b/Aaru.Images/VDI/VDI.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // TODO: Support version 0 // TODO: Support fixed images diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs index fe2c79e30..8aab0da86 100644 --- a/Aaru.Images/VDI/Write.cs +++ b/Aaru.Images/VDI/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -using Marshal = DiscImageChef.Helpers.Marshal; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vdi { diff --git a/Aaru.Images/VHD/Constants.cs b/Aaru.Images/VHD/Constants.cs index 8e2479309..dc8e2dd5e 100644 --- a/Aaru.Images/VHD/Constants.cs +++ b/Aaru.Images/VHD/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Helpers.cs b/Aaru.Images/VHD/Helpers.cs index 999059ace..6fe5f91c2 100644 --- a/Aaru.Images/VHD/Helpers.cs +++ b/Aaru.Images/VHD/Helpers.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Linq; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Identify.cs b/Aaru.Images/VHD/Identify.cs index 3b3d91dfc..1fe618511 100644 --- a/Aaru.Images/VHD/Identify.cs +++ b/Aaru.Images/VHD/Identify.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Properties.cs b/Aaru.Images/VHD/Properties.cs index 5e2f565e6..b3d553ffa 100644 --- a/Aaru.Images/VHD/Properties.cs +++ b/Aaru.Images/VHD/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs index b9794a81e..f4e09f550 100644 --- a/Aaru.Images/VHD/Read.cs +++ b/Aaru.Images/VHD/Read.cs @@ -34,14 +34,14 @@ using System; using System.IO; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Structs.cs b/Aaru.Images/VHD/Structs.cs index c75ca3ba7..42bdc2749 100644 --- a/Aaru.Images/VHD/Structs.cs +++ b/Aaru.Images/VHD/Structs.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/Unsupported.cs b/Aaru.Images/VHD/Unsupported.cs index fd321115c..0cf66e2e5 100644 --- a/Aaru.Images/VHD/Unsupported.cs +++ b/Aaru.Images/VHD/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHD/VHD.cs b/Aaru.Images/VHD/VHD.cs index a3a02ea01..956c20fed 100644 --- a/Aaru.Images/VHD/VHD.cs +++ b/Aaru.Images/VHD/VHD.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { /// /// diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs index 7cf8891c2..5da893000 100644 --- a/Aaru.Images/VHD/Write.cs +++ b/Aaru.Images/VHD/Write.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Structs; using Schemas; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; using Version = System.Version; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhd { diff --git a/Aaru.Images/VHDX/Constants.cs b/Aaru.Images/VHDX/Constants.cs index ae99e5740..d2358b1ee 100644 --- a/Aaru.Images/VHDX/Constants.cs +++ b/Aaru.Images/VHDX/Constants.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Helpers.cs b/Aaru.Images/VHDX/Helpers.cs index 42e765886..b6d213f72 100644 --- a/Aaru.Images/VHDX/Helpers.cs +++ b/Aaru.Images/VHDX/Helpers.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Linq; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Identify.cs b/Aaru.Images/VHDX/Identify.cs index 63fe76586..3f14f8f1f 100644 --- a/Aaru.Images/VHDX/Identify.cs +++ b/Aaru.Images/VHDX/Identify.cs @@ -31,10 +31,10 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Properties.cs b/Aaru.Images/VHDX/Properties.cs index 3c2101182..fb1c401e2 100644 --- a/Aaru.Images/VHDX/Properties.cs +++ b/Aaru.Images/VHDX/Properties.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs index ebe672c70..b98322f40 100644 --- a/Aaru.Images/VHDX/Read.cs +++ b/Aaru.Images/VHDX/Read.cs @@ -34,14 +34,14 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Structs.cs b/Aaru.Images/VHDX/Structs.cs index b2c6db0f8..77d907d79 100644 --- a/Aaru.Images/VHDX/Structs.cs +++ b/Aaru.Images/VHDX/Structs.cs @@ -33,7 +33,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/Unsupported.cs b/Aaru.Images/VHDX/Unsupported.cs index 239fc1558..b80ac4841 100644 --- a/Aaru.Images/VHDX/Unsupported.cs +++ b/Aaru.Images/VHDX/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx { diff --git a/Aaru.Images/VHDX/VHDX.cs b/Aaru.Images/VHDX/VHDX.cs index 5051909f6..c8a59234d 100644 --- a/Aaru.Images/VHDX/VHDX.cs +++ b/Aaru.Images/VHDX/VHDX.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Vhdx : IMediaImage { diff --git a/Aaru.Images/VMware/Constants.cs b/Aaru.Images/VMware/Constants.cs index d5c3599fc..78f019f07 100644 --- a/Aaru.Images/VMware/Constants.cs +++ b/Aaru.Images/VMware/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/Identify.cs b/Aaru.Images/VMware/Identify.cs index 503aa7c1d..6df81f9f7 100644 --- a/Aaru.Images/VMware/Identify.cs +++ b/Aaru.Images/VMware/Identify.cs @@ -32,10 +32,10 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/Properties.cs b/Aaru.Images/VMware/Properties.cs index 75caf2cd7..231524e10 100644 --- a/Aaru.Images/VMware/Properties.cs +++ b/Aaru.Images/VMware/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs index 64bad8aa6..712621d11 100644 --- a/Aaru.Images/VMware/Read.cs +++ b/Aaru.Images/VMware/Read.cs @@ -36,14 +36,14 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text.RegularExpressions; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/Structs.cs b/Aaru.Images/VMware/Structs.cs index e0ccbd0e6..6d9056d35 100644 --- a/Aaru.Images/VMware/Structs.cs +++ b/Aaru.Images/VMware/Structs.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/Unsupported.cs b/Aaru.Images/VMware/Unsupported.cs index 815bb5450..cb0fcb694 100644 --- a/Aaru.Images/VMware/Unsupported.cs +++ b/Aaru.Images/VMware/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/VMware/VMware.cs b/Aaru.Images/VMware/VMware.cs index f7673d87d..9f1feb001 100644 --- a/Aaru.Images/VMware/VMware.cs +++ b/Aaru.Images/VMware/VMware.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware : IWritableImage { diff --git a/Aaru.Images/VMware/Write.cs b/Aaru.Images/VMware/Write.cs index 9fbeba512..8eb2170cc 100644 --- a/Aaru.Images/VMware/Write.cs +++ b/Aaru.Images/VMware/Write.cs @@ -35,12 +35,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class VMware { diff --git a/Aaru.Images/Virtual98/Constants.cs b/Aaru.Images/Virtual98/Constants.cs index a8b973b09..039ef94b8 100644 --- a/Aaru.Images/Virtual98/Constants.cs +++ b/Aaru.Images/Virtual98/Constants.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs index 86af01bb4..4303f311b 100644 --- a/Aaru.Images/Virtual98/Identify.cs +++ b/Aaru.Images/Virtual98/Identify.cs @@ -33,11 +33,11 @@ using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Properties.cs b/Aaru.Images/Virtual98/Properties.cs index 4ef4c11f1..d834a4b51 100644 --- a/Aaru.Images/Virtual98/Properties.cs +++ b/Aaru.Images/Virtual98/Properties.cs @@ -32,12 +32,12 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Read.cs b/Aaru.Images/Virtual98/Read.cs index c1eac78f8..b6a7b78be 100644 --- a/Aaru.Images/Virtual98/Read.cs +++ b/Aaru.Images/Virtual98/Read.cs @@ -33,12 +33,12 @@ using System; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Structs.cs b/Aaru.Images/Virtual98/Structs.cs index da1ac0002..1603a033c 100644 --- a/Aaru.Images/Virtual98/Structs.cs +++ b/Aaru.Images/Virtual98/Structs.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Unsupported.cs b/Aaru.Images/Virtual98/Unsupported.cs index d603bfe85..bf16cd6a8 100644 --- a/Aaru.Images/Virtual98/Unsupported.cs +++ b/Aaru.Images/Virtual98/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/Virtual98/Virtual98.cs b/Aaru.Images/Virtual98/Virtual98.cs index 7bc850bee..8c455a39d 100644 --- a/Aaru.Images/Virtual98/Virtual98.cs +++ b/Aaru.Images/Virtual98/Virtual98.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { // Info from Neko Project II emulator public partial class Virtual98 : IWritableImage diff --git a/Aaru.Images/Virtual98/Write.cs b/Aaru.Images/Virtual98/Write.cs index d7cc430e5..aed709feb 100644 --- a/Aaru.Images/Virtual98/Write.cs +++ b/Aaru.Images/Virtual98/Write.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Helpers; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.Helpers; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class Virtual98 { diff --git a/Aaru.Images/WCDiskImage/Identify.cs b/Aaru.Images/WCDiskImage/Identify.cs index ee0b94c0e..0753958ab 100644 --- a/Aaru.Images/WCDiskImage/Identify.cs +++ b/Aaru.Images/WCDiskImage/Identify.cs @@ -33,10 +33,10 @@ using System.IO; using System.Text; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Helpers; +using Aaru.CommonTypes.Interfaces; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage { diff --git a/Aaru.Images/WCDiskImage/Properties.cs b/Aaru.Images/WCDiskImage/Properties.cs index 25f7fa617..14cbc1105 100644 --- a/Aaru.Images/WCDiskImage/Properties.cs +++ b/Aaru.Images/WCDiskImage/Properties.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage { diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs index d908b948c..4aad8b415 100644 --- a/Aaru.Images/WCDiskImage/Read.cs +++ b/Aaru.Images/WCDiskImage/Read.cs @@ -34,14 +34,14 @@ using System; using System.IO; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage { diff --git a/Aaru.Images/WCDiskImage/Structs.cs b/Aaru.Images/WCDiskImage/Structs.cs index 341987047..a68014407 100644 --- a/Aaru.Images/WCDiskImage/Structs.cs +++ b/Aaru.Images/WCDiskImage/Structs.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage { diff --git a/Aaru.Images/WCDiskImage/Unsupported.cs b/Aaru.Images/WCDiskImage/Unsupported.cs index 5af0dea53..c3a72c941 100644 --- a/Aaru.Images/WCDiskImage/Unsupported.cs +++ b/Aaru.Images/WCDiskImage/Unsupported.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage { diff --git a/Aaru.Images/WCDiskImage/WCDiskImage.cs b/Aaru.Images/WCDiskImage/WCDiskImage.cs index 7338b9084..1278f7131 100644 --- a/Aaru.Images/WCDiskImage/WCDiskImage.cs +++ b/Aaru.Images/WCDiskImage/WCDiskImage.cs @@ -32,11 +32,11 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class WCDiskImage : IMediaImage { diff --git a/Aaru.Images/ZZZRawImage/Constants.cs b/Aaru.Images/ZZZRawImage/Constants.cs index 3e07cb0ef..6cffe2621 100644 --- a/Aaru.Images/ZZZRawImage/Constants.cs +++ b/Aaru.Images/ZZZRawImage/Constants.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes.Enums; +using Aaru.CommonTypes.Enums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/Helpers.cs b/Aaru.Images/ZZZRawImage/Helpers.cs index 20750253a..4b83bc954 100644 --- a/Aaru.Images/ZZZRawImage/Helpers.cs +++ b/Aaru.Images/ZZZRawImage/Helpers.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.CommonTypes; +using Aaru.CommonTypes; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/Identify.cs b/Aaru.Images/ZZZRawImage/Identify.cs index 2864ee544..1911b7719 100644 --- a/Aaru.Images/ZZZRawImage/Identify.cs +++ b/Aaru.Images/ZZZRawImage/Identify.cs @@ -32,9 +32,9 @@ using System.IO; using System.Linq; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/Properties.cs b/Aaru.Images/ZZZRawImage/Properties.cs index a9f0a94c7..e21857c90 100644 --- a/Aaru.Images/ZZZRawImage/Properties.cs +++ b/Aaru.Images/ZZZRawImage/Properties.cs @@ -33,14 +33,14 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Structs; using Schemas; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs index ad2bab700..b042ab741 100644 --- a/Aaru.Images/ZZZRawImage/Read.cs +++ b/Aaru.Images/ZZZRawImage/Read.cs @@ -35,24 +35,24 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Exceptions; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Exceptions; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI; using Schemas; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Inquiry = DiscImageChef.CommonTypes.Structs.Devices.SCSI.Inquiry; -using Session = DiscImageChef.CommonTypes.Structs.Session; -using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; +using DMI = Aaru.Decoders.Xbox.DMI; +using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; +using Session = Aaru.CommonTypes.Structs.Session; +using TrackType = Aaru.CommonTypes.Enums.TrackType; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { @@ -1001,7 +1001,7 @@ namespace DiscImageChef.DiscImages // It's ATA, check tags if(mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] identifyBuf)) { - Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf); + Identify.IdentifyDevice? ataId = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf); if(ataId.HasValue) { diff --git a/Aaru.Images/ZZZRawImage/Verify.cs b/Aaru.Images/ZZZRawImage/Verify.cs index c64264381..95905a49e 100644 --- a/Aaru.Images/ZZZRawImage/Verify.cs +++ b/Aaru.Images/ZZZRawImage/Verify.cs @@ -32,9 +32,9 @@ using System; using System.Collections.Generic; -using DiscImageChef.Checksums; +using Aaru.Checksums; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/Write.cs b/Aaru.Images/ZZZRawImage/Write.cs index 767fffb3f..e2b3e4d0d 100644 --- a/Aaru.Images/ZZZRawImage/Write.cs +++ b/Aaru.Images/ZZZRawImage/Write.cs @@ -33,12 +33,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage { diff --git a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs index d09834891..b0df8d298 100644 --- a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs +++ b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs @@ -32,11 +32,11 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; -namespace DiscImageChef.DiscImages +namespace Aaru.DiscImages { public partial class ZZZRawImage : IWritableOpticalImage { diff --git a/Aaru.Interop/Aaru.Interop.csproj b/Aaru.Interop/Aaru.Interop.csproj index d7c908026..e77354698 100644 --- a/Aaru.Interop/Aaru.Interop.csproj +++ b/Aaru.Interop/Aaru.Interop.csproj @@ -6,7 +6,7 @@ 2.0 {9183F2E0-A879-4F23-9EE3-C6908F1332B2} Library - DiscImageChef.Interop + Aaru.Interop DiscImageChef.Interop $(Version) false diff --git a/Aaru.Metadata/Aaru.Metadata.csproj b/Aaru.Metadata/Aaru.Metadata.csproj index 1064ad15f..a9c0aeb90 100644 --- a/Aaru.Metadata/Aaru.Metadata.csproj +++ b/Aaru.Metadata/Aaru.Metadata.csproj @@ -6,7 +6,7 @@ 2.0 {9F213318-5CB8-4066-A757-074489C9F818} Library - DiscImageChef.Metadata + Aaru.Metadata DiscImageChef.Metadata $(Version) false diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj index ed4792c11..104dd2800 100644 --- a/Aaru.Partitions/Aaru.Partitions.csproj +++ b/Aaru.Partitions/Aaru.Partitions.csproj @@ -6,7 +6,7 @@ 2.0 {DA7AB65D-B5BA-4003-8893-A51BB071BA2F} Library - DiscImageChef.Partitions + Aaru.Partitions Aaru.Partitions $(Version) false diff --git a/Aaru.Partitions/Acorn.cs b/Aaru.Partitions/Acorn.cs index 0814ed624..a1a9a0a75 100644 --- a/Aaru.Partitions/Acorn.cs +++ b/Aaru.Partitions/Acorn.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class Acorn : IPartition { diff --git a/Aaru.Partitions/AppleMap.cs b/Aaru.Partitions/AppleMap.cs index 5455a0453..27e3832b5 100644 --- a/Aaru.Partitions/AppleMap.cs +++ b/Aaru.Partitions/AppleMap.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { // Information about structures learnt from Inside Macintosh // Constants from image testing diff --git a/Aaru.Partitions/Apricot.cs b/Aaru.Partitions/Apricot.cs index 358bbd812..d2109c2bf 100644 --- a/Aaru.Partitions/Apricot.cs +++ b/Aaru.Partitions/Apricot.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class Apricot : IPartition { diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs index 46bad9bab..9542e60d2 100644 --- a/Aaru.Partitions/Atari.cs +++ b/Aaru.Partitions/Atari.cs @@ -33,12 +33,12 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class AtariPartitions : IPartition { diff --git a/Aaru.Partitions/BSD.cs b/Aaru.Partitions/BSD.cs index f8619664c..0985bd70b 100644 --- a/Aaru.Partitions/BSD.cs +++ b/Aaru.Partitions/BSD.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class BSD : IPartition { diff --git a/Aaru.Partitions/DEC.cs b/Aaru.Partitions/DEC.cs index 6e922826d..c72a3bc5a 100644 --- a/Aaru.Partitions/DEC.cs +++ b/Aaru.Partitions/DEC.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class DEC : IPartition { diff --git a/Aaru.Partitions/DragonFlyBSD.cs b/Aaru.Partitions/DragonFlyBSD.cs index 3e298c6c0..e48362a61 100644 --- a/Aaru.Partitions/DragonFlyBSD.cs +++ b/Aaru.Partitions/DragonFlyBSD.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class DragonFlyBSD : IPartition { diff --git a/Aaru.Partitions/GPT.cs b/Aaru.Partitions/GPT.cs index 9c7066cd3..452b96a92 100644 --- a/Aaru.Partitions/GPT.cs +++ b/Aaru.Partitions/GPT.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class GuidPartitionTable : IPartition { diff --git a/Aaru.Partitions/Human68k.cs b/Aaru.Partitions/Human68k.cs index 6ca3fda5c..20b759033 100644 --- a/Aaru.Partitions/Human68k.cs +++ b/Aaru.Partitions/Human68k.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class Human68K : IPartition { diff --git a/Aaru.Partitions/MBR.cs b/Aaru.Partitions/MBR.cs index 231e176e9..3e0c84c20 100644 --- a/Aaru.Partitions/MBR.cs +++ b/Aaru.Partitions/MBR.cs @@ -33,14 +33,14 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { // TODO: Support AAP extensions public class MBR : IPartition diff --git a/Aaru.Partitions/NeXT.cs b/Aaru.Partitions/NeXT.cs index 473c521b6..b1a1ef9bb 100644 --- a/Aaru.Partitions/NeXT.cs +++ b/Aaru.Partitions/NeXT.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; // Information learnt from XNU source and testing against real disks -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class NeXTDisklabel : IPartition { diff --git a/Aaru.Partitions/PC98.cs b/Aaru.Partitions/PC98.cs index 0795572a4..fecba5140 100644 --- a/Aaru.Partitions/PC98.cs +++ b/Aaru.Partitions/PC98.cs @@ -34,13 +34,13 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Helpers; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Helpers; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class PC98 : IPartition { diff --git a/Aaru.Partitions/Plan9.cs b/Aaru.Partitions/Plan9.cs index 58e52746c..4e1b9ce57 100644 --- a/Aaru.Partitions/Plan9.cs +++ b/Aaru.Partitions/Plan9.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { // This is the most stupid or the most intelligent partition scheme ever done, pick or take // At sector 1 from offset, text resides (yes, TEXT) in following format: diff --git a/Aaru.Partitions/RDB.cs b/Aaru.Partitions/RDB.cs index d5c2323fd..ceeccc772 100644 --- a/Aaru.Partitions/RDB.cs +++ b/Aaru.Partitions/RDB.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class AmigaRigidDiskBlock : IPartition { diff --git a/Aaru.Partitions/Register.cs b/Aaru.Partitions/Register.cs index 639af312f..bb9344831 100644 --- a/Aaru.Partitions/Register.cs +++ b/Aaru.Partitions/Register.cs @@ -40,9 +40,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class Register : IPluginRegister { diff --git a/Aaru.Partitions/RioKarma.cs b/Aaru.Partitions/RioKarma.cs index 1d9e772b6..9a202a54f 100644 --- a/Aaru.Partitions/RioKarma.cs +++ b/Aaru.Partitions/RioKarma.cs @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class RioKarma : IPartition { diff --git a/Aaru.Partitions/SGI.cs b/Aaru.Partitions/SGI.cs index 8e7892d94..2a6e2205d 100644 --- a/Aaru.Partitions/SGI.cs +++ b/Aaru.Partitions/SGI.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; #pragma warning disable 169 #pragma warning disable 649 -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { [SuppressMessage("ReSharper", "InconsistentNaming")] public class SGI : IPartition diff --git a/Aaru.Partitions/Sun.cs b/Aaru.Partitions/Sun.cs index 757e9ed2b..a2d5ab87a 100644 --- a/Aaru.Partitions/Sun.cs +++ b/Aaru.Partitions/Sun.cs @@ -35,12 +35,12 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { [SuppressMessage("ReSharper", "InconsistentNaming")] public class SunDisklabel : IPartition diff --git a/Aaru.Partitions/UNIX.cs b/Aaru.Partitions/UNIX.cs index 3547d0e9e..5ad38682f 100644 --- a/Aaru.Partitions/UNIX.cs +++ b/Aaru.Partitions/UNIX.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { // These partitions are hardwired in kernel sources for some UNIX versions predating System V. // They depend on exact device, indeed the kernel chooses what to use depending on the disk driver, so that's what we do. diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs index 8b56dce5a..52278cbf0 100644 --- a/Aaru.Partitions/VTOC.cs +++ b/Aaru.Partitions/VTOC.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class VTOC : IPartition { diff --git a/Aaru.Partitions/XENIX.cs b/Aaru.Partitions/XENIX.cs index 3ce4cbee5..0abe77936 100644 --- a/Aaru.Partitions/XENIX.cs +++ b/Aaru.Partitions/XENIX.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { // TODO: Find better documentation, this is working for XENIX 2 but not for SCO OpenServer... public class XENIX : IPartition diff --git a/Aaru.Partitions/Xbox.cs b/Aaru.Partitions/Xbox.cs index 494d25628..f55c4d9cd 100644 --- a/Aaru.Partitions/Xbox.cs +++ b/Aaru.Partitions/Xbox.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using Marshal = DiscImageChef.Helpers.Marshal; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Marshal = Aaru.Helpers.Marshal; -namespace DiscImageChef.Partitions +namespace Aaru.Partitions { public class Xbox : IPartition { diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj index 4128cef39..154b4e33c 100644 --- a/Aaru.Settings/Aaru.Settings.csproj +++ b/Aaru.Settings/Aaru.Settings.csproj @@ -6,7 +6,7 @@ 2.0 {5C4C7BAA-CF60-4233-84ED-39CB2312AF38} Library - DiscImageChef.Settings + Aaru.Settings Aaru.Settings $(Version) false diff --git a/Aaru.Settings/Settings.cs b/Aaru.Settings/Settings.cs index 772305f52..5de8262e9 100644 --- a/Aaru.Settings/Settings.cs +++ b/Aaru.Settings/Settings.cs @@ -34,11 +34,11 @@ using System; using System.IO; using System.Xml.Serialization; using Claunia.PropertyList; -using DiscImageChef.CommonTypes.Interop; +using Aaru.CommonTypes.Interop; using Microsoft.Win32; -using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -namespace DiscImageChef.Settings +namespace Aaru.Settings { /// Settings public class DicSettings diff --git a/Aaru.Tests.Devices/ATA.cs b/Aaru.Tests.Devices/ATA.cs index 425dd10f2..114e707e3 100644 --- a/Aaru.Tests.Devices/ATA.cs +++ b/Aaru.Tests.Devices/ATA.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; -using DiscImageChef.Tests.Devices.ATA; +using Aaru.Tests.Devices.ATA; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/ATA/Ata28.cs b/Aaru.Tests.Devices/ATA/Ata28.cs index d0f4098d5..9ef43ffda 100644 --- a/Aaru.Tests.Devices/ATA/Ata28.cs +++ b/Aaru.Tests.Devices/ATA/Ata28.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Ata28 { diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs index 9e6dfc567..56960b0ae 100644 --- a/Aaru.Tests.Devices/ATA/Ata48.cs +++ b/Aaru.Tests.Devices/ATA/Ata48.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Ata48 { diff --git a/Aaru.Tests.Devices/ATA/AtaCHS.cs b/Aaru.Tests.Devices/ATA/AtaCHS.cs index 602fb779e..a4affc01b 100644 --- a/Aaru.Tests.Devices/ATA/AtaCHS.cs +++ b/Aaru.Tests.Devices/ATA/AtaCHS.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class AtaChs { diff --git a/Aaru.Tests.Devices/ATA/Atapi.cs b/Aaru.Tests.Devices/ATA/Atapi.cs index ddc885655..41da95859 100644 --- a/Aaru.Tests.Devices/ATA/Atapi.cs +++ b/Aaru.Tests.Devices/ATA/Atapi.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Atapi { diff --git a/Aaru.Tests.Devices/ATA/Cfa.cs b/Aaru.Tests.Devices/ATA/Cfa.cs index bbc1588eb..2d2db950c 100644 --- a/Aaru.Tests.Devices/ATA/Cfa.cs +++ b/Aaru.Tests.Devices/ATA/Cfa.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Cfa { diff --git a/Aaru.Tests.Devices/ATA/MCPT.cs b/Aaru.Tests.Devices/ATA/MCPT.cs index 9b06967e2..0408bd638 100644 --- a/Aaru.Tests.Devices/ATA/MCPT.cs +++ b/Aaru.Tests.Devices/ATA/MCPT.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Mcpt { diff --git a/Aaru.Tests.Devices/ATA/Smart.cs b/Aaru.Tests.Devices/ATA/Smart.cs index 15ae612c7..a89a28d0c 100644 --- a/Aaru.Tests.Devices/ATA/Smart.cs +++ b/Aaru.Tests.Devices/ATA/Smart.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.ATA; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.ATA +namespace Aaru.Tests.Devices.ATA { static class Smart { diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj index c3e2387b7..574f1c351 100644 --- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj +++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj @@ -5,7 +5,7 @@ x86 {A40662EB-D202-46A4-AB41-9C32ADE6D6B5} Exe - DiscImageChef.Tests.Devices + Aaru.Tests.Devices DiscImageChef.Tests.Devices $(Version) false diff --git a/Aaru.Tests.Devices/Command.cs b/Aaru.Tests.Devices/Command.cs index 8451a81ea..aee3cfe50 100644 --- a/Aaru.Tests.Devices/Command.cs +++ b/Aaru.Tests.Devices/Command.cs @@ -26,10 +26,10 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/DecodeATARegisters.cs b/Aaru.Tests.Devices/DecodeATARegisters.cs index f9bff7277..c7cc49085 100644 --- a/Aaru.Tests.Devices/DecodeATARegisters.cs +++ b/Aaru.Tests.Devices/DecodeATARegisters.cs @@ -28,9 +28,9 @@ using System; using System.Text; -using DiscImageChef.Decoders.ATA; +using Aaru.Decoders.ATA; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/Device.cs b/Aaru.Tests.Devices/Device.cs index 25571038f..562258407 100644 --- a/Aaru.Tests.Devices/Device.cs +++ b/Aaru.Tests.Devices/Device.cs @@ -26,10 +26,10 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { @@ -50,7 +50,7 @@ namespace DiscImageChef.Tests.Devices DicConsole.WriteLine("dev.Type = {0}", dev.Type); DicConsole.WriteLine("dev.Manufacturer = \"{0}\"", dev.Manufacturer); DicConsole.WriteLine("dev.Model = \"{0}\"", dev.Model); - DicConsole.WriteLine("dev.Revision = \"{0}\"", dev.Revision); + DicConsole.WriteLine("dev.Revision = \"{0}\"", dev.FirmwareRevision); DicConsole.WriteLine("dev.Serial = \"{0}\"", dev.Serial); DicConsole.WriteLine("dev.SCSIType = {0}", dev.ScsiType); DicConsole.WriteLine("dev.IsRemovable = {0}", dev.IsRemovable); diff --git a/Aaru.Tests.Devices/Main.cs b/Aaru.Tests.Devices/Main.cs index ccbfa4a17..6e165c401 100644 --- a/Aaru.Tests.Devices/Main.cs +++ b/Aaru.Tests.Devices/Main.cs @@ -27,10 +27,10 @@ // ****************************************************************************/ using System.Linq; -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { @@ -42,7 +42,7 @@ namespace DiscImageChef.Tests.Devices DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine; DicConsole.VerboseWriteLineEvent += System.Console.WriteLine; - DeviceInfo[] devices = DiscImageChef.Devices.Device.ListDevices(); + DeviceInfo[] devices = Aaru.Devices.Device.ListDevices(); if(devices == null || devices.Length == 0) { diff --git a/Aaru.Tests.Devices/NVMe.cs b/Aaru.Tests.Devices/NVMe.cs index 80525bf91..a90076f83 100644 --- a/Aaru.Tests.Devices/NVMe.cs +++ b/Aaru.Tests.Devices/NVMe.cs @@ -26,10 +26,10 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/SCSI.cs b/Aaru.Tests.Devices/SCSI.cs index dbe2fe0c5..563a0985f 100644 --- a/Aaru.Tests.Devices/SCSI.cs +++ b/Aaru.Tests.Devices/SCSI.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; -using DiscImageChef.Tests.Devices.SCSI; +using Aaru.Tests.Devices.SCSI; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/SCSI/Adaptec.cs b/Aaru.Tests.Devices/SCSI/Adaptec.cs index 275fe24cc..3a12bd11e 100644 --- a/Aaru.Tests.Devices/SCSI/Adaptec.cs +++ b/Aaru.Tests.Devices/SCSI/Adaptec.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Adaptec { diff --git a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs index 034e34832..24cbdcd7b 100644 --- a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs +++ b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class ArchiveCorp { diff --git a/Aaru.Tests.Devices/SCSI/Certance.cs b/Aaru.Tests.Devices/SCSI/Certance.cs index e73f900e3..5df4e6d72 100644 --- a/Aaru.Tests.Devices/SCSI/Certance.cs +++ b/Aaru.Tests.Devices/SCSI/Certance.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Certance { diff --git a/Aaru.Tests.Devices/SCSI/Fujitsu.cs b/Aaru.Tests.Devices/SCSI/Fujitsu.cs index 7a36a1a4e..db300a545 100644 --- a/Aaru.Tests.Devices/SCSI/Fujitsu.cs +++ b/Aaru.Tests.Devices/SCSI/Fujitsu.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Fujitsu { diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs index a31fa61fd..d7133f7c9 100644 --- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs +++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class HlDtSt { diff --git a/Aaru.Tests.Devices/SCSI/HP.cs b/Aaru.Tests.Devices/SCSI/HP.cs index 6b9d94576..7278cba50 100644 --- a/Aaru.Tests.Devices/SCSI/HP.cs +++ b/Aaru.Tests.Devices/SCSI/HP.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Hp { diff --git a/Aaru.Tests.Devices/SCSI/Kreon.cs b/Aaru.Tests.Devices/SCSI/Kreon.cs index 3e858d790..81e3e2d86 100644 --- a/Aaru.Tests.Devices/SCSI/Kreon.cs +++ b/Aaru.Tests.Devices/SCSI/Kreon.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Kreon { diff --git a/Aaru.Tests.Devices/SCSI/MMC.cs b/Aaru.Tests.Devices/SCSI/MMC.cs index 7c84ce0b0..7a7ee25e6 100644 --- a/Aaru.Tests.Devices/SCSI/MMC.cs +++ b/Aaru.Tests.Devices/SCSI/MMC.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Mmc { diff --git a/Aaru.Tests.Devices/SCSI/NEC.cs b/Aaru.Tests.Devices/SCSI/NEC.cs index ba9696a80..e692663c9 100644 --- a/Aaru.Tests.Devices/SCSI/NEC.cs +++ b/Aaru.Tests.Devices/SCSI/NEC.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Nec { diff --git a/Aaru.Tests.Devices/SCSI/Pioneer.cs b/Aaru.Tests.Devices/SCSI/Pioneer.cs index 6f933f5a0..82be65112 100644 --- a/Aaru.Tests.Devices/SCSI/Pioneer.cs +++ b/Aaru.Tests.Devices/SCSI/Pioneer.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Pioneer { diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs index a017ce8fa..ff100a6db 100644 --- a/Aaru.Tests.Devices/SCSI/Plasmon.cs +++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Plasmon { diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs index 1bdd09376..458674780 100644 --- a/Aaru.Tests.Devices/SCSI/Plextor.cs +++ b/Aaru.Tests.Devices/SCSI/Plextor.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Plextor { diff --git a/Aaru.Tests.Devices/SCSI/SBC.cs b/Aaru.Tests.Devices/SCSI/SBC.cs index 49cddad72..b5a5d0a27 100644 --- a/Aaru.Tests.Devices/SCSI/SBC.cs +++ b/Aaru.Tests.Devices/SCSI/SBC.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Sbc { diff --git a/Aaru.Tests.Devices/SCSI/SMC.cs b/Aaru.Tests.Devices/SCSI/SMC.cs index 9955c1aa7..aff840024 100644 --- a/Aaru.Tests.Devices/SCSI/SMC.cs +++ b/Aaru.Tests.Devices/SCSI/SMC.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Smc { diff --git a/Aaru.Tests.Devices/SCSI/SPC.cs b/Aaru.Tests.Devices/SCSI/SPC.cs index 8961d1385..d45af7ff0 100644 --- a/Aaru.Tests.Devices/SCSI/SPC.cs +++ b/Aaru.Tests.Devices/SCSI/SPC.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Spc { diff --git a/Aaru.Tests.Devices/SCSI/SSC.cs b/Aaru.Tests.Devices/SCSI/SSC.cs index dff442929..04122c1b0 100644 --- a/Aaru.Tests.Devices/SCSI/SSC.cs +++ b/Aaru.Tests.Devices/SCSI/SSC.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System; -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class Ssc { diff --git a/Aaru.Tests.Devices/SCSI/SyQuest.cs b/Aaru.Tests.Devices/SCSI/SyQuest.cs index b81a221bf..c58b5cf27 100644 --- a/Aaru.Tests.Devices/SCSI/SyQuest.cs +++ b/Aaru.Tests.Devices/SCSI/SyQuest.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Decoders.SCSI; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SCSI +namespace Aaru.Tests.Devices.SCSI { static class SyQuest { diff --git a/Aaru.Tests.Devices/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital.cs index d1936603d..1ee6474f7 100644 --- a/Aaru.Tests.Devices/SecureDigital.cs +++ b/Aaru.Tests.Devices/SecureDigital.cs @@ -26,11 +26,11 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; -using DiscImageChef.Tests.Devices.SecureDigital; +using Aaru.Tests.Devices.SecureDigital; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { static partial class MainClass { diff --git a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs index 6ad468032..bc91a6fff 100644 --- a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs +++ b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs @@ -26,10 +26,10 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SecureDigital +namespace Aaru.Tests.Devices.SecureDigital { static class MultiMediaCard { diff --git a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs index 6ba00706d..926d85f3d 100644 --- a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs +++ b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs @@ -26,10 +26,10 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; -using DiscImageChef.Devices; +using Aaru.Console; +using Aaru.Devices; -namespace DiscImageChef.Tests.Devices.SecureDigital +namespace Aaru.Tests.Devices.SecureDigital { static class SecureDigital { diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj index c3a181e8c..25a067547 100644 --- a/Aaru.Tests/Aaru.Tests.csproj +++ b/Aaru.Tests/Aaru.Tests.csproj @@ -6,8 +6,8 @@ 2.0 {B2ABC1F2-C365-4515-9F23-A5725050CC48} Exe - DiscImageChef.Tests - DiscImageChef.Tests + Aaru.Tests + Aaru.Tests $(Version) false net461 @@ -16,7 +16,7 @@ Claunia.com Copyright © 2011-2019 Natalia Portillo The Disc Image Chef - DiscImageChef.Tests + Aaru.Tests $(Version) @@ -151,31 +151,31 @@ {CC48B324-A532-4A45-87A6-6F91F7141E8D} - DiscImageChef.Checksums + Aaru.Checksums {D571B8EF-903D-4353-BDD5-B834F9F029EF} - DiscImageChef.Filters + Aaru.Filters {74032CBC-339B-42F3-AF6F-E96C261F3E6A} - DiscImageChef.DiscImages + Aaru.DiscImages {D7016DF2-5A5E-4524-B40D-BA2D59576688} - DiscImageChef.Filesystems + Aaru.Filesystems {F2B84194-26EB-4227-B1C5-6602517E85AE} - DiscImageChef.CommonTypes + Aaru.CommonTypes {DA7AB65D-B5BA-4003-8893-A51BB071BA2F} - DiscImageChef.Partitions + Aaru.Partitions {679659B8-25D0-4279-B632-56EF8F94ADC0} - DiscImageChef.Core + Aaru.Core diff --git a/Aaru.Tests/Checksums/Adler32.cs b/Aaru.Tests/Checksums/Adler32.cs index c7f8921ae..c57b03e6e 100644 --- a/Aaru.Tests/Checksums/Adler32.cs +++ b/Aaru.Tests/Checksums/Adler32.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Adler32 diff --git a/Aaru.Tests/Checksums/CRC16.cs b/Aaru.Tests/Checksums/CRC16.cs index 3079deec5..e76a79229 100644 --- a/Aaru.Tests/Checksums/CRC16.cs +++ b/Aaru.Tests/Checksums/CRC16.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Crc16 diff --git a/Aaru.Tests/Checksums/CRC32.cs b/Aaru.Tests/Checksums/CRC32.cs index 56fc5e8d1..49c3afe31 100644 --- a/Aaru.Tests/Checksums/CRC32.cs +++ b/Aaru.Tests/Checksums/CRC32.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Crc32 diff --git a/Aaru.Tests/Checksums/CRC64.cs b/Aaru.Tests/Checksums/CRC64.cs index 9ce9f2b75..4227d3ced 100644 --- a/Aaru.Tests/Checksums/CRC64.cs +++ b/Aaru.Tests/Checksums/CRC64.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Crc64 diff --git a/Aaru.Tests/Checksums/MD5.cs b/Aaru.Tests/Checksums/MD5.cs index 94131b661..71bbf8a75 100644 --- a/Aaru.Tests/Checksums/MD5.cs +++ b/Aaru.Tests/Checksums/MD5.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Md5 diff --git a/Aaru.Tests/Checksums/SHA1.cs b/Aaru.Tests/Checksums/SHA1.cs index 479f0a153..39f04bb57 100644 --- a/Aaru.Tests/Checksums/SHA1.cs +++ b/Aaru.Tests/Checksums/SHA1.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Sha1 diff --git a/Aaru.Tests/Checksums/SHA256.cs b/Aaru.Tests/Checksums/SHA256.cs index 8efaf9fe5..16affee28 100644 --- a/Aaru.Tests/Checksums/SHA256.cs +++ b/Aaru.Tests/Checksums/SHA256.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Sha256 diff --git a/Aaru.Tests/Checksums/SHA384.cs b/Aaru.Tests/Checksums/SHA384.cs index c6f36ff4c..3b5a0da22 100644 --- a/Aaru.Tests/Checksums/SHA384.cs +++ b/Aaru.Tests/Checksums/SHA384.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Sha384 diff --git a/Aaru.Tests/Checksums/SHA512.cs b/Aaru.Tests/Checksums/SHA512.cs index feb769f48..47dbfc748 100644 --- a/Aaru.Tests/Checksums/SHA512.cs +++ b/Aaru.Tests/Checksums/SHA512.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class Sha512 diff --git a/Aaru.Tests/Checksums/SpamSum.cs b/Aaru.Tests/Checksums/SpamSum.cs index 037fe82ee..b2437e6b0 100644 --- a/Aaru.Tests/Checksums/SpamSum.cs +++ b/Aaru.Tests/Checksums/SpamSum.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Checksums +namespace Aaru.Tests.Checksums { [TestFixture] public class SpamSum diff --git a/Aaru.Tests/Consts.cs b/Aaru.Tests/Consts.cs index 66a99e5ca..4b231964f 100644 --- a/Aaru.Tests/Consts.cs +++ b/Aaru.Tests/Consts.cs @@ -26,7 +26,7 @@ // Copyright © 2011-2019 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Tests +namespace Aaru.Tests { static class Consts { diff --git a/Aaru.Tests/Devices/IomegaJaz.cs b/Aaru.Tests/Devices/IomegaJaz.cs index d1bff5081..e0747130a 100644 --- a/Aaru.Tests/Devices/IomegaJaz.cs +++ b/Aaru.Tests/Devices/IomegaJaz.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { [TestFixture] public class IomegaJaz diff --git a/Aaru.Tests/Devices/LS120.cs b/Aaru.Tests/Devices/LS120.cs index 5ba09501d..88e6b9e09 100644 --- a/Aaru.Tests/Devices/LS120.cs +++ b/Aaru.Tests/Devices/LS120.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { [TestFixture] public class Ls120 diff --git a/Aaru.Tests/Devices/PocketZip.cs b/Aaru.Tests/Devices/PocketZip.cs index 85a33f665..9a9225f0a 100644 --- a/Aaru.Tests/Devices/PocketZip.cs +++ b/Aaru.Tests/Devices/PocketZip.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Devices +namespace Aaru.Tests.Devices { [TestFixture] public class PocketZip diff --git a/Aaru.Tests/Filesystems/ADFS.cs b/Aaru.Tests/Filesystems/ADFS.cs index d47096606..29082d1be 100644 --- a/Aaru.Tests/Filesystems/ADFS.cs +++ b/Aaru.Tests/Filesystems/ADFS.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Adfs diff --git a/Aaru.Tests/Filesystems/AFFS.cs b/Aaru.Tests/Filesystems/AFFS.cs index 2897875ef..005630ddd 100644 --- a/Aaru.Tests/Filesystems/AFFS.cs +++ b/Aaru.Tests/Filesystems/AFFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Affs diff --git a/Aaru.Tests/Filesystems/AFFS2.cs b/Aaru.Tests/Filesystems/AFFS2.cs index 5060fbea6..2ca4930d3 100644 --- a/Aaru.Tests/Filesystems/AFFS2.cs +++ b/Aaru.Tests/Filesystems/AFFS2.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Affs2Rdb diff --git a/Aaru.Tests/Filesystems/AFS.cs b/Aaru.Tests/Filesystems/AFS.cs index 464f7095e..d7e0f32fc 100644 --- a/Aaru.Tests/Filesystems/AFS.cs +++ b/Aaru.Tests/Filesystems/AFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Afs diff --git a/Aaru.Tests/Filesystems/AOFS.cs b/Aaru.Tests/Filesystems/AOFS.cs index 6b9c92901..6f077ba1f 100644 --- a/Aaru.Tests/Filesystems/AOFS.cs +++ b/Aaru.Tests/Filesystems/AOFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Aofs diff --git a/Aaru.Tests/Filesystems/Atheos.cs b/Aaru.Tests/Filesystems/Atheos.cs index 17b0dcd9a..93fee2a9c 100644 --- a/Aaru.Tests/Filesystems/Atheos.cs +++ b/Aaru.Tests/Filesystems/Atheos.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class AtheosMbr diff --git a/Aaru.Tests/Filesystems/BeFS.cs b/Aaru.Tests/Filesystems/BeFS.cs index 12196cc20..c6d12ee80 100644 --- a/Aaru.Tests/Filesystems/BeFS.cs +++ b/Aaru.Tests/Filesystems/BeFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class BeFs diff --git a/Aaru.Tests/Filesystems/COHERENT.cs b/Aaru.Tests/Filesystems/COHERENT.cs index 207811502..bc7e96677 100644 --- a/Aaru.Tests/Filesystems/COHERENT.cs +++ b/Aaru.Tests/Filesystems/COHERENT.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Coherent diff --git a/Aaru.Tests/Filesystems/DTFS.cs b/Aaru.Tests/Filesystems/DTFS.cs index 33666f891..b60c525c1 100644 --- a/Aaru.Tests/Filesystems/DTFS.cs +++ b/Aaru.Tests/Filesystems/DTFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Dtfs diff --git a/Aaru.Tests/Filesystems/EAFS.cs b/Aaru.Tests/Filesystems/EAFS.cs index 7afdde3f5..4c9487bad 100644 --- a/Aaru.Tests/Filesystems/EAFS.cs +++ b/Aaru.Tests/Filesystems/EAFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Eafs diff --git a/Aaru.Tests/Filesystems/F2FS.cs b/Aaru.Tests/Filesystems/F2FS.cs index 3bda25def..c208f6efc 100644 --- a/Aaru.Tests/Filesystems/F2FS.cs +++ b/Aaru.Tests/Filesystems/F2FS.cs @@ -28,15 +28,15 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; -using DiscImageChef.Partitions; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; +using Aaru.Partitions; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class F2Fs diff --git a/Aaru.Tests/Filesystems/FAT12.cs b/Aaru.Tests/Filesystems/FAT12.cs index 4972eb8c1..39b7c1a20 100644 --- a/Aaru.Tests/Filesystems/FAT12.cs +++ b/Aaru.Tests/Filesystems/FAT12.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.FAT; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.FAT; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Fat12 diff --git a/Aaru.Tests/Filesystems/FAT16.cs b/Aaru.Tests/Filesystems/FAT16.cs index ce720f0dd..49cc3fe96 100644 --- a/Aaru.Tests/Filesystems/FAT16.cs +++ b/Aaru.Tests/Filesystems/FAT16.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.FAT; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.FAT; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Fat16 diff --git a/Aaru.Tests/Filesystems/FAT32.cs b/Aaru.Tests/Filesystems/FAT32.cs index 363ff3536..ef198d577 100644 --- a/Aaru.Tests/Filesystems/FAT32.cs +++ b/Aaru.Tests/Filesystems/FAT32.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.FAT; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.FAT; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Fat32Apm diff --git a/Aaru.Tests/Filesystems/FATX.cs b/Aaru.Tests/Filesystems/FATX.cs index ae930d0d1..c710a6a6b 100644 --- a/Aaru.Tests/Filesystems/FATX.cs +++ b/Aaru.Tests/Filesystems/FATX.cs @@ -29,18 +29,18 @@ using System; using System.Collections.Generic; using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.FATX; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.DiscImages; +using Aaru.Filesystems.FATX; +using Aaru.Filters; using NUnit.Framework; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; -using FileSystemInfo = DiscImageChef.CommonTypes.Structs.FileSystemInfo; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; +using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class XboxFat diff --git a/Aaru.Tests/Filesystems/HAMMER.cs b/Aaru.Tests/Filesystems/HAMMER.cs index 2e1b88b55..7dfba06bc 100644 --- a/Aaru.Tests/Filesystems/HAMMER.cs +++ b/Aaru.Tests/Filesystems/HAMMER.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class HammerMbr diff --git a/Aaru.Tests/Filesystems/HFS.cs b/Aaru.Tests/Filesystems/HFS.cs index abd5f9f55..f255efbca 100644 --- a/Aaru.Tests/Filesystems/HFS.cs +++ b/Aaru.Tests/Filesystems/HFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Hfs diff --git a/Aaru.Tests/Filesystems/HFSPlus.cs b/Aaru.Tests/Filesystems/HFSPlus.cs index 2b05dee49..f22d4c0f2 100644 --- a/Aaru.Tests/Filesystems/HFSPlus.cs +++ b/Aaru.Tests/Filesystems/HFSPlus.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class HfsPlusApm diff --git a/Aaru.Tests/Filesystems/HFSX.cs b/Aaru.Tests/Filesystems/HFSX.cs index 0cd42b63a..ac34367ad 100644 --- a/Aaru.Tests/Filesystems/HFSX.cs +++ b/Aaru.Tests/Filesystems/HFSX.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class HfsxApm diff --git a/Aaru.Tests/Filesystems/HPFS.cs b/Aaru.Tests/Filesystems/HPFS.cs index 18b61e855..4e13d7a1f 100644 --- a/Aaru.Tests/Filesystems/HPFS.cs +++ b/Aaru.Tests/Filesystems/HPFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Hpfs diff --git a/Aaru.Tests/Filesystems/HPOFS.cs b/Aaru.Tests/Filesystems/HPOFS.cs index 50d43fecb..e434e542f 100644 --- a/Aaru.Tests/Filesystems/HPOFS.cs +++ b/Aaru.Tests/Filesystems/HPOFS.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Hpofs diff --git a/Aaru.Tests/Filesystems/HTFS.cs b/Aaru.Tests/Filesystems/HTFS.cs index 5d00cf9d4..e546c1862 100644 --- a/Aaru.Tests/Filesystems/HTFS.cs +++ b/Aaru.Tests/Filesystems/HTFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Htfs diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs index 4d901d6bc..16acfcbb3 100644 --- a/Aaru.Tests/Filesystems/ISO9660.cs +++ b/Aaru.Tests/Filesystems/ISO9660.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.ISO9660; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.ISO9660; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Iso9660 diff --git a/Aaru.Tests/Filesystems/JFS2.cs b/Aaru.Tests/Filesystems/JFS2.cs index 73f626982..ae0c4eb4a 100644 --- a/Aaru.Tests/Filesystems/JFS2.cs +++ b/Aaru.Tests/Filesystems/JFS2.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Jfs2 diff --git a/Aaru.Tests/Filesystems/LFS.cs b/Aaru.Tests/Filesystems/LFS.cs index 12a891f23..56645ed2d 100644 --- a/Aaru.Tests/Filesystems/LFS.cs +++ b/Aaru.Tests/Filesystems/LFS.cs @@ -29,7 +29,7 @@ using System; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class LfsMbr @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); - Filesystem fs = new DiscImageChef.Filesystems.LFS(); + Filesystem fs = new Aaru.Filesystems.LFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { diff --git a/Aaru.Tests/Filesystems/LisaFS.cs b/Aaru.Tests/Filesystems/LisaFS.cs index 03b6469ba..1b944c991 100644 --- a/Aaru.Tests/Filesystems/LisaFS.cs +++ b/Aaru.Tests/Filesystems/LisaFS.cs @@ -28,14 +28,14 @@ using System; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.LisaFS; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.LisaFS; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class LisaFs diff --git a/Aaru.Tests/Filesystems/Locus.cs b/Aaru.Tests/Filesystems/Locus.cs index 60a11f963..bba5cc411 100644 --- a/Aaru.Tests/Filesystems/Locus.cs +++ b/Aaru.Tests/Filesystems/Locus.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Locus @@ -69,7 +69,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); - IFilesystem fs = new DiscImageChef.Filesystems.Locus(); + IFilesystem fs = new Aaru.Filesystems.Locus(); Partition wholePart = new Partition { Name = "Whole device", diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs index 7522b408f..c34a6a4c5 100644 --- a/Aaru.Tests/Filesystems/MFS.cs +++ b/Aaru.Tests/Filesystems/MFS.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems.AppleMFS; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems.AppleMFS; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Mfs diff --git a/Aaru.Tests/Filesystems/MINIX.cs b/Aaru.Tests/Filesystems/MINIX.cs index f058c7886..7bcb32ee1 100644 --- a/Aaru.Tests/Filesystems/MINIX.cs +++ b/Aaru.Tests/Filesystems/MINIX.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class MinixV1 diff --git a/Aaru.Tests/Filesystems/NILFS2.cs b/Aaru.Tests/Filesystems/NILFS2.cs index a2938018c..e91cd968f 100644 --- a/Aaru.Tests/Filesystems/NILFS2.cs +++ b/Aaru.Tests/Filesystems/NILFS2.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Nilfs2 diff --git a/Aaru.Tests/Filesystems/NTFS.cs b/Aaru.Tests/Filesystems/NTFS.cs index 064862ffc..26d0fd531 100644 --- a/Aaru.Tests/Filesystems/NTFS.cs +++ b/Aaru.Tests/Filesystems/NTFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class NtfsGpt diff --git a/Aaru.Tests/Filesystems/NWFS386.cs b/Aaru.Tests/Filesystems/NWFS386.cs index 4d66b6a68..6ef295d80 100644 --- a/Aaru.Tests/Filesystems/NWFS386.cs +++ b/Aaru.Tests/Filesystems/NWFS386.cs @@ -29,7 +29,7 @@ using System; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Nwfs386 @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); - Filesystem fs = new DiscImageChef.Filesystems.NetWare(); + Filesystem fs = new Aaru.Filesystems.NetWare(); int part = -1; for(int j = 0; j < partitions.Count; j++) { diff --git a/Aaru.Tests/Filesystems/OCFS2.cs b/Aaru.Tests/Filesystems/OCFS2.cs index 26dc00c34..644d1b4e4 100644 --- a/Aaru.Tests/Filesystems/OCFS2.cs +++ b/Aaru.Tests/Filesystems/OCFS2.cs @@ -29,7 +29,7 @@ using System; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Ocfs2 @@ -64,7 +64,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); - Filesystem fs = new DiscImageChef.Filesystems.OCFS2(); + Filesystem fs = new Aaru.Filesystems.OCFS2(); int part = -1; for(int j = 0; j < partitions.Count; j++) { diff --git a/Aaru.Tests/Filesystems/PFS3.cs b/Aaru.Tests/Filesystems/PFS3.cs index ee5646df2..9a105826d 100644 --- a/Aaru.Tests/Filesystems/PFS3.cs +++ b/Aaru.Tests/Filesystems/PFS3.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Pfs3Rdb diff --git a/Aaru.Tests/Filesystems/ProDOS.cs b/Aaru.Tests/Filesystems/ProDOS.cs index a27185df7..649854840 100644 --- a/Aaru.Tests/Filesystems/ProDOS.cs +++ b/Aaru.Tests/Filesystems/ProDOS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class ProdosApm diff --git a/Aaru.Tests/Filesystems/QNX4.cs b/Aaru.Tests/Filesystems/QNX4.cs index e9c88b560..c46eb2aa0 100644 --- a/Aaru.Tests/Filesystems/QNX4.cs +++ b/Aaru.Tests/Filesystems/QNX4.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Qnx4 diff --git a/Aaru.Tests/Filesystems/ReFS.cs b/Aaru.Tests/Filesystems/ReFS.cs index 9be5f9134..36af72d79 100644 --- a/Aaru.Tests/Filesystems/ReFS.cs +++ b/Aaru.Tests/Filesystems/ReFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class ReFsMbr diff --git a/Aaru.Tests/Filesystems/Reiser3.cs b/Aaru.Tests/Filesystems/Reiser3.cs index 5d9826de0..b3a877a03 100644 --- a/Aaru.Tests/Filesystems/Reiser3.cs +++ b/Aaru.Tests/Filesystems/Reiser3.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Reiser3 diff --git a/Aaru.Tests/Filesystems/Reiser4.cs b/Aaru.Tests/Filesystems/Reiser4.cs index 97a0c2d73..031a441a8 100644 --- a/Aaru.Tests/Filesystems/Reiser4.cs +++ b/Aaru.Tests/Filesystems/Reiser4.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Reiser4 @@ -66,7 +66,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]); List partitions = Core.Partitions.GetAll(image); - IFilesystem fs = new DiscImageChef.Filesystems.Reiser4(); + IFilesystem fs = new Aaru.Filesystems.Reiser4(); int part = -1; for(int j = 0; j < partitions.Count; j++) if(partitions[j].Type == "0x83") diff --git a/Aaru.Tests/Filesystems/SFS.cs b/Aaru.Tests/Filesystems/SFS.cs index 500323ce9..c55699d06 100644 --- a/Aaru.Tests/Filesystems/SFS.cs +++ b/Aaru.Tests/Filesystems/SFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class SfsMbr diff --git a/Aaru.Tests/Filesystems/SysV.cs b/Aaru.Tests/Filesystems/SysV.cs index 4bd6b6a85..7c8b4bb8a 100644 --- a/Aaru.Tests/Filesystems/SysV.cs +++ b/Aaru.Tests/Filesystems/SysV.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class SysV diff --git a/Aaru.Tests/Filesystems/UDF.cs b/Aaru.Tests/Filesystems/UDF.cs index 47615bd86..72f4e8894 100644 --- a/Aaru.Tests/Filesystems/UDF.cs +++ b/Aaru.Tests/Filesystems/UDF.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Udf diff --git a/Aaru.Tests/Filesystems/UFS.cs b/Aaru.Tests/Filesystems/UFS.cs index 2e6003242..7816f0b78 100644 --- a/Aaru.Tests/Filesystems/UFS.cs +++ b/Aaru.Tests/Filesystems/UFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Ufs diff --git a/Aaru.Tests/Filesystems/UNIXBFS.cs b/Aaru.Tests/Filesystems/UNIXBFS.cs index d673d420d..84ecf5d63 100644 --- a/Aaru.Tests/Filesystems/UNIXBFS.cs +++ b/Aaru.Tests/Filesystems/UNIXBFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Unixbfs diff --git a/Aaru.Tests/Filesystems/XENIX.cs b/Aaru.Tests/Filesystems/XENIX.cs index fa0b1e6ae..7b28d2396 100644 --- a/Aaru.Tests/Filesystems/XENIX.cs +++ b/Aaru.Tests/Filesystems/XENIX.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Xenix diff --git a/Aaru.Tests/Filesystems/XFS.cs b/Aaru.Tests/Filesystems/XFS.cs index 9992ea090..76aee49a9 100644 --- a/Aaru.Tests/Filesystems/XFS.cs +++ b/Aaru.Tests/Filesystems/XFS.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class XfsMbr diff --git a/Aaru.Tests/Filesystems/Xia.cs b/Aaru.Tests/Filesystems/Xia.cs index 54b8b0a4b..fc28ff27b 100644 --- a/Aaru.Tests/Filesystems/Xia.cs +++ b/Aaru.Tests/Filesystems/Xia.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class XiaMbr diff --git a/Aaru.Tests/Filesystems/ZFS.cs b/Aaru.Tests/Filesystems/ZFS.cs index 4b8985995..4730cef92 100644 --- a/Aaru.Tests/Filesystems/ZFS.cs +++ b/Aaru.Tests/Filesystems/ZFS.cs @@ -27,14 +27,14 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Zfs diff --git a/Aaru.Tests/Filesystems/btrfs.cs b/Aaru.Tests/Filesystems/btrfs.cs index 762124688..066a06fdd 100644 --- a/Aaru.Tests/Filesystems/btrfs.cs +++ b/Aaru.Tests/Filesystems/btrfs.cs @@ -28,15 +28,15 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; -using DiscImageChef.Partitions; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; +using Aaru.Partitions; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Btrfs diff --git a/Aaru.Tests/Filesystems/exFAT.cs b/Aaru.Tests/Filesystems/exFAT.cs index 49e49b545..d511d7b18 100644 --- a/Aaru.Tests/Filesystems/exFAT.cs +++ b/Aaru.Tests/Filesystems/exFAT.cs @@ -28,14 +28,14 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class ExFatApm diff --git a/Aaru.Tests/Filesystems/ext2.cs b/Aaru.Tests/Filesystems/ext2.cs index c5db503e2..58272e1cf 100644 --- a/Aaru.Tests/Filesystems/ext2.cs +++ b/Aaru.Tests/Filesystems/ext2.cs @@ -28,15 +28,15 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Filters; -using DiscImageChef.Partitions; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filesystems; +using Aaru.Filters; +using Aaru.Partitions; using NUnit.Framework; -namespace DiscImageChef.Tests.Filesystems +namespace Aaru.Tests.Filesystems { [TestFixture] public class Ext2 diff --git a/Aaru.Tests/Filters/AppleDoubleDave.cs b/Aaru.Tests/Filters/AppleDoubleDave.cs index 4a73ba344..a6c10626d 100644 --- a/Aaru.Tests/Filters/AppleDoubleDave.cs +++ b/Aaru.Tests/Filters/AppleDoubleDave.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleDave diff --git a/Aaru.Tests/Filters/AppleDoubleDos.cs b/Aaru.Tests/Filters/AppleDoubleDos.cs index b87a6a5ff..0bd6d70e7 100644 --- a/Aaru.Tests/Filters/AppleDoubleDos.cs +++ b/Aaru.Tests/Filters/AppleDoubleDos.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleDos diff --git a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs index 675a131cc..35f728e33 100644 --- a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs +++ b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleNetatalk diff --git a/Aaru.Tests/Filters/AppleDoubleOsX.cs b/Aaru.Tests/Filters/AppleDoubleOsX.cs index 5d36d83f5..53ec86edf 100644 --- a/Aaru.Tests/Filters/AppleDoubleOsX.cs +++ b/Aaru.Tests/Filters/AppleDoubleOsX.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleOsX diff --git a/Aaru.Tests/Filters/AppleDoubleProDos.cs b/Aaru.Tests/Filters/AppleDoubleProDos.cs index c15f1367d..a9a74a9c2 100644 --- a/Aaru.Tests/Filters/AppleDoubleProDos.cs +++ b/Aaru.Tests/Filters/AppleDoubleProDos.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleProDos diff --git a/Aaru.Tests/Filters/AppleDoubleUnAr.cs b/Aaru.Tests/Filters/AppleDoubleUnAr.cs index 7d4b4e8de..121be8e40 100644 --- a/Aaru.Tests/Filters/AppleDoubleUnAr.cs +++ b/Aaru.Tests/Filters/AppleDoubleUnAr.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleUnAr diff --git a/Aaru.Tests/Filters/AppleDoubleUnix.cs b/Aaru.Tests/Filters/AppleDoubleUnix.cs index 0144fe224..52d8ff60c 100644 --- a/Aaru.Tests/Filters/AppleDoubleUnix.cs +++ b/Aaru.Tests/Filters/AppleDoubleUnix.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleDoubleUnix diff --git a/Aaru.Tests/Filters/AppleSingle.cs b/Aaru.Tests/Filters/AppleSingle.cs index 92affad58..67aac1aa5 100644 --- a/Aaru.Tests/Filters/AppleSingle.cs +++ b/Aaru.Tests/Filters/AppleSingle.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class AppleSingle @@ -56,14 +56,14 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckFilterId() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); Assert.AreEqual(true, filter.Identify(location)); } [Test] public void Test() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Assert.AreEqual(true, filter.IsOpened()); Assert.AreEqual(737280, filter.GetDataForkLength()); @@ -77,7 +77,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckContents() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Stream str = filter.GetDataForkStream(); byte[] data = new byte[737280]; @@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckResource() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Stream str = filter.GetResourceForkStream(); byte[] data = new byte[286]; diff --git a/Aaru.Tests/Filters/BZip2.cs b/Aaru.Tests/Filters/BZip2.cs index a696d2a21..bcd562179 100644 --- a/Aaru.Tests/Filters/BZip2.cs +++ b/Aaru.Tests/Filters/BZip2.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class BZip2 @@ -61,14 +61,14 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckFilterId() { - IFilter filter = new DiscImageChef.Filters.BZip2(); + IFilter filter = new Aaru.Filters.BZip2(); Assert.AreEqual(true, filter.Identify(location)); } [Test] public void Test() { - IFilter filter = new DiscImageChef.Filters.BZip2(); + IFilter filter = new Aaru.Filters.BZip2(); filter.Open(location); Assert.AreEqual(true, filter.IsOpened()); Assert.AreEqual(1048576, filter.GetDataForkLength()); @@ -82,7 +82,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckContents() { - IFilter filter = new DiscImageChef.Filters.BZip2(); + IFilter filter = new Aaru.Filters.BZip2(); filter.Open(location); Stream str = filter.GetDataForkStream(); byte[] data = new byte[1048576]; diff --git a/Aaru.Tests/Filters/GZip.cs b/Aaru.Tests/Filters/GZip.cs index 1265cbed9..309be6aa3 100644 --- a/Aaru.Tests/Filters/GZip.cs +++ b/Aaru.Tests/Filters/GZip.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class GZip @@ -61,14 +61,14 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckFilterId() { - IFilter filter = new DiscImageChef.Filters.GZip(); + IFilter filter = new Aaru.Filters.GZip(); Assert.AreEqual(true, filter.Identify(location)); } [Test] public void Test() { - IFilter filter = new DiscImageChef.Filters.GZip(); + IFilter filter = new Aaru.Filters.GZip(); filter.Open(location); Assert.AreEqual(true, filter.IsOpened()); Assert.AreEqual(1048576, filter.GetDataForkLength()); @@ -82,7 +82,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckContents() { - IFilter filter = new DiscImageChef.Filters.GZip(); + IFilter filter = new Aaru.Filters.GZip(); filter.Open(location); Stream str = filter.GetDataForkStream(); byte[] data = new byte[1048576]; diff --git a/Aaru.Tests/Filters/LZip.cs b/Aaru.Tests/Filters/LZip.cs index 9235e97cf..842d6be2a 100644 --- a/Aaru.Tests/Filters/LZip.cs +++ b/Aaru.Tests/Filters/LZip.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class LZip @@ -61,14 +61,14 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckFilterId() { - IFilter filter = new DiscImageChef.Filters.LZip(); + IFilter filter = new Aaru.Filters.LZip(); Assert.AreEqual(true, filter.Identify(location)); } [Test] public void Test() { - IFilter filter = new DiscImageChef.Filters.LZip(); + IFilter filter = new Aaru.Filters.LZip(); filter.Open(location); Assert.AreEqual(true, filter.IsOpened()); Assert.AreEqual(1048576, filter.GetDataForkLength()); @@ -82,7 +82,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckContents() { - IFilter filter = new DiscImageChef.Filters.LZip(); + IFilter filter = new Aaru.Filters.LZip(); filter.Open(location); Stream str = filter.GetDataForkStream(); byte[] data = new byte[1048576]; diff --git a/Aaru.Tests/Filters/MacBinary1.cs b/Aaru.Tests/Filters/MacBinary1.cs index 834886fcb..3b366dd9e 100644 --- a/Aaru.Tests/Filters/MacBinary1.cs +++ b/Aaru.Tests/Filters/MacBinary1.cs @@ -27,11 +27,11 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class MacBinary1 @@ -56,14 +56,14 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckFilterId() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); Assert.AreEqual(true, filter.Identify(location)); } [Test] public void Test() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Assert.AreEqual(true, filter.IsOpened()); Assert.AreEqual(737280, filter.GetDataForkLength()); @@ -77,7 +77,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckContents() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Stream str = filter.GetDataForkStream(); byte[] data = new byte[737280]; @@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filters [Test] public void CheckResource() { - IFilter filter = new DiscImageChef.Filters.AppleSingle(); + IFilter filter = new Aaru.Filters.AppleSingle(); filter.Open(location); Stream str = filter.GetResourceForkStream(); byte[] data = new byte[286]; diff --git a/Aaru.Tests/Filters/MacBinary2.cs b/Aaru.Tests/Filters/MacBinary2.cs index 305551ab1..4c8ca6d55 100644 --- a/Aaru.Tests/Filters/MacBinary2.cs +++ b/Aaru.Tests/Filters/MacBinary2.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class MacBinary2 diff --git a/Aaru.Tests/Filters/MacBinary3.cs b/Aaru.Tests/Filters/MacBinary3.cs index f7f69c40f..7f3ff039a 100644 --- a/Aaru.Tests/Filters/MacBinary3.cs +++ b/Aaru.Tests/Filters/MacBinary3.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class MacBinary3 diff --git a/Aaru.Tests/Filters/PCExchange.cs b/Aaru.Tests/Filters/PCExchange.cs index 1e58b49d9..84c0d1411 100644 --- a/Aaru.Tests/Filters/PCExchange.cs +++ b/Aaru.Tests/Filters/PCExchange.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class PcExchange diff --git a/Aaru.Tests/Filters/XZ.cs b/Aaru.Tests/Filters/XZ.cs index 10a23f61d..e50f6e956 100644 --- a/Aaru.Tests/Filters/XZ.cs +++ b/Aaru.Tests/Filters/XZ.cs @@ -27,12 +27,12 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Filters +namespace Aaru.Tests.Filters { [TestFixture] public class Xz diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs index 56e704349..b3c62b255 100644 --- a/Aaru.Tests/Images/2MG.cs +++ b/Aaru.Tests/Images/2MG.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class Apple2Mg diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs index 2e4746d12..370e6cfb1 100644 --- a/Aaru.Tests/Images/Anex86.cs +++ b/Aaru.Tests/Images/Anex86.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class Anex86 diff --git a/Aaru.Tests/Images/CisCopy.cs b/Aaru.Tests/Images/CisCopy.cs index e12545d19..066e12ef3 100644 --- a/Aaru.Tests/Images/CisCopy.cs +++ b/Aaru.Tests/Images/CisCopy.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class CisCopy diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs index ffa9d4b8e..95f614fd1 100644 --- a/Aaru.Tests/Images/CopyQM.cs +++ b/Aaru.Tests/Images/CopyQM.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class CopyQm diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs index 9eb1f1209..b4784a1a0 100644 --- a/Aaru.Tests/Images/D88.cs +++ b/Aaru.Tests/Images/D88.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class D88 diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs index 95d27d754..f70bc0265 100644 --- a/Aaru.Tests/Images/DART.cs +++ b/Aaru.Tests/Images/DART.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class Dart diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs index 895735000..59eea4ade 100644 --- a/Aaru.Tests/Images/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy42.cs @@ -27,13 +27,13 @@ // ****************************************************************************/ using System.IO; -using DiscImageChef.Checksums; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Filters; +using Aaru.Checksums; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Images +namespace Aaru.Tests.Images { [TestFixture] public class DiskCopy42 diff --git a/Aaru.Tests/Partitions/Acorn.cs b/Aaru.Tests/Partitions/Acorn.cs index 63bb5d041..4b81cff0d 100644 --- a/Aaru.Tests/Partitions/Acorn.cs +++ b/Aaru.Tests/Partitions/Acorn.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Acorn diff --git a/Aaru.Tests/Partitions/AppleMap.cs b/Aaru.Tests/Partitions/AppleMap.cs index 9beec1d0f..0e79d03d4 100644 --- a/Aaru.Tests/Partitions/AppleMap.cs +++ b/Aaru.Tests/Partitions/AppleMap.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class AppleMap diff --git a/Aaru.Tests/Partitions/Atari.cs b/Aaru.Tests/Partitions/Atari.cs index eccb21aef..7634577cc 100644 --- a/Aaru.Tests/Partitions/Atari.cs +++ b/Aaru.Tests/Partitions/Atari.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Atari diff --git a/Aaru.Tests/Partitions/BSD.cs b/Aaru.Tests/Partitions/BSD.cs index 3192b7597..023fad027 100644 --- a/Aaru.Tests/Partitions/BSD.cs +++ b/Aaru.Tests/Partitions/BSD.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Bsd diff --git a/Aaru.Tests/Partitions/GPT.cs b/Aaru.Tests/Partitions/GPT.cs index 43fd89d49..6fbf44fdd 100644 --- a/Aaru.Tests/Partitions/GPT.cs +++ b/Aaru.Tests/Partitions/GPT.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Gpt diff --git a/Aaru.Tests/Partitions/MBR.cs b/Aaru.Tests/Partitions/MBR.cs index 513406319..5cde6c83f 100644 --- a/Aaru.Tests/Partitions/MBR.cs +++ b/Aaru.Tests/Partitions/MBR.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Mbr diff --git a/Aaru.Tests/Partitions/MINIX.cs b/Aaru.Tests/Partitions/MINIX.cs index a46223ecc..1bdc84404 100644 --- a/Aaru.Tests/Partitions/MINIX.cs +++ b/Aaru.Tests/Partitions/MINIX.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Minix diff --git a/Aaru.Tests/Partitions/PC98.cs b/Aaru.Tests/Partitions/PC98.cs index 6dd20b674..e851c6d21 100644 --- a/Aaru.Tests/Partitions/PC98.cs +++ b/Aaru.Tests/Partitions/PC98.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Pc98 diff --git a/Aaru.Tests/Partitions/RDB.cs b/Aaru.Tests/Partitions/RDB.cs index 297749576..922d93bd6 100644 --- a/Aaru.Tests/Partitions/RDB.cs +++ b/Aaru.Tests/Partitions/RDB.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Rdb diff --git a/Aaru.Tests/Partitions/SGI.cs b/Aaru.Tests/Partitions/SGI.cs index be5403975..b74d34d3b 100644 --- a/Aaru.Tests/Partitions/SGI.cs +++ b/Aaru.Tests/Partitions/SGI.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Sgi diff --git a/Aaru.Tests/Partitions/Sun.cs b/Aaru.Tests/Partitions/Sun.cs index 5035bcc91..cd387a78c 100644 --- a/Aaru.Tests/Partitions/Sun.cs +++ b/Aaru.Tests/Partitions/Sun.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { // TODO: Get SunOS and VTOC16 disk labels [TestFixture] diff --git a/Aaru.Tests/Partitions/VTOC.cs b/Aaru.Tests/Partitions/VTOC.cs index 91f3988b4..90ce8b134 100644 --- a/Aaru.Tests/Partitions/VTOC.cs +++ b/Aaru.Tests/Partitions/VTOC.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Vtoc diff --git a/Aaru.Tests/Partitions/Xbox.cs b/Aaru.Tests/Partitions/Xbox.cs index 805770fc6..499ade713 100644 --- a/Aaru.Tests/Partitions/Xbox.cs +++ b/Aaru.Tests/Partitions/Xbox.cs @@ -28,13 +28,13 @@ using System.Collections.Generic; using System.IO; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.DiscImages; +using Aaru.Filters; using NUnit.Framework; -namespace DiscImageChef.Tests.Partitions +namespace Aaru.Tests.Partitions { [TestFixture] public class Xbox diff --git a/Aaru.Wpf.sln b/Aaru.Wpf.sln index 3b4330e8b..9948cc676 100644 --- a/Aaru.Wpf.sln +++ b/Aaru.Wpf.sln @@ -31,10 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filters", "Aaru.Filter EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Core", "Aaru.Core\Aaru.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2ABC1F2-C365-4515-9F23-A5725050CC48}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Compression", "Aaru.Compression\Aaru.Compression.csproj", "{858398D1-7321-4763-8BAB-56BBFEC74E29}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru.Database\Aaru.Database.csproj", "{FA0749B5-EFE0-4148-9545-CD420B45BC36}" @@ -165,22 +161,6 @@ Global {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.Build.0 = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.ActiveCfg = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.Build.0 = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.Build.0 = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.Build.0 = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.ActiveCfg = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.Build.0 = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.ActiveCfg = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.Build.0 = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.Build.0 = Debug|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/Aaru.Wpf/Aaru.Wpf.csproj b/Aaru.Wpf/Aaru.Wpf.csproj index f076321d7..120e0094d 100644 --- a/Aaru.Wpf/Aaru.Wpf.csproj +++ b/Aaru.Wpf/Aaru.Wpf.csproj @@ -6,8 +6,8 @@ AnyCPU {487D1379-B3EE-4242-8740-AD8F04555AD9} WinExe - DiscImageChef.Wpf - DiscImageChef + Aaru.Wpf + Aaru v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -35,7 +35,7 @@ 4 - DiscImageChef.Wpf.Program + Aaru.Wpf.Program diff --git a/Aaru.Wpf/Program.cs b/Aaru.Wpf/Program.cs index 10b3c6943..afdd7e68d 100644 --- a/Aaru.Wpf/Program.cs +++ b/Aaru.Wpf/Program.cs @@ -1,14 +1,14 @@ using System; using System.Reflection; using System.Threading.Tasks; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Gui.Forms; +using Aaru.Core; +using Aaru.Database; +using Aaru.Gui.Forms; using Eto; using Eto.Forms; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Wpf +namespace Aaru.Wpf { class Program { diff --git a/Aaru.Xamarin.sln b/Aaru.Xamarin.sln index c0b01e335..a9b4e559f 100644 --- a/Aaru.Xamarin.sln +++ b/Aaru.Xamarin.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29102.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Gui.XamMac", "Aaru.Gui.XamMac\Aaru.Gui.XamMac.csproj", "{9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru", "Aaru\Aaru.csproj", "{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Checksums", "Aaru.Checksums\Aaru.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Helpers", "Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}" @@ -31,10 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filters", "Aaru.Filter EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Core", "Aaru.Core\Aaru.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2ABC1F2-C365-4515-9F23-A5725050CC48}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Compression", "Aaru.Compression\Aaru.Compression.csproj", "{858398D1-7321-4763-8BAB-56BBFEC74E29}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru.Database\Aaru.Database.csproj", "{FA0749B5-EFE0-4148-9545-CD420B45BC36}" @@ -61,14 +55,6 @@ Global {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|Any CPU.Build.0 = Release|Any CPU {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.ActiveCfg = Release|Any CPU {9E4ACE1A-BA5A-4901-9DC0-71336EFA40DF}.Release|x86.Build.0 = Release|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|x86.ActiveCfg = Debug|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|x86.Build.0 = Debug|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|Any CPU.Build.0 = Release|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|x86.ActiveCfg = Release|Any CPU - {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|x86.Build.0 = Release|Any CPU {CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -165,22 +151,6 @@ Global {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.Build.0 = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.ActiveCfg = Release|Any CPU {679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.Build.0 = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.Build.0 = Debug|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.Build.0 = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.ActiveCfg = Release|Any CPU - {B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.Build.0 = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.ActiveCfg = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.Build.0 = Debug|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU - {A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.Build.0 = Debug|Any CPU {858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj index 059fa96a4..a2eea2c0c 100644 --- a/Aaru/Aaru.csproj +++ b/Aaru/Aaru.csproj @@ -6,7 +6,7 @@ 2.0 {7A4B05BE-73C9-4F34-87FE-E80CCF1F732D} Exe - DiscImageChef + Aaru Aaru $(Version) false diff --git a/Aaru/Commands/Configure.cs b/Aaru/Commands/Configure.cs index fd3432dfa..0972c6dea 100644 --- a/Aaru/Commands/Configure.cs +++ b/Aaru/Commands/Configure.cs @@ -33,11 +33,11 @@ using System; using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Settings; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Settings; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class ConfigureCommand : Command { @@ -107,7 +107,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); DicConsole.WriteLine(); @@ -126,7 +126,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y; #endregion Device reports #region Statistics @@ -149,7 +149,7 @@ namespace DiscImageChef.Commands if(pressedKey.Key == ConsoleKey.Y) { - Settings.Settings.Current.Stats = new StatsSettings(); + Aaru.Settings.Settings.Current.Stats = new StatsSettings(); pressedKey = new ConsoleKeyInfo(); @@ -161,7 +161,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -173,7 +173,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -185,7 +185,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -197,7 +197,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -209,7 +209,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -221,7 +221,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -233,7 +233,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -245,7 +245,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -257,7 +257,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y; pressedKey = new ConsoleKeyInfo(); @@ -269,14 +269,14 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(); } - Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y; + Aaru.Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y; } else - Settings.Settings.Current.Stats = null; + Aaru.Settings.Settings.Current.Stats = null; #endregion Statistics - Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel; - Settings.Settings.SaveSettings(); + Aaru.Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel; + Aaru.Settings.Settings.SaveSettings(); return(int)ErrorNumber.NoError; } diff --git a/Aaru/Commands/Database/DatabaseFamily.cs b/Aaru/Commands/Database/DatabaseFamily.cs index d3212e299..b5dec4948 100644 --- a/Aaru/Commands/Database/DatabaseFamily.cs +++ b/Aaru/Commands/Database/DatabaseFamily.cs @@ -32,7 +32,7 @@ using System.CommandLine; -namespace DiscImageChef.Commands.Filesystem +namespace Aaru.Commands.Filesystem { public class DatabaseFamily : Command { diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs index 3b725f6de..efd555d43 100644 --- a/Aaru/Commands/Database/Statistics.cs +++ b/Aaru/Commands/Database/Statistics.cs @@ -32,13 +32,13 @@ using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Database; +using Aaru.Database.Models; using Command = System.CommandLine.Command; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class StatisticsCommand : Command { @@ -55,7 +55,7 @@ namespace DiscImageChef.Commands if(verbose) DicConsole.VerboseWriteLineEvent += System.Console.WriteLine; - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); if(!ctx.Commands.Any() && !ctx.Filesystems.Any() && diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs index ddc65e2b8..6f4f3f05e 100644 --- a/Aaru/Commands/Database/Update.cs +++ b/Aaru/Commands/Database/Update.cs @@ -35,13 +35,13 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.Diagnostics; using System.IO; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Database; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Core; +using Aaru.Database; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class UpdateCommand : Command { @@ -84,9 +84,9 @@ namespace DiscImageChef.Commands { try { - File.Delete(Settings.Settings.LocalDbPath); + File.Delete(Aaru.Settings.Settings.LocalDbPath); - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Database.Migrate(); ctx.SaveChanges(); } @@ -105,7 +105,7 @@ namespace DiscImageChef.Commands { try { - File.Delete(Settings.Settings.MasterDbPath); + File.Delete(Aaru.Settings.Settings.MasterDbPath); } catch(Exception e) { diff --git a/Aaru/Commands/Device/DeviceFamily.cs b/Aaru/Commands/Device/DeviceFamily.cs index 464e581c4..5effcef4c 100644 --- a/Aaru/Commands/Device/DeviceFamily.cs +++ b/Aaru/Commands/Device/DeviceFamily.cs @@ -32,7 +32,7 @@ using System.CommandLine; -namespace DiscImageChef.Commands.Device +namespace Aaru.Commands.Device { public class DeviceFamily : Command { diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs index 4944a5b4b..83ac76122 100644 --- a/Aaru/Commands/Device/DeviceReport.cs +++ b/Aaru/Commands/Device/DeviceReport.cs @@ -36,22 +36,22 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.IO; using System.Threading; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interop; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interop; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Core; +using Aaru.Database; +using Aaru.Database.Models; +using Aaru.Decoders.SCSI; +using Aaru.Devices; using Newtonsoft.Json; using Command = System.CommandLine.Command; -using DeviceReport = DiscImageChef.Core.Devices.Report.DeviceReport; +using DeviceReport = Aaru.Core.Devices.Report.DeviceReport; -namespace DiscImageChef.Commands.Device +namespace Aaru.Commands.Device { internal class DeviceReportCommand : Command { @@ -88,11 +88,11 @@ namespace DiscImageChef.Commands.Device char.IsLetter(devicePath[0])) devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; - Devices.Device dev; + Aaru.Devices.Device dev; try { - dev = new Devices.Device(devicePath); + dev = new Aaru.Devices.Device(devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, @@ -1265,14 +1265,14 @@ namespace DiscImageChef.Commands.Device jsonSw.Close(); jsonFs.Close(); - using(var ctx = DicContext.Create(Settings.Settings.LocalDbPath)) + using(var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath)) { ctx.Reports.Add(new Report(report)); ctx.SaveChanges(); } // TODO: - if(Settings.Settings.Current.ShareReports) + if(Aaru.Settings.Settings.Current.ShareReports) Remote.SubmitReport(report); return(int)ErrorNumber.NoError; diff --git a/Aaru/Commands/Device/Devices.cs b/Aaru/Commands/Device/Devices.cs index c110c11e9..cf65c1ec3 100644 --- a/Aaru/Commands/Device/Devices.cs +++ b/Aaru/Commands/Device/Devices.cs @@ -33,12 +33,12 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Core; +using Aaru.Devices; -namespace DiscImageChef.Commands.Device +namespace Aaru.Commands.Device { internal class ListDevicesCommand : Command { @@ -67,11 +67,11 @@ namespace DiscImageChef.Commands.Device DicConsole.DebugWriteLine("List-Devices command", "--debug={0}", debug); DicConsole.DebugWriteLine("List-Devices command", "--verbose={0}", verbose); - DeviceInfo[] devices = Devices.Device.ListDevices(out bool isRemote, out string serverApplication, - out string serverVersion, - out string serverOperatingSystem, - out string serverOperatingSystemVersion, - out string serverArchitecture, dicRemoteHost); + DeviceInfo[] devices = Aaru.Devices.Device.ListDevices(out bool isRemote, out string serverApplication, + out string serverVersion, + out string serverOperatingSystem, + out string serverOperatingSystemVersion, + out string serverArchitecture, dicRemoteHost); if(isRemote) { diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs index 06d178a14..5a92662e5 100644 --- a/Aaru/Commands/Device/Info.cs +++ b/Aaru/Commands/Device/Info.cs @@ -35,25 +35,25 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs.Devices.ATA; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; -using DiscImageChef.Decoders.PCMCIA; -using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Devices; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs.Devices.ATA; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Core; +using Aaru.Database; +using Aaru.Database.Models; +using Aaru.Decoders.PCMCIA; +using Aaru.Decoders.SCSI; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Devices; using Command = System.CommandLine.Command; -using DeviceInfo = DiscImageChef.Core.Devices.Info.DeviceInfo; -using Inquiry = DiscImageChef.Decoders.SCSI.Inquiry; -using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; +using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; +using Inquiry = Aaru.Decoders.SCSI.Inquiry; +using Tuple = Aaru.Decoders.PCMCIA.Tuple; -namespace DiscImageChef.Commands.Device +namespace Aaru.Commands.Device { internal class DeviceInfoCommand : Command { @@ -98,11 +98,11 @@ namespace DiscImageChef.Commands.Device char.IsLetter(devicePath[0])) devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; - Devices.Device dev; + Aaru.Devices.Device dev; try { - dev = new Devices.Device(devicePath); + dev = new Aaru.Devices.Device(devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, @@ -231,7 +231,7 @@ namespace DiscImageChef.Commands.Device devInfo.AtaIdentify); Identify.IdentifyDevice? decodedIdentify = Identify.Decode(devInfo.AtaIdentify); - DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(decodedIdentify)); + DicConsole.WriteLine(Aaru.Decoders.ATA.Identify.Prettify(decodedIdentify)); if(devInfo.AtaMcptError.HasValue) { @@ -336,7 +336,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_atapi_identify.bin", "ATAPI IDENTIFY", devInfo.AtapiIdentify); - DicConsole.WriteLine(Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify)); + DicConsole.WriteLine(Aaru.Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify)); } if(devInfo.ScsiInquiry != null) @@ -1045,21 +1045,21 @@ namespace DiscImageChef.Commands.Device { noInfo = false; DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_cid.bin", "MMC CID", devInfo.CID); - DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(devInfo.CID)); + DicConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCID(devInfo.CID)); } if(devInfo.CSD != null) { noInfo = false; DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_csd.bin", "MMC CSD", devInfo.CSD); - DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD)); + DicConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD)); } if(devInfo.OCR != null) { noInfo = false; DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ocr.bin", "MMC OCR", devInfo.OCR); - DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR)); + DicConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR)); } if(devInfo.ExtendedCSD != null) @@ -1069,7 +1069,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ecsd.bin", "MMC Extended CSD", devInfo.ExtendedCSD); - DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD)); + DicConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD)); } if(noInfo) @@ -1088,7 +1088,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_cid.bin", "SecureDigital CID", devInfo.CID); - DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID)); + DicConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID)); } if(devInfo.CSD != null) @@ -1098,7 +1098,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_csd.bin", "SecureDigital CSD", devInfo.CSD); - DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD)); + DicConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD)); } if(devInfo.OCR != null) @@ -1108,7 +1108,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_ocr.bin", "SecureDigital OCR", devInfo.OCR); - DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR)); + DicConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR)); } if(devInfo.SCR != null) @@ -1118,7 +1118,7 @@ namespace DiscImageChef.Commands.Device DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_scr.bin", "SecureDigital SCR", devInfo.SCR); - DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR)); + DicConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR)); } if(noInfo) @@ -1133,10 +1133,10 @@ namespace DiscImageChef.Commands.Device DicConsole.WriteLine(); // Open master database - var ctx = DicContext.Create(Settings.Settings.MasterDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath); // Search for device in master database - Database.Models.Device dbDev = + Aaru.Database.Models.Device dbDev = ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model && d.Revision == dev.FirmwareRevision); diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs index 480411f48..890d4d288 100644 --- a/Aaru/Commands/Filesystem/ExtractFiles.cs +++ b/Aaru/Commands/Filesystem/ExtractFiles.cs @@ -36,15 +36,15 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.IO; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; -using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; +using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; -namespace DiscImageChef.Commands.Filesystem +namespace Aaru.Commands.Filesystem { internal class ExtractFilesCommand : Command { @@ -121,7 +121,7 @@ namespace DiscImageChef.Commands.Filesystem var filtersList = new FiltersList(); IFilter inputFilter = filtersList.GetFilter(imagePath); - Dictionary parsedOptions = Core.Options.Parse(options); + Dictionary parsedOptions = Aaru.Core.Options.Parse(options); DicConsole.DebugWriteLine("Extract-Files command", "Parsed options:"); foreach(KeyValuePair parsedOption in parsedOptions) @@ -222,8 +222,8 @@ namespace DiscImageChef.Commands.Filesystem return(int)ErrorNumber.CannotOpenFormat; } - List partitions = Core.Partitions.GetAll(imageFormat); - Core.Partitions.AddSchemesToStats(partitions); + List partitions = Aaru.Core.Partitions.GetAll(imageFormat); + Aaru.Core.Partitions.AddSchemesToStats(partitions); List idPlugins; IReadOnlyFilesystem plugin; @@ -242,7 +242,7 @@ namespace DiscImageChef.Commands.Filesystem DicConsole.WriteLine("Identifying filesystem on partition"); - Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); @@ -310,7 +310,7 @@ namespace DiscImageChef.Commands.Filesystem Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize }; - Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); diff --git a/Aaru/Commands/Filesystem/FilesystemFamily.cs b/Aaru/Commands/Filesystem/FilesystemFamily.cs index fa6445879..bf9cb48ca 100644 --- a/Aaru/Commands/Filesystem/FilesystemFamily.cs +++ b/Aaru/Commands/Filesystem/FilesystemFamily.cs @@ -32,7 +32,7 @@ using System.CommandLine; -namespace DiscImageChef.Commands.Filesystem +namespace Aaru.Commands.Filesystem { public class FilesystemFamily : Command { diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs index 4ee8dd86d..c90b6fd8f 100644 --- a/Aaru/Commands/Filesystem/Ls.cs +++ b/Aaru/Commands/Filesystem/Ls.cs @@ -36,14 +36,14 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Filesystem +namespace Aaru.Commands.Filesystem { internal class LsCommand : Command { @@ -112,7 +112,7 @@ namespace DiscImageChef.Commands.Filesystem var filtersList = new FiltersList(); IFilter inputFilter = filtersList.GetFilter(imagePath); - Dictionary parsedOptions = Core.Options.Parse(options); + Dictionary parsedOptions = Aaru.Core.Options.Parse(options); DicConsole.DebugWriteLine("Ls command", "Parsed options:"); foreach(KeyValuePair parsedOption in parsedOptions) @@ -195,8 +195,8 @@ namespace DiscImageChef.Commands.Filesystem return(int)ErrorNumber.CannotOpenFormat; } - List partitions = Core.Partitions.GetAll(imageFormat); - Core.Partitions.AddSchemesToStats(partitions); + List partitions = Aaru.Core.Partitions.GetAll(imageFormat); + Aaru.Core.Partitions.AddSchemesToStats(partitions); List idPlugins; IReadOnlyFilesystem plugin; @@ -215,7 +215,7 @@ namespace DiscImageChef.Commands.Filesystem DicConsole.WriteLine("Identifying filesystem on partition"); - Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); @@ -286,7 +286,7 @@ namespace DiscImageChef.Commands.Filesystem Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize }; - Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs index 72487c14c..27dd94c9e 100644 --- a/Aaru/Commands/Filesystem/Options.cs +++ b/Aaru/Commands/Filesystem/Options.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Filesystem +namespace Aaru.Commands.Filesystem { internal class ListOptionsCommand : Command { diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs index 77cee9140..fe02af140 100644 --- a/Aaru/Commands/Formats.cs +++ b/Aaru/Commands/Formats.cs @@ -34,14 +34,14 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Partitions; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; +using Aaru.Partitions; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class FormatsCommand : Command { diff --git a/Aaru/Commands/Image/Analyze.cs b/Aaru/Commands/Image/Analyze.cs index e611a3b69..0200114e9 100644 --- a/Aaru/Commands/Image/Analyze.cs +++ b/Aaru/Commands/Image/Analyze.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class AnalyzeCommand : Command { @@ -185,8 +185,8 @@ namespace DiscImageChef.Commands.Image if(partitions) { - List partitionsList = Core.Partitions.GetAll(imageFormat); - Core.Partitions.AddSchemesToStats(partitionsList); + List partitionsList = Aaru.Core.Partitions.GetAll(imageFormat); + Aaru.Core.Partitions.AddSchemesToStats(partitionsList); if(partitionsList.Count == 0) { @@ -227,7 +227,7 @@ namespace DiscImageChef.Commands.Image DicConsole.WriteLine("Identifying filesystem on partition"); - Core.Filesystems.Identify(imageFormat, out idPlugins, partitionsList[i]); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitionsList[i]); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); @@ -271,7 +271,7 @@ namespace DiscImageChef.Commands.Image Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize }; - Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); + Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart); if(idPlugins.Count == 0) DicConsole.WriteLine("Filesystem not identified"); diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs index 72ce44e52..e4c379da4 100644 --- a/Aaru/Commands/Image/Checksum.cs +++ b/Aaru/Commands/Image/Checksum.cs @@ -34,15 +34,15 @@ using System; using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; using Schemas; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class ChecksumCommand : Command { diff --git a/Aaru/Commands/Image/Compare.cs b/Aaru/Commands/Image/Compare.cs index d9bd25abf..bb1b6acf7 100644 --- a/Aaru/Commands/Image/Compare.cs +++ b/Aaru/Commands/Image/Compare.cs @@ -35,15 +35,15 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; -using ImageInfo = DiscImageChef.CommonTypes.Structs.ImageInfo; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; +using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class CompareCommand : Command { diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs index 7b800b5e7..43d20be1f 100644 --- a/Aaru/Commands/Image/Convert.cs +++ b/Aaru/Commands/Image/Convert.cs @@ -37,19 +37,19 @@ using System.CommandLine.Invocation; using System.IO; using System.Linq; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; using Schemas; -using ImageInfo = DiscImageChef.CommonTypes.Structs.ImageInfo; -using MediaType = DiscImageChef.CommonTypes.MediaType; -using Version = DiscImageChef.CommonTypes.Interop.Version; +using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo; +using MediaType = Aaru.CommonTypes.MediaType; +using Version = Aaru.CommonTypes.Interop.Version; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class ConvertImageCommand : Command { @@ -233,7 +233,7 @@ namespace DiscImageChef.Commands.Image DicConsole.DebugWriteLine("Analyze command", "--resume-file={0}", resumeFile); DicConsole.DebugWriteLine("Analyze command", "--verbose={0}", verbose); - Dictionary parsedOptions = Core.Options.Parse(outputOptions); + Dictionary parsedOptions = Aaru.Core.Options.Parse(outputOptions); DicConsole.DebugWriteLine("Analyze command", "Parsed options:"); foreach(KeyValuePair parsedOption in parsedOptions) diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs index be7a69f3b..4fdf211ed 100644 --- a/Aaru/Commands/Image/CreateSidecar.cs +++ b/Aaru/Commands/Image/CreateSidecar.cs @@ -38,14 +38,14 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; using Schemas; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class CreateSidecarCommand : Command { diff --git a/Aaru/Commands/Image/Decode.cs b/Aaru/Commands/Image/Decode.cs index 3312f0235..aeb010de2 100644 --- a/Aaru/Commands/Image/Decode.cs +++ b/Aaru/Commands/Image/Decode.cs @@ -32,16 +32,16 @@ using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Decoders.ATA; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.SCSI; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; +using Aaru.Decoders.ATA; +using Aaru.Decoders.CD; +using Aaru.Decoders.SCSI; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class DecodeCommand : Command { diff --git a/Aaru/Commands/Image/Entropy.cs b/Aaru/Commands/Image/Entropy.cs index 95f2d5e83..04f3e3764 100644 --- a/Aaru/Commands/Image/Entropy.cs +++ b/Aaru/Commands/Image/Entropy.cs @@ -32,13 +32,13 @@ using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class EntropyCommand : Command { diff --git a/Aaru/Commands/Image/ImageFamily.cs b/Aaru/Commands/Image/ImageFamily.cs index 0b6933532..17cb821d0 100644 --- a/Aaru/Commands/Image/ImageFamily.cs +++ b/Aaru/Commands/Image/ImageFamily.cs @@ -32,7 +32,7 @@ using System.CommandLine; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { public class ImageFamily : Command { diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs index d10ce6058..14676b3f9 100644 --- a/Aaru/Commands/Image/Info.cs +++ b/Aaru/Commands/Image/Info.cs @@ -33,13 +33,13 @@ using System; using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class ImageInfoCommand : Command { diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs index d6eb03e26..166241b67 100644 --- a/Aaru/Commands/Image/Options.cs +++ b/Aaru/Commands/Image/Options.cs @@ -35,13 +35,13 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class ListOptionsCommand : Command { diff --git a/Aaru/Commands/Image/Print.cs b/Aaru/Commands/Image/Print.cs index 89dc29098..0f561c897 100644 --- a/Aaru/Commands/Image/Print.cs +++ b/Aaru/Commands/Image/Print.cs @@ -32,13 +32,13 @@ using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class PrintHexCommand : Command { diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs index ad71749c2..1136e630c 100644 --- a/Aaru/Commands/Image/Verify.cs +++ b/Aaru/Commands/Image/Verify.cs @@ -34,14 +34,14 @@ using System; using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Structs; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands.Image +namespace Aaru.Commands.Image { internal class VerifyCommand : Command { diff --git a/Aaru/Commands/ListEncodings.cs b/Aaru/Commands/ListEncodings.cs index d2c11b0b9..23c95ba57 100644 --- a/Aaru/Commands/ListEncodings.cs +++ b/Aaru/Commands/ListEncodings.cs @@ -35,11 +35,11 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; using System.Text; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class ListEncodingsCommand : Command { diff --git a/Aaru/Commands/ListNamespaces.cs b/Aaru/Commands/ListNamespaces.cs index 67184a197..1b61dd4a9 100644 --- a/Aaru/Commands/ListNamespaces.cs +++ b/Aaru/Commands/ListNamespaces.cs @@ -34,13 +34,13 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.Console; -using DiscImageChef.Core; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.Console; +using Aaru.Core; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class ListNamespacesCommand : Command { diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs index 1c2e3dfef..e07414f1e 100644 --- a/Aaru/Commands/Media/Dump.cs +++ b/Aaru/Commands/Media/Dump.cs @@ -38,18 +38,18 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; -using DiscImageChef.CommonTypes; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Interfaces; -using DiscImageChef.CommonTypes.Metadata; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Core.Devices.Dumping; -using DiscImageChef.Core.Logging; -using DiscImageChef.Devices; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Interfaces; +using Aaru.CommonTypes.Metadata; +using Aaru.Console; +using Aaru.Core; +using Aaru.Core.Devices.Dumping; +using Aaru.Core.Logging; +using Aaru.Devices; using Schemas; -namespace DiscImageChef.Commands.Media +namespace Aaru.Commands.Media { // TODO: Add raw dumping internal class DumpMediaCommand : Command @@ -216,7 +216,7 @@ namespace DiscImageChef.Commands.Media // TODO: Disabled temporarily //DicConsole.DebugWriteLine("Dump-Media command", "--raw={0}", raw); - Dictionary parsedOptions = Core.Options.Parse(options); + Dictionary parsedOptions = Aaru.Core.Options.Parse(options); DicConsole.DebugWriteLine("Dump-Media command", "Parsed options:"); foreach(KeyValuePair parsedOption in parsedOptions) @@ -276,11 +276,11 @@ namespace DiscImageChef.Commands.Media char.IsLetter(devicePath[0])) devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; - Devices.Device dev; + Aaru.Devices.Device dev; try { - dev = new Devices.Device(devicePath); + dev = new Aaru.Devices.Device(devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs index 39b4d795d..fd2bfe670 100644 --- a/Aaru/Commands/Media/Info.cs +++ b/Aaru/Commands/Media/Info.cs @@ -35,31 +35,31 @@ using System.Collections.Generic; using System.CommandLine; using System.CommandLine.Invocation; using System.Linq; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.CommonTypes.Structs; -using DiscImageChef.CommonTypes.Structs.Devices.SCSI; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Core.Devices.Dumping; -using DiscImageChef.Core.Media.Info; -using DiscImageChef.Database; -using DiscImageChef.Database.Models; -using DiscImageChef.Decoders.Bluray; -using DiscImageChef.Decoders.CD; -using DiscImageChef.Decoders.DVD; -using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Decoders.SCSI.SSC; -using DiscImageChef.Decoders.Xbox; -using DiscImageChef.Devices; -using BCA = DiscImageChef.Decoders.Bluray.BCA; -using Cartridge = DiscImageChef.Decoders.DVD.Cartridge; +using Aaru.CommonTypes.Enums; +using Aaru.CommonTypes.Structs; +using Aaru.CommonTypes.Structs.Devices.SCSI; +using Aaru.Console; +using Aaru.Core; +using Aaru.Core.Devices.Dumping; +using Aaru.Core.Media.Info; +using Aaru.Database; +using Aaru.Database.Models; +using Aaru.Decoders.Bluray; +using Aaru.Decoders.CD; +using Aaru.Decoders.DVD; +using Aaru.Decoders.SCSI.MMC; +using Aaru.Decoders.SCSI.SSC; +using Aaru.Decoders.Xbox; +using Aaru.Devices; +using BCA = Aaru.Decoders.Bluray.BCA; +using Cartridge = Aaru.Decoders.DVD.Cartridge; using Command = System.CommandLine.Command; -using DDS = DiscImageChef.Decoders.DVD.DDS; -using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Session = DiscImageChef.Decoders.CD.Session; -using Spare = DiscImageChef.Decoders.DVD.Spare; +using DDS = Aaru.Decoders.DVD.DDS; +using DMI = Aaru.Decoders.Xbox.DMI; +using Session = Aaru.Decoders.CD.Session; +using Spare = Aaru.Decoders.DVD.Spare; -namespace DiscImageChef.Commands.Media +namespace Aaru.Commands.Media { internal class MediaInfoCommand : Command { @@ -104,11 +104,11 @@ namespace DiscImageChef.Commands.Media char.IsLetter(devicePath[0])) devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; - Devices.Device dev; + Aaru.Devices.Device dev; try { - dev = new Devices.Device(devicePath); + dev = new Aaru.Devices.Device(devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, @@ -158,12 +158,12 @@ namespace DiscImageChef.Commands.Media static void DoAtaMediaInfo() => DicConsole.ErrorWriteLine("Please use device-info command for ATA devices."); - static void DoNvmeMediaInfo(string outputPrefix, Devices.Device dev) => + static void DoNvmeMediaInfo(string outputPrefix, Aaru.Devices.Device dev) => throw new NotImplementedException("NVMe devices not yet supported."); static void DoSdMediaInfo() => DicConsole.ErrorWriteLine("Please use device-info command for MMC/SD devices."); - static void DoScsiMediaInfo(bool debug, bool verbose, string outputPrefix, Devices.Device dev) + static void DoScsiMediaInfo(bool debug, bool verbose, string outputPrefix, Aaru.Devices.Device dev) { var scsiInfo = new ScsiInfo(dev); @@ -388,7 +388,7 @@ namespace DiscImageChef.Commands.Media "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDds); DicConsole.WriteLine("Blu-ray Disc Definition Structure:\n{0}", - Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds)); + Aaru.Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds)); } if(scsiInfo.BlurayCartridgeStatus != null) @@ -397,7 +397,7 @@ namespace DiscImageChef.Commands.Media "SCSI READ DISC STRUCTURE", scsiInfo.BlurayCartridgeStatus); DicConsole.WriteLine("Blu-ray Cartridge Status:\n{0}", - Decoders.Bluray.Cartridge.Prettify(scsiInfo.BlurayCartridgeStatus)); + Aaru.Decoders.Bluray.Cartridge.Prettify(scsiInfo.BlurayCartridgeStatus)); } if(scsiInfo.BluraySpareAreaInformation != null) @@ -406,7 +406,7 @@ namespace DiscImageChef.Commands.Media "SCSI READ DISC STRUCTURE", scsiInfo.BluraySpareAreaInformation); DicConsole.WriteLine("Blu-ray Spare Area Information:\n{0}", - Decoders.Bluray.Spare.Prettify(scsiInfo.BluraySpareAreaInformation)); + Aaru.Decoders.Bluray.Spare.Prettify(scsiInfo.BluraySpareAreaInformation)); } if(scsiInfo.BlurayRawDfl != null) @@ -552,10 +552,10 @@ namespace DiscImageChef.Commands.Media bool supportsRwSubchannel = Dump.SupportsRwSubchannel(dev, null, null); // Open master database - var ctx = DicContext.Create(Settings.Settings.MasterDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.MasterDbPath); // Search for device in master database - Database.Models.Device dbDev = + Aaru.Database.Models.Device dbDev = ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model && d.Revision == dev.FirmwareRevision); diff --git a/Aaru/Commands/Media/MediaFamily.cs b/Aaru/Commands/Media/MediaFamily.cs index 339bfded3..bf490c2b8 100644 --- a/Aaru/Commands/Media/MediaFamily.cs +++ b/Aaru/Commands/Media/MediaFamily.cs @@ -32,7 +32,7 @@ using System.CommandLine; -namespace DiscImageChef.Commands.Media +namespace Aaru.Commands.Media { public class MediaFamily : Command { diff --git a/Aaru/Commands/Media/Scan.cs b/Aaru/Commands/Media/Scan.cs index 2a86219a3..16077445b 100644 --- a/Aaru/Commands/Media/Scan.cs +++ b/Aaru/Commands/Media/Scan.cs @@ -32,13 +32,13 @@ using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Core.Devices.Scanning; -using DiscImageChef.Devices; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Core; +using Aaru.Core.Devices.Scanning; +using Aaru.Devices; -namespace DiscImageChef.Commands.Media +namespace Aaru.Commands.Media { internal class MediaScanCommand : Command { @@ -92,11 +92,11 @@ namespace DiscImageChef.Commands.Media char.IsLetter(devicePath[0])) devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':'; - Devices.Device dev; + Aaru.Devices.Device dev; try { - dev = new Devices.Device(devicePath); + dev = new Aaru.Devices.Device(devicePath); if(dev.IsRemote) Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, diff --git a/Aaru/Commands/Remote.cs b/Aaru/Commands/Remote.cs index b7f0f2e6c..979aa4339 100644 --- a/Aaru/Commands/Remote.cs +++ b/Aaru/Commands/Remote.cs @@ -35,12 +35,12 @@ using System; using System.CommandLine; using System.CommandLine.Invocation; -using DiscImageChef.CommonTypes.Enums; -using DiscImageChef.Console; -using DiscImageChef.Core; -using Remote = DiscImageChef.Devices.Remote.Remote; +using Aaru.CommonTypes.Enums; +using Aaru.Console; +using Aaru.Core; +using Remote = Aaru.Devices.Remote.Remote; -namespace DiscImageChef.Commands +namespace Aaru.Commands { internal class RemoteCommand : Command { diff --git a/Aaru/Main.cs b/Aaru/Main.cs index 8db5d31bf..f0ef067b6 100644 --- a/Aaru/Main.cs +++ b/Aaru/Main.cs @@ -38,18 +38,18 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using DiscImageChef.Commands; -using DiscImageChef.Commands.Device; -using DiscImageChef.Commands.Filesystem; -using DiscImageChef.Commands.Image; -using DiscImageChef.Commands.Media; -using DiscImageChef.Console; -using DiscImageChef.Core; -using DiscImageChef.Database; -using DiscImageChef.Settings; +using Aaru.Commands; +using Aaru.Commands.Device; +using Aaru.Commands.Filesystem; +using Aaru.Commands.Image; +using Aaru.Commands.Media; +using Aaru.Console; +using Aaru.Core; +using Aaru.Database; +using Aaru.Settings; using Microsoft.EntityFrameworkCore; -namespace DiscImageChef +namespace Aaru { internal class MainClass { @@ -74,21 +74,21 @@ namespace DiscImageChef DicConsole.WriteEvent += System.Console.Write; DicConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine; - Settings.Settings.LoadSettings(); + Aaru.Settings.Settings.LoadSettings(); - var ctx = DicContext.Create(Settings.Settings.LocalDbPath); + var ctx = DicContext.Create(Aaru.Settings.Settings.LocalDbPath); ctx.Database.Migrate(); ctx.SaveChanges(); bool masterDbUpdate = false; - if(!File.Exists(Settings.Settings.MasterDbPath)) + if(!File.Exists(Aaru.Settings.Settings.MasterDbPath)) { masterDbUpdate = true; UpdateCommand.DoUpdate(true); } - var masterContext = DicContext.Create(Settings.Settings.MasterDbPath); + var masterContext = DicContext.Create(Aaru.Settings.Settings.MasterDbPath); if(masterContext.Database.GetPendingMigrations().Any()) { @@ -96,25 +96,25 @@ namespace DiscImageChef try { - File.Delete(Settings.Settings.MasterDbPath); + File.Delete(Aaru.Settings.Settings.MasterDbPath); } catch(Exception) { DicConsole.ErrorWriteLine("Exception trying to remove old database version, cannot continue..."); - DicConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MasterDbPath); + DicConsole.ErrorWriteLine("Please manually remove file at {0}", Aaru.Settings.Settings.MasterDbPath); } UpdateCommand.DoUpdate(true); } if((args.Length < 1 || args[0].ToLowerInvariant() != "gui") && - Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) + Aaru.Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel) new ConfigureCommand(true, true).Invoke(args); Statistics.LoadStats(); - if(Settings.Settings.Current.Stats != null && - Settings.Settings.Current.Stats.ShareStats) + if(Aaru.Settings.Settings.Current.Stats != null && + Aaru.Settings.Settings.Current.Stats.ShareStats) Task.Run(Statistics.SubmitStats); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); diff --git a/Aaru/Progress.cs b/Aaru/Progress.cs index b83bf2100..5b9986ddc 100644 --- a/Aaru/Progress.cs +++ b/Aaru/Progress.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2020 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Console; +using Aaru.Console; -namespace DiscImageChef +namespace Aaru { static class Progress {