mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Make sure that device partitions are handled if they're not
mapped by any scheme.
This commit is contained in:
@@ -134,6 +134,21 @@ namespace DiscImageChef.Core
|
|||||||
DicConsole.DebugWriteLine("Partitions", "Got {0} partitions", childPartitions.Count);
|
DicConsole.DebugWriteLine("Partitions", "Got {0} partitions", childPartitions.Count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Be sure that device partitions are not excluded if not mapped by any scheme...
|
||||||
|
if(image.ImageInfo.imageHasPartitions)
|
||||||
|
{
|
||||||
|
List<ulong> startLocations = new List<ulong>();
|
||||||
|
|
||||||
|
foreach(Partition detectedPartition in childPartitions)
|
||||||
|
startLocations.Add(detectedPartition.Start);
|
||||||
|
|
||||||
|
foreach(Partition imagePartition in image.GetPartitions())
|
||||||
|
{
|
||||||
|
if(!startLocations.Contains(imagePartition.Start))
|
||||||
|
childPartitions.Add(imagePartition);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Partition[] childArray = childPartitions.OrderBy(part => part.Start).ThenBy(part => part.Length).ThenBy(part => part.Scheme).ToArray();
|
Partition[] childArray = childPartitions.OrderBy(part => part.Start).ThenBy(part => part.Length).ThenBy(part => part.Scheme).ToArray();
|
||||||
|
|
||||||
for(long i = 0; i < childArray.LongLength; i++)
|
for(long i = 0; i < childArray.LongLength; i++)
|
||||||
|
|||||||
@@ -539,10 +539,6 @@ namespace DiscImageChef.Core
|
|||||||
xmlTrk.FileSystemInformation = new PartitionType[1];
|
xmlTrk.FileSystemInformation = new PartitionType[1];
|
||||||
if(partitions.Count > 0)
|
if(partitions.Count > 0)
|
||||||
{
|
{
|
||||||
partitions.Add(new Partition {
|
|
||||||
Start = (ulong)xmlTrk.StartSector,
|
|
||||||
Length = (ulong)((xmlTrk.EndSector - xmlTrk.StartSector) + 1)
|
|
||||||
});
|
|
||||||
xmlTrk.FileSystemInformation = new PartitionType[partitions.Count];
|
xmlTrk.FileSystemInformation = new PartitionType[partitions.Count];
|
||||||
for(int i = 0; i < partitions.Count; i++)
|
for(int i = 0; i < partitions.Count; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
41
DiscImageChef.Filesystems/Fossil.cs
Normal file
41
DiscImageChef.Filesystems/Fossil.cs
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
// /***************************************************************************
|
||||||
|
// The Disc Image Chef
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// Filename : Fossil.cs
|
||||||
|
// Author(s) : Natalia Portillo <claunia@claunia.com>
|
||||||
|
//
|
||||||
|
// Component : Component
|
||||||
|
//
|
||||||
|
// --[ Description ] ----------------------------------------------------------
|
||||||
|
//
|
||||||
|
// Description
|
||||||
|
//
|
||||||
|
// --[ License ] --------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as
|
||||||
|
// published by the Free Software Foundation; either version 2.1 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful, but
|
||||||
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
//
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// Copyright © 2011-2017 Natalia Portillo
|
||||||
|
// ****************************************************************************/
|
||||||
|
using System;
|
||||||
|
namespace DiscImageChef.Filesystems
|
||||||
|
{
|
||||||
|
public class Fossil
|
||||||
|
{
|
||||||
|
public Fossil()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
41
DiscImageChef.Partitions/Plan9.cs
Normal file
41
DiscImageChef.Partitions/Plan9.cs
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
// /***************************************************************************
|
||||||
|
// The Disc Image Chef
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// Filename : Plan9.cs
|
||||||
|
// Author(s) : Natalia Portillo <claunia@claunia.com>
|
||||||
|
//
|
||||||
|
// Component : Component
|
||||||
|
//
|
||||||
|
// --[ Description ] ----------------------------------------------------------
|
||||||
|
//
|
||||||
|
// Description
|
||||||
|
//
|
||||||
|
// --[ License ] --------------------------------------------------------------
|
||||||
|
//
|
||||||
|
// This library is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as
|
||||||
|
// published by the Free Software Foundation; either version 2.1 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This library is distributed in the hope that it will be useful, but
|
||||||
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
// Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
|
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
//
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// Copyright © 2011-2017 Natalia Portillo
|
||||||
|
// ****************************************************************************/
|
||||||
|
using System;
|
||||||
|
namespace DiscImageChef.Partitions
|
||||||
|
{
|
||||||
|
public class Plan9
|
||||||
|
{
|
||||||
|
public Plan9()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user