haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added NTFS to the source items and restore provider

Browse Source
This commit is contained in:
Carl Johnsen
2026-03-24 19:26:35 +01:00
parent 9e81d2ca9c
commit 4a044e53d2
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proprietary/DiskImage/RestoreProvider.cs
+2
View File
@@ -13,6 +13,7 @@ using Duplicati.Library.Utility;
using Duplicati.Proprietary.DiskImage.Disk;
using Duplicati.Proprietary.DiskImage.Filesystem;
using Duplicati.Proprietary.DiskImage.Filesystem.Fat32;
using Duplicati.Proprietary.DiskImage.Filesystem.Ntfs;
using Duplicati.Proprietary.DiskImage.General;
using Duplicati.Proprietary.DiskImage.Partition;
@@ -778,6 +779,7 @@ public sealed class RestoreProvider : IRestoreDestinationProviderModule, IDispos
return fsGeom.Type switch
{
FileSystemType.FAT32 => new Fat32Filesystem(partition, fsGeom.BlockSize),
FileSystemType.NTFS => new NtfsFilesystem(partition, fsGeom.BlockSize),
_ => new UnknownFilesystem(partition, fsGeom.BlockSize)
};
}
proprietary/DiskImage/SourceItems/FilesystemSourceEntry.cs
+14 -4
View File
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Duplicati.Library.Interface;
using Duplicati.Proprietary.DiskImage.Filesystem;
using Duplicati.Proprietary.DiskImage.Filesystem.Fat32;
using Duplicati.Proprietary.DiskImage.Filesystem.Ntfs;
using Duplicati.Proprietary.DiskImage.General;
namespace Duplicati.Proprietary.DiskImage.SourceItems;
@@ -50,13 +51,11 @@ internal class FilesystemSourceEntry(string parentPath, IFilesystem filesystem)
int blockSize = 1024 * 1024; // Default 1MB blocks
if (fsMetadata is UnkownFilesystemMetadata unknownMeta)
{
blockSize = unknownMeta.BlockSize;
}
else if (fsMetadata is Fat32FilesystemMetadata fat32Meta)
{
blockSize = fat32Meta.BlockSize;
}
else if (fsMetadata is NtfsFilesystemMetadata ntfsMeta)
blockSize = ntfsMeta.BlockSize;
return new FilesystemGeometry
{
@@ -101,6 +100,17 @@ internal class FilesystemSourceEntry(string parentPath, IFilesystem filesystem)
metadata["filesystem:AllocatedClusters"] = fat32Meta.AllocatedClusters.ToString();
metadata["filesystem:FreeClusters"] = fat32Meta.FreeClusters.ToString();
}
// For NTFS, extract cluster and MFT information
else if (fsMetadata is NtfsFilesystemMetadata ntfsMeta)
{
metadata["filesystem:BlockSize"] = ntfsMeta.BlockSize.ToString();
metadata["filesystem:ClusterSize"] = ntfsMeta.ClusterSize.ToString();
metadata["filesystem:TotalClusters"] = ntfsMeta.TotalClusters.ToString();
metadata["filesystem:AllocatedClusters"] = ntfsMeta.AllocatedClusters.ToString();
metadata["filesystem:FreeClusters"] = ntfsMeta.FreeClusters.ToString();
metadata["filesystem:MftRecordSize"] = ntfsMeta.MftRecordSize.ToString();
metadata["filesystem:HasJournal"] = ntfsMeta.HasJournal.ToString();
}
}
}
catch
proprietary/DiskImage/SourceItems/PartitionSourceEntry.cs
+2
View File
@@ -12,6 +12,7 @@ using Duplicati.Proprietary.DiskImage.Filesystem;
using Duplicati.Library.Utility;
using Duplicati.Proprietary.DiskImage.General;
using Duplicati.Proprietary.DiskImage.Filesystem.Fat32;
using Duplicati.Proprietary.DiskImage.Filesystem.Ntfs;
namespace Duplicati.Proprietary.DiskImage.SourceItems;
@@ -46,6 +47,7 @@ internal class PartitionSourceEntry(string parentPath, IPartition partition, boo
: partition.FilesystemType switch
{
FileSystemType.FAT32 => new Fat32Filesystem(partition),
FileSystemType.NTFS => new NtfsFilesystem(partition),
_ => new UnknownFilesystem(partition)
};
yield return new FilesystemSourceEntry(this.Path, fs);