Skip to content

Commit 994cd72

Browse files
committed
extend the file and directory models
1 parent ac27ec6 commit 994cd72

File tree

10 files changed

+23
-31
lines changed

10 files changed

+23
-31
lines changed

FileSystem.Adapters.AmazonS3/src/ModelFactory.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public static FileModel CreateFile(GetObjectResponse file)
1414
Name = file.Key.Split('/').Last(),
1515
Path = file.Key,
1616
Length = file.ContentLength,
17-
LastWriteTime = file.LastModified,
18-
LastWriteTimeUtc = file.LastModified.ToUniversalTime()
17+
LastModifiedDateTime = file.LastModified,
1918
};
2019
}
2120

@@ -26,8 +25,7 @@ public static FileModel CreateFile(S3Object file)
2625
Name = file.Key.Split('/').Last(),
2726
Path = file.Key,
2827
Length = file.Size,
29-
LastWriteTime = file.LastModified,
30-
LastWriteTimeUtc = file.LastModified.ToUniversalTime()
28+
LastModifiedDateTime = file.LastModified
3129
};
3230
}
3331

@@ -45,8 +43,7 @@ public static DirectoryModel CreateDirectory(S3Object directory)
4543
{
4644
Name = name.Substring(0, name.Length - 1),
4745
Path = directory.Key.Substring(0, name.Length - 1),
48-
LastWriteTime = directory.LastModified,
49-
LastWriteTimeUtc = directory.LastModified.ToUniversalTime()
46+
LastModifiedDateTime = directory.LastModified
5047
};
5148
}
5249
}

FileSystem.Adapters.AzureBlobStorage/src/ModelFactory.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public static FileModel CreateFile(BlobItem file)
1111
{
1212
Name = file.Name,
1313
Path = file.Name,
14-
Length = (long) file.Properties.ContentLength!,
15-
LastWriteTime = file.Properties.LastModified!.Value.DateTime,
16-
LastWriteTimeUtc = file.Properties.LastModified.Value.UtcDateTime
14+
Length = file.Properties.ContentLength,
15+
LastModifiedDateTime = file.Properties.LastModified?.DateTime,
16+
CreatedDateTime = file.Properties.CreatedOn?.DateTime
1717
};
1818
}
1919

FileSystem.Adapters.AzureFileStorage/src/ModelFactory.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public static FileModel CreateFile(ShareFileClient file)
1414
Name = file.Name,
1515
Path = file.Path,
1616
Length = fileProperties.ContentLength,
17-
LastWriteTime = fileProperties.LastModified.DateTime,
18-
LastWriteTimeUtc = fileProperties.LastModified.UtcDateTime
17+
LastModifiedDateTime = fileProperties.LastModified.DateTime,
1918
};
2019
}
2120

@@ -27,8 +26,7 @@ public static DirectoryModel CreateDirectory(ShareDirectoryClient directory)
2726
{
2827
Name = directory.Name,
2928
Path = directory.Path,
30-
LastWriteTime = directoryProperties.LastModified.DateTime,
31-
LastWriteTimeUtc = directoryProperties.LastModified.UtcDateTime
29+
LastModifiedDateTime = directoryProperties.LastModified.DateTime
3230
};
3331
}
3432
}

FileSystem.Adapters.Dropbox/src/ModelFactory.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ public static FileModel CreateFile(Metadata file)
1212
Name = file.Name,
1313
Path = file.PathDisplay,
1414
Length = (long) file.AsFile.Size,
15-
LastWriteTime = file.AsFile.ServerModified,
16-
LastWriteTimeUtc = file.AsFile.ServerModified.ToUniversalTime()
15+
LastModifiedDateTime = file.AsFile.ServerModified
1716
};
1817
}
1918

FileSystem.Adapters.Sftp/src/ModelFactory.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ public static IFile CreateFile(SftpFile file)
1212
Name = file.Name,
1313
Path = file.FullName,
1414
Length = file.Length,
15-
LastWriteTime = file.LastWriteTime,
16-
LastWriteTimeUtc = file.LastWriteTimeUtc
15+
LastModifiedDateTime = file.LastWriteTime
1716
};
1817
}
1918

@@ -23,8 +22,7 @@ public static DirectoryModel CreateDirectory(SftpFile directory)
2322
{
2423
Name = directory.Name,
2524
Path = directory.FullName,
26-
LastWriteTime = directory.LastWriteTime,
27-
LastWriteTimeUtc = directory.LastWriteTimeUtc
25+
LastModifiedDateTime = directory.LastWriteTime
2826
};
2927
}
3028
}

FileSystem/src/Models/DirectoryModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public DirectoryModel(DirectoryInfo directory)
1212
{
1313
Name = directory.Name;
1414
Path = directory.FullName;
15-
LastWriteTime = directory.LastWriteTime;
16-
LastWriteTimeUtc = directory.LastWriteTimeUtc;
15+
LastModifiedDateTime = directory.LastWriteTime;
16+
CreatedDateTime = directory.CreationTime;
1717
}
1818
}
1919
}

FileSystem/src/Models/FileModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace SharpGrip.FileSystem.Models
44
{
55
public class FileModel : Model, IFile
66
{
7-
public long Length { get; set; }
7+
public long? Length { get; set; }
88

99
public FileModel()
1010
{
@@ -15,8 +15,8 @@ public FileModel(FileInfo file)
1515
Name = file.Name;
1616
Path = file.FullName;
1717
Length = file.Length;
18-
LastWriteTime = file.LastWriteTime;
19-
LastWriteTimeUtc = file.LastWriteTimeUtc;
18+
LastModifiedDateTime = file.LastWriteTime;
19+
CreatedDateTime = file.CreationTime;
2020
}
2121
}
2222
}

FileSystem/src/Models/IDirectory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public interface IDirectory
66
{
77
public string Name { get; set; }
88
public string Path { get; set; }
9-
public DateTime LastWriteTime { get; set; }
10-
public DateTime LastWriteTimeUtc { get; set; }
9+
public DateTime? LastModifiedDateTime { get; set; }
10+
public DateTime? CreatedDateTime { get; set; }
1111
}
1212
}

FileSystem/src/Models/IFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ public interface IFile
66
{
77
public string Name { get; set; }
88
public string Path { get; set; }
9-
public long Length { get; set; }
10-
public DateTime LastWriteTime { get; set; }
11-
public DateTime LastWriteTimeUtc { get; set; }
9+
public long? Length { get; set; }
10+
public DateTime? LastModifiedDateTime { get; set; }
11+
public DateTime? CreatedDateTime { get; set; }
1212
}
1313
}

FileSystem/src/Models/Model.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public abstract class Model
66
{
77
public string Name { get; set; } = "";
88
public string Path { get; set; } = "";
9-
public DateTime LastWriteTime {get; set; }
10-
public DateTime LastWriteTimeUtc {get; set; }
9+
public DateTime? LastModifiedDateTime {get; set; }
10+
public DateTime? CreatedDateTime {get; set; }
1111
}
1212
}

0 commit comments

Comments
 (0)