Fix: Fixed issue where date created is updated when the file is updated (#14050)

hishitetsu · web-flow · commit ecdbf29555a5 · 2023-11-24T09:45:10.000-05:00
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -2295,13 +2295,13 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 					var properties = await storageItem.AsBaseStorageFile().GetBasicPropertiesAsync();
 					size = (long)properties.Size;
 					modified = properties.DateModified;
-					created = properties.ItemDate;
+					created = properties.DateCreated;
 				}
 				else if (storageItem.IsOfType(StorageItemTypes.Folder))
 				{
 					var properties = await storageItem.AsBaseStorageFolder().GetBasicPropertiesAsync();
 					modified = properties.DateModified;
-					created = properties.ItemDate;
+					created = properties.DateCreated;
 				}
 
 				return (item, syncStatus, size, created, modified);
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicProperties.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicProperties.cs
@@ -8,7 +8,7 @@ public class BaseBasicProperties : BaseStorageItemExtraProperties
 		public virtual ulong Size
 			=> 0;
 
-		public virtual DateTimeOffset ItemDate
+		public virtual DateTimeOffset DateCreated
 			=> DateTimeOffset.Now;
 
 		public virtual DateTimeOffset DateModified
diff --git a/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs b/src/Files.App/Utils/Storage/StorageBaseItems/BaseBasicStorageItemExtraProperties.cs
@@ -30,7 +30,7 @@ public override IAsyncOperation<IDictionary<string, object>> RetrievePropertiesA
 				var basicProps = ret is not null ? await ret : null;
 
 				props["System.ParsingPath"] = _item?.Path;
-				props["System.DateCreated"] = basicProps?.ItemDate;
+				props["System.DateCreated"] = basicProps?.DateCreated;
 				props["System.DateModified"] = basicProps?.DateModified;
 
 				return props;
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs
@@ -296,20 +296,20 @@ private class FtpFileBasicProperties : BaseBasicProperties
 		{
 			public override ulong Size { get; }
 
-			public override DateTimeOffset ItemDate { get; }
+			public override DateTimeOffset DateCreated { get; }
 			public override DateTimeOffset DateModified { get; }
 
 			public FtpFileBasicProperties(FtpItem item)
 			{
 				Size = (ulong)item.FileSizeBytes;
-				ItemDate = item.ItemDateCreatedReal;
+				DateCreated = item.ItemDateCreatedReal;
 				DateModified = item.ItemDateModifiedReal;
 			}
 
 			public FtpFileBasicProperties(FtpListItem item)
 			{
 				Size = (ulong)item.Size;
-				ItemDate = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;
+				DateCreated = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;
 				DateModified = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;
 			}
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs
@@ -366,14 +366,14 @@ private class FtpFolderBasicProperties : BaseBasicProperties
 		{
 			public override ulong Size { get; }
 
-			public override DateTimeOffset ItemDate { get; }
+			public override DateTimeOffset DateCreated { get; }
 			public override DateTimeOffset DateModified { get; }
 
 			public FtpFolderBasicProperties(FtpListItem item)
 			{
 				Size = (ulong)item.Size;
 
-				ItemDate = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;
+				DateCreated = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;
 				DateModified = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;
 			}
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFile.cs
@@ -182,7 +182,7 @@ private class ShellFileBasicProperties : BaseBasicProperties
 
 			public override ulong Size => file.FileSizeBytes;
 
-			public override DateTimeOffset ItemDate => file.ModifiedDate;
+			public override DateTimeOffset DateCreated => file.CreatedDate;
 			public override DateTimeOffset DateModified => file.ModifiedDate;
 		}
 	}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ShellStorageFolder.cs
@@ -300,7 +300,7 @@ private class ShellFolderBasicProperties : BaseBasicProperties
 
 			public override ulong Size => folder.FileSizeBytes;
 
-			public override DateTimeOffset ItemDate => folder.ModifiedDate;
+			public override DateTimeOffset DateCreated => folder.CreatedDate;
 			public override DateTimeOffset DateModified => folder.ModifiedDate;
 		}
 	}
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFile.cs
@@ -48,7 +48,7 @@ public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
 
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
 			=> AsyncInfo.Run<BaseBasicProperties>(async (cancellationToken)
-				=> new SystemFileBasicProperties(await File.GetBasicPropertiesAsync())
+				=> new SystemFileBasicProperties(await File.GetBasicPropertiesAsync(), DateCreated)
 			);
 
 		public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destinationFolder)
@@ -176,13 +176,18 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 		private class SystemFileBasicProperties : BaseBasicProperties
 		{
 			private readonly IStorageItemExtraProperties basicProps;
+			private readonly DateTimeOffset? dateCreated;
 
 			public override ulong Size => (basicProps as BasicProperties)?.Size ?? 0;
 
-			public override DateTimeOffset ItemDate => (basicProps as BasicProperties)?.ItemDate ?? DateTimeOffset.Now;
+			public override DateTimeOffset DateCreated => dateCreated ?? DateTimeOffset.Now;
 			public override DateTimeOffset DateModified => (basicProps as BasicProperties)?.DateModified ?? DateTimeOffset.Now;
 
-			public SystemFileBasicProperties(IStorageItemExtraProperties basicProps) => this.basicProps = basicProps;
+			public SystemFileBasicProperties(IStorageItemExtraProperties basicProps, DateTimeOffset dateCreated)
+			{
+				this.basicProps = basicProps;
+				this.dateCreated = dateCreated;
+			}
 
 			public override IAsyncOperation<IDictionary<string, object>> RetrievePropertiesAsync(IEnumerable<string> propertiesToRetrieve)
 				=> basicProps.RetrievePropertiesAsync(propertiesToRetrieve);
diff --git a/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/SystemStorageFolder.cs
@@ -37,7 +37,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 		public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
 			=> AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) => new SystemStorageFolder(await Folder.GetParentAsync()));
 		public override IAsyncOperation<BaseBasicProperties> GetBasicPropertiesAsync()
-			=> AsyncInfo.Run<BaseBasicProperties>(async (cancellationToken) => new SystemFolderBasicProperties(await Folder.GetBasicPropertiesAsync()));
+			=> AsyncInfo.Run<BaseBasicProperties>(async (cancellationToken) => new SystemFolderBasicProperties(await Folder.GetBasicPropertiesAsync(), DateCreated));
 
 		public override IAsyncOperation<IndexedState> GetIndexedStateAsync() => Folder.GetIndexedStateAsync();
 
@@ -128,13 +128,18 @@ public override IAsyncOperation<StorageItemThumbnail> GetThumbnailAsync(Thumbnai
 		private class SystemFolderBasicProperties : BaseBasicProperties
 		{
 			private readonly IStorageItemExtraProperties basicProps;
+			private readonly DateTimeOffset? dateCreated;
 
 			public override ulong Size => (basicProps as BasicProperties)?.Size ?? 0;
 
-			public override DateTimeOffset ItemDate => (basicProps as BasicProperties)?.ItemDate ?? DateTimeOffset.Now;
+			public override DateTimeOffset DateCreated => dateCreated ?? DateTimeOffset.Now;
 			public override DateTimeOffset DateModified => (basicProps as BasicProperties)?.DateModified ?? DateTimeOffset.Now;
 
-			public SystemFolderBasicProperties(IStorageItemExtraProperties basicProps) => this.basicProps = basicProps;
+			public SystemFolderBasicProperties(IStorageItemExtraProperties basicProps, DateTimeOffset dateCreated)
+			{
+				this.basicProps = basicProps;
+				this.dateCreated = dateCreated;
+			}
 
 			public override IAsyncOperation<IDictionary<string, object>> RetrievePropertiesAsync(IEnumerable<string> propertiesToRetrieve)
 				=> basicProps.RetrievePropertiesAsync(propertiesToRetrieve);
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs
@@ -526,7 +526,7 @@ private class ZipFileBasicProperties : BaseBasicProperties
 
 			public override DateTimeOffset DateModified => entry.LastWriteTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.LastWriteTime;
 
-			public override DateTimeOffset ItemDate => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
+			public override DateTimeOffset DateCreated => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
 
 			public override ulong Size => entry.Size;
 		}
diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
@@ -653,7 +653,7 @@ private class ZipFolderBasicProperties : BaseBasicProperties
 
 			public override DateTimeOffset DateModified => entry.LastWriteTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.LastWriteTime;
 
-			public override DateTimeOffset ItemDate => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
+			public override DateTimeOffset DateCreated => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;
 
 			public override ulong Size => entry.Size;
 		}
diff --git a/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
@@ -42,7 +42,7 @@ private async Task LoadPreviewAndDetailsAsync()
 			{
 				GetFileProperty("PropertyItemCount", items.Count),
 				GetFileProperty("PropertyDateModified", info.DateModified),
-				GetFileProperty("PropertyDateCreated", info.ItemDate),
+				GetFileProperty("PropertyDateCreated", info.DateCreated),
 				GetFileProperty("PropertyParsingPath", Folder.Path),
 			};
 

Original file line number	Diff line number	Diff line change
`@@ -2295,13 +2295,13 @@ private async Task AddFileOrFolderAsync(ListedItem? item)`
`2295`	`2295`	`var properties = await storageItem.AsBaseStorageFile().GetBasicPropertiesAsync();`
`2296`	`2296`	`size = (long)properties.Size;`
`2297`	`2297`	`modified = properties.DateModified;`
`2298`		`- created = properties.ItemDate;`
	`2298`	`+ created = properties.DateCreated;`
`2299`	`2299`	`}`
`2300`	`2300`	`else if (storageItem.IsOfType(StorageItemTypes.Folder))`
`2301`	`2301`	`{`
`2302`	`2302`	`var properties = await storageItem.AsBaseStorageFolder().GetBasicPropertiesAsync();`
`2303`	`2303`	`modified = properties.DateModified;`
`2304`		`- created = properties.ItemDate;`
	`2304`	`+ created = properties.DateCreated;`
`2305`	`2305`	`}`
`2306`	`2306`
`2307`	`2307`	`return (item, syncStatus, size, created, modified);`
Original file line number	Diff line number	Diff line change
`@@ -296,20 +296,20 @@ private class FtpFileBasicProperties : BaseBasicProperties`
`296`	`296`	`{`
`297`	`297`	`public override ulong Size { get; }`
`298`	`298`
`299`		`- public override DateTimeOffset ItemDate { get; }`
	`299`	`+ public override DateTimeOffset DateCreated { get; }`
`300`	`300`	`public override DateTimeOffset DateModified { get; }`
`301`	`301`
`302`	`302`	`public FtpFileBasicProperties(FtpItem item)`
`303`	`303`	`{`
`304`	`304`	`Size = (ulong)item.FileSizeBytes;`
`305`		`- ItemDate = item.ItemDateCreatedReal;`
	`305`	`+ DateCreated = item.ItemDateCreatedReal;`
`306`	`306`	`DateModified = item.ItemDateModifiedReal;`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`public FtpFileBasicProperties(FtpListItem item)`
`310`	`310`	`{`
`311`	`311`	`Size = (ulong)item.Size;`
`312`		`- ItemDate = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;`
	`312`	`+ DateCreated = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;`
`313`	`313`	`DateModified = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;`
`314`	`314`	`}`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,14 @@ private class FtpFolderBasicProperties : BaseBasicProperties`
`366`	`366`	`{`
`367`	`367`	`public override ulong Size { get; }`
`368`	`368`
`369`		`- public override DateTimeOffset ItemDate { get; }`
	`369`	`+ public override DateTimeOffset DateCreated { get; }`
`370`	`370`	`public override DateTimeOffset DateModified { get; }`
`371`	`371`
`372`	`372`	`public FtpFolderBasicProperties(FtpListItem item)`
`373`	`373`	`{`
`374`	`374`	`Size = (ulong)item.Size;`
`375`	`375`
`376`		`- ItemDate = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;`
	`376`	`+ DateCreated = item.RawCreated < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawCreated;`
`377`	`377`	`DateModified = item.RawModified < DateTime.FromFileTimeUtc(0) ? DateTimeOffset.MinValue : item.RawModified;`
`378`	`378`	`}`
`379`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private class ShellFileBasicProperties : BaseBasicProperties`
`182`	`182`
`183`	`183`	`public override ulong Size => file.FileSizeBytes;`
`184`	`184`
`185`		`- public override DateTimeOffset ItemDate => file.ModifiedDate;`
	`185`	`+ public override DateTimeOffset DateCreated => file.CreatedDate;`
`186`	`186`	`public override DateTimeOffset DateModified => file.ModifiedDate;`
`187`	`187`	`}`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ private class ShellFolderBasicProperties : BaseBasicProperties`
`300`	`300`
`301`	`301`	`public override ulong Size => folder.FileSizeBytes;`
`302`	`302`
`303`		`- public override DateTimeOffset ItemDate => folder.ModifiedDate;`
	`303`	`+ public override DateTimeOffset DateCreated => folder.CreatedDate;`
`304`	`304`	`public override DateTimeOffset DateModified => folder.ModifiedDate;`
`305`	`305`	`}`
`306`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ private class ZipFileBasicProperties : BaseBasicProperties`
`526`	`526`
`527`	`527`	`public override DateTimeOffset DateModified => entry.LastWriteTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.LastWriteTime;`
`528`	`528`
`529`		`- public override DateTimeOffset ItemDate => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;`
	`529`	`+ public override DateTimeOffset DateCreated => entry.CreationTime == DateTime.MinValue ? DateTimeOffset.MinValue : entry.CreationTime;`
`530`	`530`
`531`	`531`	`public override ulong Size => entry.Size;`
`532`	`532`	`}`