Merge pull request #132 from EasyAbp/add-HasSubdirectories-property-p2

Add a `File.HasSubdirectories` property: part 2
EasyAbp · Apr 19, 2024 · 9a48a2a · 9a48a2a
2 parents ee1ec9f + f3a47b3
commit 9a48a2a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.3.0-preview.2</Version>
+    <Version>5.3.0-preview.3</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...Abp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs b/...Abp.FileManagement.Application.Contracts/EasyAbp/FileManagement/Files/Dtos/FileInfoDto.cs
@@ -20,6 +20,8 @@ public class FileInfoDto : ExtensibleFullAuditedEntityDto<Guid>
 
         public int SubFilesQuantity { get; set; }
 
+        public bool HasSubdirectories { get; set; }
+
         public long ByteSize { get; set; }
 
         public string Hash { get; set; }

diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/FileEto.cs
@@ -6,28 +6,30 @@ namespace EasyAbp.FileManagement.Files;
 public class FileEto : IFile, IMultiTenant
 {
     public Guid Id { get; set; }
-    
+
     public Guid? TenantId { get; set; }
 
     public Guid? ParentId { get; set; }
-    
+
     public string FileContainerName { get; set; }
 
     public string FileName { get; set; }
 
     public string MimeType { get; set; }
 
     public FileType FileType { get; set; }
-    
+
     public int SubFilesQuantity { get; set; }
 
+    public bool HasSubdirectories { get; set; }
+
     public long ByteSize { get; set; }
 
     public string Hash { get; set; }
 
     public string BlobName { get; set; }
-    
+
     public Guid? OwnerUserId { get; set; }
-        
+
     public string Flag { get; set; }
 }
diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Files/IFile.cs
@@ -22,6 +22,8 @@ public interface IFile
 
     int SubFilesQuantity { get; }
 
+    bool HasSubdirectories { get; }
+
     long ByteSize { get; }
 
     [CanBeNull]

diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/en.json
@@ -12,7 +12,8 @@
     "FileFileContainerName": "File container name",
     "FileMimeType": "Mime type",
     "FileFileType": "File type",
-    "FileSubFilesQuantity": "Sub files quantity",
+    "FileSubFilesQuantity": "Files count",
+    "FileHasSubdirectories": "Has subdirectories",
     "FileByteSize": "Size",
     "FileHash": "Hash",
     "FileParentId": "Parent ID",

diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hans.json
@@ -17,6 +17,7 @@
     "FileMimeType": "Mime 类型",
     "FileFileType": "文件类型",
     "FileSubFilesQuantity": "子文件数量",
+    "FileHasSubdirectories": "包含子文件夹",
     "FileByteSize": "大小",
     "FileHash": "哈希值",
     "FileParentId": "父目录 ID",

diff --git a/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json b/src/EasyAbp.FileManagement.Domain.Shared/EasyAbp/FileManagement/Localization/zh-Hant.json
@@ -13,6 +13,7 @@
     "FileMimeType": "Mime 類型",
     "FileFileType": "文件類型",
     "FileSubFilesQuantity": "子文件數量",
+    "FileHasSubdirectories": "包含子資料夾",
     "FileByteSize": "大小",
     "FileHash": "哈希值",
     "FileParentId": "父目錄 ID",