Add cleanup command

Author: ac2pic

src/commands.nim

@@ -36,6 +36,9 @@ type SaveListEntry = object
   uid: Uid
   gid: Gid
 
+type DeleteEntry = object
+  path: string
+  error: string
 
 template respondWithOk(client: untyped) = 
   await client.send($$ServerResponse(ResponseType: srOk) & "\r\L")
@@ -300,12 +303,42 @@ proc listSaveFiles(cmd: ClientRequest, client: AsyncSocket, mountId: string) {.a
   # Should not do a srOk response since that's redundant
   exitnow(-1)
 
+proc cleanup(cmd: ClientRequest, client: AsyncSocket) {.async.} =
+  # Delete the save before deleting the folder
+  let saveName = cmd.clean.saveName
+  var failed: seq[DeleteEntry] = @[]
+  if saveName.len > 0:
+    let saveImagePath = joinPath(SAVE_DIRECTORY, saveName)
+    try:
+      removeFile(saveImagePath)
+    except OSError as e:
+      failed.add DeleteEntry(path: saveImagePath, error: e.msg)
+      discard  
+
+    let saveKeyPath = joinPath(SAVE_DIRECTORY, saveName & ".bin")
+    try:
+      removeFile(saveKeyPath)
+    except OSError as e:
+      failed.add DeleteEntry(path: saveKeyPath, error: e.msg)
+      discard  
+    
+  let folder = cmd.clean.folder
+  if folder.len > 0:
+    try:
+      removeDir(folder)
+    except OSError as e:
+      failed.add DeleteEntry(path: folder, error: e.msg)
+      discard
+  respondWithJson(client, %failed)
+
 type RequestHandler = proc (cmd: ClientRequest, client: AsyncSocket, mountId: string) {.async.}
+
 var cmds : array[ClientRequestType, RequestHandler]
 cmds[rtDumpSave] = dumpSave
 cmds[rtUpdateSave] = updateSave
 cmds[rtListSaveFiles] = listSaveFiles
 cmds[rtResignSave] = resignSave
+
 var slot: uint
 var slotTotal: uint32
 
@@ -346,6 +379,8 @@ proc handleCmd*(client: AsyncSocket, cmd: ClientRequest) {.async.} =
     respondWithKeySet(client, getMaxKeySet())
   elif cmd.RequestType == rtInvalid:
     respondWithError(client, "E:INVALID_CMD")
+  elif cmd.RequestType == rtClean:
+    await cleanup(cmd, client)
   else:
     await handleForkCmds(client, cmd)
 

src/old_main.nim

@@ -7,6 +7,7 @@ type ClientRequestType* = enum
   rtDumpSave,
   rtUpdateSave,
   rtResignSave,
+  rtClean,
   rtInvalid
 
 
@@ -32,6 +33,10 @@ type ResignClientRequest* = object
   accountId*: uint64
   saveName*: string
 
+type CleanClientRequest* = object
+  saveName*: string
+  folder*: string
+
 type ClientRequest* = object
   case RequestType*: ClientRequestType
   of rtKeySet, rtInvalid:
@@ -46,6 +51,8 @@ type ClientRequest* = object
     dump*: DumpClientRequest
   of rtResignSave:
     resign*: ResignClientRequest
+  of rtClean:
+    clean*: CleanClientRequest
 
 proc parseRequest*(data: string): ClientRequest = 
   try:

src/requests.nim

@@ -18,3 +18,6 @@ nc 10.0.0.5 1234 << EOF
 {"RequestType": "rtKeySet"}
 EOF
 
+nc 10.0.0.5 1234 << EOF
+{"RequestType": "rtClean", "clean": {"saveName": "data0001", "folder": "/data/dump"}}
+EOF