Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Library/DiscUtils.Btrfs/Base/TimeSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ internal class TimeSpec : IByteArraySerializable
/// </summary>
public uint Nanoseconds { get; internal set; }

public DateTimeOffset Value => DateTimeOffset.FromUnixTimeSeconds(Seconds).AddTicks(Nanoseconds / 100);
public DateTimeOffset Value => DateTimeOffset.FromUnixTimeSeconds(Seconds).AddTicks(Nanoseconds / 100).UtcDateTime;

public int Size => Length;

public DateTimeOffset DateTime => DateTimeOffset.FromUnixTimeSeconds(Seconds).AddTicks(Nanoseconds / 100);
public DateTimeOffset DateTime => DateTimeOffset.FromUnixTimeSeconds(Seconds).AddTicks(Nanoseconds / 100).UtcDateTime;

public int ReadFrom(ReadOnlySpan<byte> buffer)
{
Expand Down
6 changes: 3 additions & 3 deletions Library/DiscUtils.Core/Archives/TarHeader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public TarHeader(ReadOnlySpan<byte> buffer)
OwnerId = (int)OctalToLong(ReadNullTerminatedString(buffer.Slice(108, 8)));
GroupId = (int)OctalToLong(ReadNullTerminatedString(buffer.Slice(116, 8)));
FileLength = ParseFileLength(buffer.Slice(124, 12));
ModificationTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(136, 12))));
ModificationTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(136, 12)))).UtcDateTime;
CheckSum = (int)OctalToLong(ReadNullTerminatedString(buffer.Slice(148, 8)));
FileType = (TarFileType)buffer[156];
LinkName = latin1Encoding.GetString(ReadNullTerminatedString(buffer.Slice(157, 100)));
Expand All @@ -93,8 +93,8 @@ public TarHeader(ReadOnlySpan<byte> buffer)
FileName = $"{latin1Encoding.GetString(prefix)}/{FileName}";
}

LastAccessTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(476, 12))));
CreationTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(488, 12))));
LastAccessTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(476, 12)))).UtcDateTime;
CreationTime = DateTimeOffset.FromUnixTimeSeconds((uint)OctalToLong(ReadNullTerminatedString(buffer.Slice(488, 12)))).UtcDateTime;
}

public static bool IsValid(ReadOnlySpan<byte> buffer)
Expand Down
8 changes: 4 additions & 4 deletions Library/DiscUtils.Ext/File.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ public File(Context context, uint inodeNum, Inode inode)

public DateTime LastAccessTimeUtc
{
get => DateTimeOffset.FromUnixTimeSeconds(Inode.AccessTime).DateTime;
get => DateTimeOffset.FromUnixTimeSeconds(Inode.AccessTime).UtcDateTime;

set => throw new NotImplementedException();
}

public DateTime LastWriteTimeUtc
{
get => DateTimeOffset.FromUnixTimeSeconds(Inode.ModificationTime).DateTime;
get => DateTimeOffset.FromUnixTimeSeconds(Inode.ModificationTime).UtcDateTime;

set => throw new NotImplementedException();
}

public DateTime CreationTimeUtc
{
get => DateTimeOffset.FromUnixTimeSeconds(Inode.CreationTime).DateTime;
get => DateTimeOffset.FromUnixTimeSeconds(Inode.CreationTime).UtcDateTime;

set => throw new NotImplementedException();
}
Expand Down Expand Up @@ -114,4 +114,4 @@ private static FileAttributes FromMode(uint mode)
{
return Utilities.FileAttributesFromUnixFileType((UnixFileType)((mode >> 12) & 0xF));
}
}
}
2 changes: 1 addition & 1 deletion Library/DiscUtils.Lvm/Metadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ internal static DateTime ParseDateTimeValue(ReadOnlySpan<char> value)
return DateTime.MaxValue;
}

return DateTimeOffset.FromUnixTimeSeconds((long)numeric).DateTime;
return DateTimeOffset.FromUnixTimeSeconds((long)numeric).UtcDateTime;
}

internal static ulong ParseNumericValue(ReadOnlySpan<char> value)
Expand Down
2 changes: 1 addition & 1 deletion Library/DiscUtils.SquashFs/Inode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public virtual int ReadFrom(ReadOnlySpan<byte> buffer)
Mode = EndianUtilities.ToUInt16LittleEndian(buffer.Slice(2));
UidKey = EndianUtilities.ToUInt16LittleEndian(buffer.Slice(4));
GidKey = EndianUtilities.ToUInt16LittleEndian(buffer.Slice(6));
ModificationTime = DateTimeOffset.FromUnixTimeSeconds(EndianUtilities.ToUInt32LittleEndian(buffer.Slice(8))).DateTime;
ModificationTime = DateTimeOffset.FromUnixTimeSeconds(EndianUtilities.ToUInt32LittleEndian(buffer.Slice(8))).UtcDateTime;
InodeNumber = EndianUtilities.ToUInt32LittleEndian(buffer.Slice(12));
return 16;
}
Expand Down
2 changes: 1 addition & 1 deletion Library/DiscUtils.SquashFs/SuperBlock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public int ReadFrom(ReadOnlySpan<byte> buffer)
}

InodesCount = EndianUtilities.ToUInt32LittleEndian(buffer.Slice(4));
CreationTime = DateTimeOffset.FromUnixTimeSeconds(EndianUtilities.ToUInt32LittleEndian(buffer.Slice(8))).DateTime;
CreationTime = DateTimeOffset.FromUnixTimeSeconds(EndianUtilities.ToUInt32LittleEndian(buffer.Slice(8))).UtcDateTime;
BlockSize = EndianUtilities.ToUInt32LittleEndian(buffer.Slice(12));
FragmentsCount = EndianUtilities.ToUInt32LittleEndian(buffer.Slice(16));
Compression = (SquashFileSystemCompressionKind)EndianUtilities.ToUInt16LittleEndian(buffer.Slice(20));
Expand Down
2 changes: 1 addition & 1 deletion Library/DiscUtils.Xfs/Inode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private static DateTime ReadTimestamp(ReadOnlySpan<byte> buffer)
{
var seconds = EndianUtilities.ToUInt32BigEndian(buffer);
var nanoSeconds = EndianUtilities.ToUInt32BigEndian(buffer.Slice(4));
return DateTimeOffset.FromUnixTimeSeconds(seconds).AddTicks(nanoSeconds / 100).LocalDateTime;
return DateTimeOffset.FromUnixTimeSeconds(seconds).AddTicks(nanoSeconds / 100).UtcDateTime;
}

void IByteArraySerializable.WriteTo(Span<byte> buffer)
Expand Down