Multi file copy paste support (#63)

* multi file copy paste support

* fix indentation

* fix overflow

arm9/source/fileOperations.cpp

@@ -16,13 +16,15 @@ u32 copyBuf[copyBufSize];
 
 extern PrintConsole topConsole, bottomConsole;
 
-char clipboard[256];
+vector<ClipboardFile> clipboard;
-char clipboardFilename[256];
-bool clipboardFolder = false;
 bool clipboardOn = false;
 bool clipboardUsed = false;
-int clipboardDrive = false;	// 0 == SD card, 1 == Flashcard, 2 == RAMdrive 1, 3 == RAMdrive 2
+
-bool clipboardInNitro = false;
+ClipboardFile::ClipboardFile(const char *iPath, const char *iName, bool folder, int drive, bool nitro) : folder(folder), drive(drive), nitro(nitro)
+{
+	strncpy(path, iPath, 256);
+	strncpy(name, iName, 256);
+}
 
 void printBytes(int bytes)
 {

arm9/source/fileOperations.h

@@ -5,13 +5,19 @@
 #ifndef FILE_COPY
 #define FILE_COPY
 
-extern char clipboard[256];
+struct ClipboardFile {
-extern char clipboardFilename[256];
+	char path[256];
-extern bool clipboardFolder;
+	char name[256];
+	bool folder;
+	int drive; // 0 == SD card, 1 == Flashcard, 2 == RAMdrive 1, 3 == RAMdrive 2
+	bool nitro;
+
+	ClipboardFile(const char *path, const char *name, bool folder, int drive, bool nitro);
+};
+
+extern vector<ClipboardFile> clipboard;
 extern bool clipboardOn;
 extern bool clipboardUsed;
-extern int clipboardDrive;	// 0 == SD card, 1 == Flashcard, 2 == RAMdrive 1, 3 == RAMdrive 2
-extern bool clipboardInNitro;
 
 extern void printBytes(int bytes);
 extern void printBytesAlign(int bytes);

arm9/source/file_browse.cpp

@@ -368,7 +368,7 @@ int fileBrowse_A(DirEntry* entry, char path[PATH_MAX]) {
 	}
 }
 
-bool fileBrowse_paste(char destPath[256]) {
+bool fileBrowse_paste(char dest[256]) {
 	int pressed = 0;
 	int optionOffset = 0;
 	int maxCursors = -1;
@@ -376,14 +376,17 @@ bool fileBrowse_paste(char destPath[256]) {
 	consoleSelect(&bottomConsole);
 	consoleClear();
 	printf ("\x1B[47m");		// Print foreground white color
-	printf(clipboardFolder ? "Paste folder here?" : "Paste file here?");
+	printf("Paste clipboard here?");
 	printf("\n\n");
 	iprintf ("\x1b[%d;0H", OPTIONS_ENTRIES_START_ROW);
 	maxCursors++;
-	printf("   Copy path\n");
+	printf("   Copy files\n");
-	if (!clipboardInNitro) {
+	for (auto it = clipboard.begin(); it != clipboard.end(); ++it) {
+		if (it->nitro)
+			continue;
 		maxCursors++;
-		printf("   Move path\n");
+		printf("   Move files\n");
+		break;
 	}
 	printf("\n");
 	printf("(<A> select, <B> cancel)");
@@ -422,20 +425,26 @@ bool fileBrowse_paste(char destPath[256]) {
 		if (optionOffset > maxCursors)		optionOffset = 0;		// Wrap around to top of list
 
 		if (pressed & KEY_A) {
+			char destPath[256];
 			iprintf ("\x1b[%d;3H", optionOffset + OPTIONS_ENTRIES_START_ROW);
-			if (optionOffset == 0) {
+			printf(optionOffset ? "Moving..." : "Copying...");
-				printf("Copying...");
+			for (auto it = clipboard.begin(); it != clipboard.end(); ++it) {
-				remove(destPath);
+				snprintf(destPath, sizeof(destPath), "%s%s", dest, it->name);
-				fcopy(clipboard, destPath);
+				if (!strcmp (it->path, destPath))
+					continue;	// If the source and destination for the clipped file is the same skip it
+
+				if (optionOffset && !it->nitro ) {	 // Don't remove if from nitro
+					if (currentDrive == it->drive) {
+						rename(it->path, destPath);
 					} else {
-				printf("Moving...");
+						fcopy(it->path, destPath);		// Copy file to destination, since renaming won't work
-				if (currentDrive == clipboardDrive) {
+						remove(it->path);				// Delete source file after copying
-					rename(clipboard, destPath);
-				} else {
-					fcopy(clipboard, destPath);		// Copy file to destination, since renaming won't work
-					remove(clipboard);				// Delete source file after copying
 					}
 					clipboardUsed = false;		// Disable clipboard restore
+				} else {
+					remove(destPath);
+					fcopy(it->path, destPath);
+				}
 			}
 			clipboardOn = false;	// Clear clipboard after copying or moving
 			return true;
@@ -467,7 +476,8 @@ void fileBrowse_drawBottomScreen(DirEntry* entry) {
 	printf ("\x1b[22;0H");
 	printf ("%s\n", titleName);
 	printf ("X - DELETE/[+R] RENAME file\n");
-	printf ("%s/[+R] CREATE entry%s", clipboardOn ? "Y - PASTE file" : "Y - COPY file", clipboardOn ? "" : "\n");
+	printf ("L - COPY file\n");
+	printf ("Y - PASTE file/[+R] CREATE entry");
 	printf ("R+A - Directory options\n");
 	if (sdMounted || flashcardMounted) {
 		printf ("%s\n", SCREENSHOTTEXT);
@@ -497,8 +507,15 @@ void fileBrowse_drawBottomScreen(DirEntry* entry) {
 		printf ("\x1b[9;0H");
 		printf ("\x1B[47m");		// Print foreground white color
 		printf ("[CLIPBOARD]\n");
-		printf (clipboardFolder ? "\x1B[37m" : "\x1B[40m");		// Print custom blue color or foreground black color
+		for (size_t i = 0; i < clipboard.size(); ++i) {
-		printf (clipboardFilename);
+			printf (clipboard[i].folder ? "\x1B[37m" : "\x1B[40m");		// Print custom blue color or foreground black color
+			if (i < 5) {
+				printf ("%s\n", clipboard[i].name);
+			} else {
+				printf ("%d more files...\n", clipboard.size() - 5);
+				break;
+			}
+		}
 	}
 }
 
@@ -544,7 +561,7 @@ string browseForFile (void) {
 			}
 		} while (!(pressed & KEY_UP) && !(pressed & KEY_DOWN) && !(pressed & KEY_LEFT) && !(pressed & KEY_RIGHT)
 				&& !(pressed & KEY_A) && !(pressed & KEY_B) && !(pressed & KEY_X) && !(pressed & KEY_Y)
-				&& !(pressed & KEY_SELECT));
+				&& !(pressed & KEY_L) && !(pressed & KEY_SELECT));
 
 		printf ("\x1B[47m");		// Print foreground white color
 		iprintf ("\x1b[%d;0H", fileOffset - screenOffset + ENTRIES_START_ROW);
@@ -730,10 +747,15 @@ string browseForFile (void) {
 						}
 						char filePath[256];
 						snprintf(filePath, sizeof(filePath), "%s%s", path, entry->name.c_str());
-						if (strcmp(filePath, clipboard) == 0) {
+						auto it = clipboard.begin();
-							clipboardUsed = false;	// Disable clipboard restore
+						while (it != clipboard.end()) {
-							clipboardOn = false;
+							if (!strcmp(filePath, it->path))
+								it = clipboard.erase(it); // Remove deleted file from clipboard if it was in it
+							else
+								++it;
 						}
+						if (clipboard.empty())
+							clipboardUsed = false;
 						getDirectoryContents (dirContents);
 						fileOffset--;
 					}
@@ -788,27 +810,31 @@ string browseForFile (void) {
 			}
 		}
 
-		// Copy file/folder
+		// Copy
-		if (pressed & KEY_Y) {
+		if (pressed & KEY_L && strcmp (entry->name.c_str(), "..") != 0) {
-			if (clipboardOn) {
+			if (!clipboardOn)
-				char destPath[256];
+				clipboard.clear();
-				snprintf(destPath, sizeof(destPath), "%s%s", path, clipboardFilename);
+			char file[256];
-				if (strncmp (path, "nitro:/", 7) != 0 && string(clipboard) != string(destPath)) {
+			snprintf(file, sizeof(file), "%s%s", path, entry->name.c_str());
-					if (fileBrowse_paste(destPath)) {
+			bool exists = false;
-						getDirectoryContents (dirContents);
+			for (auto it = clipboard.begin(); it != clipboard.end(); ++it) {
+				if (strcmp (it->path, file)) // Check if file already in clipboard
+					continue;
+				exists = true;
+				break;
 			}
-				}
+			if (!exists) {
-			} else if (strcmp(entry->name.c_str(), "..") != 0) {
+				clipboard.emplace_back(file, entry->name.c_str(), entry->isDirectory, currentDrive, !strncmp (path, "nitro:/", 7));
-				snprintf(clipboard, sizeof(clipboard), "%s%s", path, entry->name.c_str());
-				snprintf(clipboardFilename, sizeof(clipboardFilename), "%s", entry->name.c_str());
-				clipboardFolder = entry->isDirectory;
 				clipboardOn = true;
-				clipboardDrive = currentDrive;
-				clipboardInNitro = (strncmp (path, "nitro:/", 7) == 0);
 				clipboardUsed = true;
 			}
 		}
 
+		// Paste
+		if (pressed & KEY_Y && clipboardOn && strncmp (path, "nitro:/", 7) != 0 && fileBrowse_paste(path)) {
+			getDirectoryContents (dirContents);
+		}
+
 		if ((pressed & KEY_SELECT) && clipboardUsed) {
 			clipboardOn = !clipboardOn;
 		}