paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify deletion

Browse Source
This commit is contained in:
Paul Schneider
2019-09-05 21:01:44 +01:00
parent 7e8de55858
commit d7573d64a5
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs
View File

@ -141,43 +141,21 @@ namespace Yavsc.ApiControllers
return Ok();
}
[HttpDelete]
[Route("/api/fsc/rm/{*id}")]
public async Task <IActionResult> Delete ([ValidRemoteUserFilePath] string id)
[HttpDelete("{*id}")]
public IActionResult RemoveDirOrFile ([ValidRemoteUserFilePath] string id)
{
if (!ModelState.IsValid) return new BadRequestObjectResult(ModelState);
var user = dbContext.Users.Single(
u => u.Id == User.GetUserId()
);
try {
user.DeleteUserFile(id);
await dbContext.SaveChangesAsync(User.GetUserId());
}
catch (Exception ex)
{
return new BadRequestObjectResult(
new FsOperationInfo {
Done = false,
Error = ex.Message
});
}
return Ok(new { deleted=id });
}
[HttpDelete]
[Route("/api/fsc/rmdir/{*id}")]
public IActionResult RemoveDir ([ValidRemoteUserFilePath] string id)
{
if (!ModelState.IsValid) return new BadRequestObjectResult(ModelState);
var user = dbContext.Users.Single(
u => u.Id == User.GetUserId()
);
try {
var result = user.DeleteUserDir(id);
var result = user.DeleteUserDirOrFile(id);
if (!result.Done)
return new BadRequestObjectResult(result);
}
catch (Exception ex)
{
return new BadRequestObjectResult(

13
src/Yavsc/Helpers/FileSystemHelpers.cs
View File

@ -104,17 +104,24 @@ namespace Yavsc.Helpers
user.DiskUsage -= fi.Length;
}
public static FsOperationInfo DeleteUserDir(this ApplicationUser user, string dirName)
public static FsOperationInfo DeleteUserDirOrFile(this ApplicationUser user, string dirName)
{
var root = Path.Combine(AbstractFileSystemHelpers.UserFilesDirName, user.UserName);
if (string.IsNullOrEmpty(dirName))
return new FsOperationInfo { Done = false, Error = "specify a dir name"} ;
return new FsOperationInfo { Done = false, Error = "specify a directory or file name"} ;
var di = new DirectoryInfo(Path.Combine(root, dirName));
if (!di.Exists) return new FsOperationInfo { Done = false, Error = "non existent"} ;
if (!di.Exists) {
var fi = new FileInfo(Path.Combine(root, dirName));
if (!fi.Exists) return new FsOperationInfo { Done = false, Error = "non existent"} ;
fi.Delete();
user.DiskUsage -= fi.Length;
}
else {
if (di.GetDirectories().Length>0 || di.GetFiles().Length>0)
return new FsOperationInfo { Done = false, Error = "not eñpty"} ;
di.Delete();
}
return new FsOperationInfo { Done = true };
}