From efea6e8b33696e119fcf28feeed399f2f52e25ec Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 23 Dec 2017 03:58:01 +0000 Subject: [PATCH] DOCUMENTATION: Removed unneeded AppleDouble DateTime handler. --- DiscImageChef.Filters/AppleDouble.cs | 4 ++-- DiscImageChef.Filters/AppleSingle.cs | 4 ++-- DiscImageChef.Helpers/DateHandlers.cs | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/DiscImageChef.Filters/AppleDouble.cs b/DiscImageChef.Filters/AppleDouble.cs index 0185ce3d..81b42074 100644 --- a/DiscImageChef.Filters/AppleDouble.cs +++ b/DiscImageChef.Filters/AppleDouble.cs @@ -590,8 +590,8 @@ namespace DiscImageChef.Filters fs.Read(dates_b, 0, 16); AppleDoubleFileDates dates = BigEndianMarshal.ByteArrayToStructureBigEndian(dates_b); - creationTime = DateHandlers.AppleDoubleToDateTime(dates.creationDate); - lastWriteTime = DateHandlers.AppleDoubleToDateTime(dates.modificationDate); + creationTime = DateHandlers.UNIXUnsignedToDateTime(dates.creationDate); + lastWriteTime = DateHandlers.UNIXUnsignedToDateTime(dates.modificationDate); break; case AppleDoubleEntryID.FileInfo: fs.Seek(entry.offset, SeekOrigin.Begin); diff --git a/DiscImageChef.Filters/AppleSingle.cs b/DiscImageChef.Filters/AppleSingle.cs index a8be0c75..783b2060 100644 --- a/DiscImageChef.Filters/AppleSingle.cs +++ b/DiscImageChef.Filters/AppleSingle.cs @@ -315,8 +315,8 @@ namespace DiscImageChef.Filters ms.Read(dates_b, 0, 16); AppleSingleFileDates dates = BigEndianMarshal.ByteArrayToStructureBigEndian(dates_b); - creationTime = DateHandlers.AppleDoubleToDateTime(dates.creationDate); - lastWriteTime = DateHandlers.AppleDoubleToDateTime(dates.modificationDate); + creationTime = DateHandlers.UNIXUnsignedToDateTime(dates.creationDate); + lastWriteTime = DateHandlers.UNIXUnsignedToDateTime(dates.modificationDate); break; case AppleSingleEntryID.FileInfo: ms.Seek(entry.offset, SeekOrigin.Begin); diff --git a/DiscImageChef.Helpers/DateHandlers.cs b/DiscImageChef.Helpers/DateHandlers.cs index 56dda5f5..6fb1b5bf 100644 --- a/DiscImageChef.Helpers/DateHandlers.cs +++ b/DiscImageChef.Helpers/DateHandlers.cs @@ -44,7 +44,6 @@ namespace DiscImageChef // Day 0 of Julian Date system static readonly DateTime JulianEpoch = new DateTime(1858, 11, 17, 0, 0, 0); static readonly DateTime AmigaEpoch = new DateTime(1978, 1, 1, 0, 0, 0); - static readonly DateTime AppleDoubleEpoch = new DateTime(1970, 1, 1, 0, 0, 0); /// /// Converts a Macintosh timestamp to a .NET DateTime @@ -290,12 +289,6 @@ namespace DiscImageChef return temp; } - // TODO: This is unix - public static DateTime AppleDoubleToDateTime(ulong AppleDoubleTimeStamp) - { - return AppleDoubleEpoch.AddSeconds(AppleDoubleTimeStamp); - } - /// /// Converts an ECMA timestamp to a .NET DateTime ///