Add Folder copy/move/delete

Also implement the current folder menu

source/fs/menus/explorer.c

@@ -14,12 +14,13 @@
 #include "../fscopy.h"
 #include <libs/fatfs/ff.h>
 #include "../../hid/hid.h"
+#include "foldermenu.h"
 
 MenuEntry_t topEntries[] = {
     {.optionUnion = COLORTORGB(COLOR_GREEN) | SKIPBIT},
     {.optionUnion = COLORTORGB(COLOR_ORANGE)},
     {.optionUnion = COLORTORGB(COLOR_GREY) | SKIPBIT, .name = "Clipboard -> Current folder"},
-    {.optionUnion = COLORTORGB(COLOR_GREY) | SKIPBIT, .name = "Current folder options"}
+    {.optionUnion = COLORTORGB(COLOR_ORANGE), .name = "Current folder options"}
 };
 
 MenuEntry_t MakeMenuOutFSEntry(FSEntry_t entry){
@@ -36,6 +37,9 @@ void FileExplorer(char *path){
     char *storedPath = CpyStr(path);
     int res = 0;
 
+    if (TConf.explorerCopyMode == CMODE_Move || TConf.explorerCopyMode == CMODE_MoveFolder)
+        ResetCopyParams();
+
     while (1){
         topEntries[2].optionUnion = (TConf.explorerCopyMode != CMODE_None) ? (COLORTORGB(COLOR_ORANGE)) : (COLORTORGB(COLOR_GREY) | SKIPBIT);
         topEntries[1].name = (!strcmp(storedPath, path)) ? "<- Exit explorer" : "<- Folder back";
@@ -74,30 +78,50 @@ void FileExplorer(char *path){
         char *oldPath = storedPath;
 
         if (res == 2){
-            ErrCode_t res;
+            ErrCode_t err = {0};
             char *filename = CpyStr(strrchr(TConf.srcCopy, '/') + 1);
             char *dst = CombinePaths(storedPath, filename);
 
             if (!strcmp(TConf.srcCopy, dst))
-                res = newErrCode(TE_ERR_SAME_LOC);
-            else {
-                if (TConf.explorerCopyMode == CMODE_Move){
-                    if ((res.err = f_rename(TConf.srcCopy, dst)))
-                        res = newErrCode(res.err);
+                err = newErrCode(TE_ERR_SAME_LOC);
+
+            if (!err.err && TConf.explorerCopyMode >= CMODE_CopyFolder){
+                if (strstr(dst, TConf.srcCopy) != NULL)
+                    err = newErrCode(TE_ERR_PATH_IN_PATH);
+            }
+
+            if (!err.err){
+                if (TConf.explorerCopyMode == CMODE_Move || TConf.explorerCopyMode == CMODE_MoveFolder){
+                    if ((err.err = f_rename(TConf.srcCopy, dst)))
+                        err = newErrCode(err.err);
+                }
+                else if (TConf.explorerCopyMode == CMODE_Copy) {
+                    gfx_clearscreen();
+                    RESETCOLOR;
+                    gfx_printf("Hold vol+/- to cancel\nCopying %s... ", filename);
+                    err = FileCopy(TConf.srcCopy, dst, COPY_MODE_CANCEL | COPY_MODE_PRINT);
                 }
                 else {
                     gfx_clearscreen();
                     RESETCOLOR;
-                    gfx_printf("Hold vol+/- to cancel\nCopying %s... ", filename);
-                    res = FileCopy(TConf.srcCopy, dst, COPY_MODE_CANCEL | COPY_MODE_PRINT);
+                    gfx_printf("\nCopying folder... ");
+                    err = FolderCopy(TConf.srcCopy, storedPath);
                 }
             }
+
             
-            DrawError(res);
+            DrawError(err);
             free(dst);
             free(filename);
             ResetCopyParams();
         }
+        else if (res == 3){
+            if (FolderMenu(storedPath)){
+                storedPath = EscapeFolder(oldPath);
+                free(oldPath);
+                res = 0;
+            }
+        }
         else if (res < ARR_LEN(topEntries)) {
             if (!strcmp(storedPath, path)){
                 clearFileVector(&fileVec);

source/fs/menus/filemenu.c

@@ -17,7 +17,6 @@
 #include <storage/nx_sd.h>
 
 MenuEntry_t FileMenuEntries[] = {
-    // Still have to think up the options
     {.optionUnion = COLORTORGB(COLOR_WHITE) | SKIPBIT, .name = "-- File menu --"},
     {.optionUnion = COLORTORGB(COLOR_GREEN) | SKIPBIT}, // For the file name and size
     {.optionUnion = COLORTORGB(COLOR_VIOLET) | SKIPBIT}, // For the file Attribs
@@ -91,7 +90,7 @@ void RunScript(char *path, FSEntry_t entry){
     hidWait();
 }
 
-menuPaths FileMenuPaths[] = {
+fileMenuPath FileMenuPaths[] = {
     CopyClipboard,
     MoveClipboard,
     UnimplementedException,

source/fs/menus/foldermenu.c

@@ -0,0 +1,101 @@
+#include "foldermenu.h"
+#include "../../err.h"
+#include "../../gfx/menu.h"
+#include "../../gfx/gfxutils.h"
+#include "../fsutils.h"
+#include <mem/heap.h>
+#include <string.h>
+#include <utils/sprintf.h>
+#include "../../tegraexplorer/tconf.h"
+#include "../../hid/hid.h"
+#include <libs/fatfs/ff.h>
+#include "../../utils/utils.h"
+#include "../../keys/nca.h"
+#include "../../script/lexer.h"
+#include "../../script/parser.h"
+#include "../../script/variables.h"
+#include <storage/nx_sd.h>
+#include "../fscopy.h"
+
+MenuEntry_t FolderMenuEntries[] = {
+    {.optionUnion = COLORTORGB(COLOR_WHITE) | SKIPBIT, .name = "-- Folder menu --"},
+    {.optionUnion = COLORTORGB(COLOR_GREEN) | SKIPBIT}, // For the file name and size
+    {.optionUnion = COLORTORGB(COLOR_VIOLET) | SKIPBIT}, // For the file Attribs
+    {.optionUnion = HIDEBIT},
+    {.optionUnion = COLORTORGB(COLOR_WHITE), .name = "<- Back"},
+    {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "\nCopy to clipboard"},
+    {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Move to clipboard"},
+    {.optionUnion = COLORTORGB(COLOR_BLUE), .name = "Rename current folder\n"},
+    {.optionUnion = COLORTORGB(COLOR_RED), .name = "Delete current folder"},
+    {.optionUnion = COLORTORGB(COLOR_GREEN), .name = "\nCreate folder"}
+};
+
+int UnimplementedFolderException(const char *path){
+    DrawError(newErrCode(TE_ERR_UNIMPLEMENTED));
+    return 0;
+}
+
+int FolderCopyClipboard(const char *path){
+    SetCopyParams(path, CMODE_CopyFolder);
+    return 0;
+}
+
+int FolderMoveClipboard(const char *path){
+    SetCopyParams(path, CMODE_MoveFolder);
+    return 0;
+}
+
+int DeleteFolder(const char *path){
+    gfx_con_setpos(384 + 16, 200 + 16 + 10 * 16);
+    SETCOLOR(COLOR_RED, COLOR_DARKGREY);
+    gfx_printf("Are you sure?        ");
+
+    WaitFor(1000);
+    if (MakeYesNoHorzMenu(3, COLOR_DARKGREY)){
+        gfx_clearscreen();
+        SETCOLOR(COLOR_RED, COLOR_DEFAULT);
+        gfx_printf("\nDeleting... ");
+        ErrCode_t err = FolderDelete(path);
+        if (err.err){
+            DrawError(err);
+        }
+        else return 1;
+    }
+    return 0;
+}
+
+folderMenuPath FolderMenuPaths[] = {
+    FolderCopyClipboard,
+    FolderMoveClipboard,
+    UnimplementedFolderException,
+    DeleteFolder,
+    UnimplementedFolderException
+};
+
+int FolderMenu(const char *path){
+    FSEntry_t file = GetFileInfo(path);
+    FolderMenuEntries[1].name = file.name;
+
+    char attribs[16];
+    char *attribList = GetFileAttribs(file);
+    sprintf(attribs, "Attribs:%s\n", attribList);
+    free(attribList);
+    FolderMenuEntries[2].name = attribs;
+
+    // If root, disable all options other than create folder!
+    int isRoot = !strcmp(file.name, "Root");
+    FolderMenuEntries[2].hide = isRoot;
+    for (int i = 5; i <= 8; i++)
+        FolderMenuEntries[i].hide = isRoot;
+    
+
+    Vector_t ent = vecFromArray(FolderMenuEntries, ARR_LEN(FolderMenuEntries), sizeof(MenuEntry_t));
+    gfx_boxGrey(384, 200, 384 + 512, 200 + 320, 0x33);
+    gfx_con_setpos(384 + 16, 200 + 16);
+    int res = newMenu(&ent, 0, 30, 19, ENABLEB | ALWAYSREDRAW | USELIGHTGREY, ent.count);
+    
+    if (res <= 4)
+        return 0;
+    
+    return FolderMenuPaths[res - 5](path);
+} 

source/fs/menus/foldermenu.h

@@ -0,0 +1,4 @@
+#pragma once
+
+typedef int (*folderMenuPath)(const char *path);
+int FolderMenu(const char *path);