Skip to content

Commit 38198f3

Browse files
NikoPenev21NikoPenev21
committed
chore: refactor the code, apply feedback
1 parent ef8a321 commit 38198f3

File tree

9 files changed

+333
-192
lines changed

9 files changed

+333
-192
lines changed

‎KendoUI.FileManager.BlobStorage/KendoUI.FileManager.BlobStorage/Controllers/HomeController.cs‎

Lines changed: 75 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using KendoUI.FileManager.BlobStorage.Models;
2-
using KendoUI.FileManager.BlobStorage.Helpers;
32
using Microsoft.AspNetCore.Mvc;
43
using KendoUI.FileManager.BlobStorage.Services;
54
using System.Diagnostics;
5+
using System.Text.Json;
66

77
namespace KendoUI.FileManager.BlobStorage.Controllers
88
{
@@ -47,11 +47,12 @@ public IActionResult Error()
4747

4848
// Handles reading files and folders from Azure Blob Storage for the FileManager
4949
[HttpPost]
50-
public async Task<IActionResult> FileManager_Read([FromForm] string target)
50+
public async Task<IActionResult> FileManager_Read([FromForm] FileManagerReadRequest request)
5151
{
5252
try
5353
{
5454
// Retrieve the list of blobs/folders from the specified path
55+
var target = NormalizePath(request.Target ?? request.Path ?? string.Empty);
5556
var files = await _fileManagerService.ReadAsync(target);
5657
return Json(files);
5758
}
@@ -64,12 +65,25 @@ public async Task<IActionResult> FileManager_Read([FromForm] string target)
6465

6566
// Handles creating new folders or copying/pasting files in Azure Blob Storage
6667
[HttpPost]
67-
public async Task<IActionResult> FileManager_Create([FromForm] string target, [FromForm] string name, [FromForm] int entry)
68+
public async Task<IActionResult> FileManager_Create([FromForm] FileManagerCreateRequest request)
6869
{
6970
try
7071
{
72+
var target = NormalizePath(request.Target ??
73+
request.Path ??
74+
request.Source ??
75+
request.SourcePath ??
76+
string.Empty);
77+
var name = request.Name?.Trim();
78+
var entry = request.Entry;
79+
80+
if (string.IsNullOrWhiteSpace(name))
81+
{
82+
return BadRequest(new { error = "Name is required for create operation" });
83+
}
84+
7185
// Parse the form data to determine if this is a folder creation, file upload, or copy operation
72-
var context = FileManagerCreateContext.FromForm(Request.Form);
86+
var context = FileManagerCreateContext.FromRequest(request);
7387
var result = await _fileManagerService.CreateAsync(target, name, entry, context);
7488
return Json(result);
7589
}
@@ -82,12 +96,12 @@ public async Task<IActionResult> FileManager_Create([FromForm] string target, [F
8296

8397
// Handles renaming files or folders in Azure Blob Storage
8498
[HttpPost]
85-
public async Task<IActionResult> FileManager_Update()
99+
public async Task<IActionResult> FileManager_Update([FromForm] FileManagerUpdateRequest request)
86100
{
87101
try
88102
{
89-
var targetPath = Request.Form["path"];
90-
var newName = Request.Form["name"];
103+
var targetPath = request.Path;
104+
var newName = request.Name;
91105

92106
if (string.IsNullOrEmpty(targetPath) || string.IsNullOrEmpty(newName))
93107
{
@@ -107,16 +121,15 @@ public async Task<IActionResult> FileManager_Update()
107121

108122
// Handles deleting files or folders from Azure Blob Storage
109123
[HttpPost]
110-
public async Task<IActionResult> FileManager_Destroy([FromForm] string models)
124+
public async Task<IActionResult> FileManager_Destroy([FromForm] FileManagerDestroyRequest request)
111125
{
112126
try
113127
{
114128
// Parse the request to extract the path of the item to delete
115-
var targetPath = FileManagerRequestParser.ResolveTargetPath(Request.Form, models);
129+
var targetPath = ResolveTargetPath(request);
116130
if (string.IsNullOrEmpty(targetPath))
117131
{
118-
var formData = string.Join(", ", Request.Form.Select(kvp => $"{kvp.Key}={kvp.Value}"));
119-
return BadRequest(new { error = "No target path provided for deletion. Received: " + formData });
132+
return BadRequest(new { error = "No target path provided for deletion." });
120133
}
121134

122135
await _fileManagerService.DeleteAsync(targetPath);
@@ -131,18 +144,18 @@ public async Task<IActionResult> FileManager_Destroy([FromForm] string models)
131144

132145
// Handles file uploads to Azure Blob Storage
133146
[HttpPost]
134-
public async Task<IActionResult> FileManager_Upload([FromForm] string target, IFormFile file)
147+
public async Task<IActionResult> FileManager_Upload([FromForm] FileManagerUploadRequest request)
135148
{
136149
try
137150
{
138-
if (file == null || file.Length == 0)
151+
if (request.File == null || request.File.Length == 0)
139152
{
140153
return BadRequest(new { error = "No file uploaded" });
141154
}
142155

143156
// Normalize the target path and upload the file to the blob container
144-
var resolvedTarget = NormalizeUploadTarget(target);
145-
var result = await _fileManagerService.UploadAsync(resolvedTarget, file);
157+
var resolvedTarget = NormalizeUploadTarget(request);
158+
var result = await _fileManagerService.UploadAsync(resolvedTarget, request.File);
146159
return Json(result);
147160
}
148161
catch (Exception ex)
@@ -152,16 +165,54 @@ public async Task<IActionResult> FileManager_Upload([FromForm] string target, IF
152165
}
153166
}
154167

155-
private string NormalizeUploadTarget(string? target)
168+
private static string NormalizePath(string? target)
169+
{
170+
if (string.IsNullOrWhiteSpace(target))
171+
{
172+
return string.Empty;
173+
}
174+
175+
return target.Trim('/');
176+
}
177+
178+
private static string NormalizeUploadTarget(FileManagerUploadRequest request)
156179
{
157-
var resolvedTarget = target ??
158-
Request.Form["target"].FirstOrDefault() ??
159-
Request.Form["path"].FirstOrDefault() ??
160-
string.Empty;
161-
162-
return string.IsNullOrEmpty(resolvedTarget)
163-
? string.Empty
164-
: resolvedTarget.Trim('/');
180+
var resolvedTarget = request.Target ?? request.Path ?? string.Empty;
181+
return NormalizePath(resolvedTarget);
182+
}
183+
184+
private static string? ResolveTargetPath(FileManagerDestroyRequest request)
185+
{
186+
var targetPath = request.Path ?? request.Target ?? request.Name;
187+
188+
if (!string.IsNullOrWhiteSpace(targetPath))
189+
{
190+
return targetPath;
191+
}
192+
193+
if (string.IsNullOrWhiteSpace(request.Models))
194+
{
195+
return null;
196+
}
197+
198+
try
199+
{
200+
var modelsArray = JsonSerializer.Deserialize<JsonElement[]>(request.Models);
201+
if (modelsArray is { Length: > 0 })
202+
{
203+
var firstModel = modelsArray[0];
204+
if (firstModel.TryGetProperty("path", out var pathElement))
205+
{
206+
return pathElement.GetString();
207+
}
208+
}
209+
}
210+
catch
211+
{
212+
// Swallow JSON parsing errors and fall back to form values
213+
}
214+
215+
return null;
165216
}
166217
}
167218
}

‎KendoUI.FileManager.BlobStorage/KendoUI.FileManager.BlobStorage/Helpers/BlobPathHelper.cs‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
using System.IO;
2+
3+
namespace KendoUI.FileManager.BlobStorage.Helpers
4+
{
5+
internal static class BlobPathHelper
6+
{
7+
public static string BuildPrefix(string? target)
8+
{
9+
return string.IsNullOrWhiteSpace(target)
10+
? string.Empty
11+
: target.TrimEnd('/') + "/";
12+
}
13+
14+
public static string CombinePath(string? target, string name)
15+
{
16+
var prefix = BuildPrefix(target);
17+
return string.IsNullOrEmpty(prefix) ? name : prefix + name;
18+
}
19+
20+
public static string EnsureTrailingSlash(string? path)
21+
{
22+
if (string.IsNullOrEmpty(path))
23+
{
24+
return path ?? string.Empty;
25+
}
26+
27+
return path.EndsWith('/') ? path : path + "/";
28+
}
29+
30+
public static bool ShouldTreatAsDirectory(string name, string? isDirectoryFlag, int entry)
31+
{
32+
if (!string.IsNullOrEmpty(isDirectoryFlag) && bool.TryParse(isDirectoryFlag, out var isDirectory) && isDirectory)
33+
{
34+
return true;
35+
}
36+
37+
if (entry == 1)
38+
{
39+
return true;
40+
}
41+
42+
return !HasExtension(name);
43+
}
44+
45+
public static string BuildNewPath(string targetPath, string newName, bool isDirectory)
46+
{
47+
var lastSlashIndex = targetPath.LastIndexOf('/');
48+
49+
if (isDirectory)
50+
{
51+
return lastSlashIndex >= 0
52+
? targetPath.Substring(0, lastSlashIndex + 1) + newName
53+
: newName;
54+
}
55+
56+
var originalExtension = Path.GetExtension(targetPath);
57+
var newExtension = Path.GetExtension(newName);
58+
59+
if (string.IsNullOrEmpty(newExtension) && !string.IsNullOrEmpty(originalExtension))
60+
{
61+
newName += originalExtension;
62+
}
63+
64+
return lastSlashIndex >= 0
65+
? targetPath.Substring(0, lastSlashIndex + 1) + newName
66+
: newName;
67+
}
68+
69+
public static bool HasExtension(string? name)
70+
{
71+
return !string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(Path.GetExtension(name));
72+
}
73+
}
74+
}

‎KendoUI.FileManager.BlobStorage/KendoUI.FileManager.BlobStorage/Helpers/FileManagerRequestParser.cs‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎KendoUI.FileManager.BlobStorage/KendoUI.FileManager.BlobStorage/Models/FileManagerCreateContext.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.AspNetCore.Http;
2+
using System.Linq;
23

34
namespace KendoUI.FileManager.BlobStorage.Models
45
{
@@ -9,21 +10,21 @@ public sealed class FileManagerCreateContext
910
public string? Extension { get; init; }
1011
public string? IsDirectoryFlag { get; init; }
1112

12-
public static FileManagerCreateContext FromForm(IFormCollection form)
13+
public static FileManagerCreateContext FromRequest(FileManagerCreateRequest request)
1314
{
14-
if (form is null)
15+
if (request is null)
1516
{
16-
throw new ArgumentNullException(nameof(form));
17+
throw new ArgumentNullException(nameof(request));
1718
}
1819

1920
return new FileManagerCreateContext
2021
{
21-
UploadedFile = form.Files.FirstOrDefault(),
22-
SourcePath = form["path"].FirstOrDefault() ??
23-
form["source"].FirstOrDefault() ??
24-
form["sourcePath"].FirstOrDefault(),
25-
Extension = form["extension"].FirstOrDefault(),
26-
IsDirectoryFlag = form["isDirectory"].FirstOrDefault()
22+
UploadedFile = request.Files?.FirstOrDefault(),
23+
SourcePath = request.Path ??
24+
request.Source ??
25+
request.SourcePath,
26+
Extension = request.Extension,
27+
IsDirectoryFlag = request.IsDirectoryFlag
2728
};
2829
}
2930
}

‎KendoUI.FileManager.BlobStorage/KendoUI.FileManager.BlobStorage/Models/FileManagerEntryFactory.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
namespace KendoUI.FileManager.BlobStorage.Models
2+
{
3+
internal static class FileManagerEntryFactory
4+
{
5+
public static FileManagerEntry Create(
6+
string displayName,
7+
bool isDirectory,
8+
bool hasDirectories,
9+
string path,
10+
string extension,
11+
long size,
12+
DateTimeOffset? createdOn,
13+
DateTimeOffset? modifiedOn)
14+
{
15+
return new FileManagerEntry
16+
{
17+
Name = displayName ?? string.Empty,
18+
IsDirectory = isDirectory,
19+
HasDirectories = hasDirectories,
20+
Path = path ?? string.Empty,
21+
Extension = extension ?? string.Empty,
22+
Size = size,
23+
Created = ResolveLocalDate(createdOn),
24+
CreatedUtc = ResolveUtcDate(createdOn),
25+
Modified = ResolveLocalDate(modifiedOn),
26+
ModifiedUtc = ResolveUtcDate(modifiedOn),
27+
DateCreated = ResolveLocalDate(createdOn),
28+
DateModified = ResolveLocalDate(modifiedOn)
29+
};
30+
}
31+
32+
public static FileManagerEntry Placeholder(string name, string path, string extension)
33+
{
34+
var now = DateTimeOffset.UtcNow;
35+
return Create(name, false, false, path, extension, 0, now, now);
36+
}
37+
38+
private static DateTime ResolveLocalDate(DateTimeOffset? timestamp)
39+
{
40+
return timestamp?.LocalDateTime ?? DateTime.Now;
41+
}
42+
43+
private static DateTime ResolveUtcDate(DateTimeOffset? timestamp)
44+
{
45+
return timestamp?.UtcDateTime ?? DateTime.UtcNow;
46+
}
47+
}
48+
}

0 commit comments

Comments
 (0)