rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deleting file when copying to same dir and add recursive copying (#13)

Browse Source 
* Fix deleting file when copying to same dir and add recursive copying

FIX: Deletes file when copying to same dir
ADD: Recursive copying (copy files and dirs within dirs) (also undoes disabling copying folders)

* Derp fix

* Derp fix (with undoing disabling folder copying)
This commit is contained in:
Epicpkmn11 2018-10-19 18:53:44 -05:00 committed by RocketRobz
parent a97bfd5430
commit 9651648836
4 changed files with 97 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
arm9/source/fileOperations.cpp
View File

@ -1,5 +1,12 @@
#include "fileOperations.h"
#include <nds.h>
#include <stdio.h>
#include <dirent.h>
#include <vector>
#include "file_browse.h"
using namespace std;
#define copyBufSize 0x8000
@ -26,61 +33,91 @@ off_t getFileSize(const char *fileName)
return fsize;
}
void dirCopy(DirEntry* entry, int i, const char *destinationPath, const char *sourcePath) {
vector<DirEntry> dirContents;
dirContents.clear();
if (entry->isDirectory) chdir((sourcePath + ("/" + entry->name)).c_str());
getDirectoryContents(dirContents);
if (((int)dirContents.size()) == 1) mkdir((destinationPath + ("/" + entry->name)).c_str(), 0777);
if (((int)dirContents.size()) != 1) fcopy((sourcePath + ("/" + entry->name)).c_str(), (destinationPath + ("/" + entry->name)).c_str());
}
int fcopy(const char *sourcePath, const char *destinationPath)
{
FILE* sourceFile = fopen(sourcePath, "rb");
off_t fsize = 0;
if (sourceFile) {
fseek(sourceFile, 0, SEEK_END);
fsize = ftell(sourceFile); // Get source file's size
fseek(sourceFile, 0, SEEK_SET);
DIR *isDir = opendir (sourcePath);
if (isDir != NULL) {
chdir(sourcePath);
vector<DirEntry> dirContents;
getDirectoryContents(dirContents);
DirEntry* entry = &dirContents.at(1);
mkdir(destinationPath, 0777);
for (int i = 1; i < ((int)dirContents.size()); i++) {
chdir(sourcePath);
entry = &dirContents.at(i);
dirCopy(entry, i, destinationPath, sourcePath);
}
chdir (destinationPath);
chdir ("..");
return 1;
} else {
fclose(sourceFile);
return -1;
}
FILE* sourceFile = fopen(sourcePath, "rb");
off_t fsize = 0;
if (sourceFile) {
fseek(sourceFile, 0, SEEK_END);
fsize = ftell(sourceFile); // Get source file's size
fseek(sourceFile, 0, SEEK_SET);
} else {
fclose(sourceFile);
return -1;
}
FILE* destinationFile = fopen(destinationPath, "wb");
//if (destinationFile) {
fseek(destinationFile, 0, SEEK_SET);
/*} else {
fclose(sourceFile);
fclose(destinationFile);
return -1;
}*/
off_t offset = 0;
int numr;
while (1)
{
scanKeys();
if (keysHeld() & KEY_B) {
// Cancel copying
FILE* destinationFile = fopen(destinationPath, "wb");
//if (destinationFile) {
fseek(destinationFile, 0, SEEK_SET);
/*} else {
fclose(sourceFile);
fclose(destinationFile);
return -1;
break;
}*/
off_t offset = 0;
int numr;
while (1)
{
scanKeys();
if (keysHeld() & KEY_B) {
// Cancel copying
fclose(sourceFile);
fclose(destinationFile);
return -1;
break;
}
printf ("\x1b[16;0H");
printf ("Progress:\n");
printf ("%i/%i Bytes", (int)offset, (int)fsize);
// Copy file to destination path
numr = fread(copyBuf, 2, copyBufSize, sourceFile);
fwrite(copyBuf, 2, numr, destinationFile);
offset += copyBufSize;
if (offset > fsize) {
fclose(sourceFile);
fclose(destinationFile);
printf ("\x1b[17;0H");
printf ("%i/%i Bytes", (int)fsize, (int)fsize);
for (int i = 0; i < 60; i++) swiWaitForVBlank();
return 1;
break;
}
}
printf ("\x1b[16;0H");
printf ("Progress:\n");
printf ("%i/%i Bytes", (int)offset, (int)fsize);
// Copy file to destination path
numr = fread(copyBuf, 2, copyBufSize, sourceFile);
fwrite(copyBuf, 2, numr, destinationFile);
offset += copyBufSize;
if (offset > fsize) {
fclose(sourceFile);
fclose(destinationFile);
printf ("\x1b[17;0H");
printf ("%i/%i Bytes", (int)fsize, (int)fsize);
for (int i = 0; i < 60; i++) swiWaitForVBlank();
return 1;
break;
}
return -1;
}
return -1;
closedir(isDir);
}

2
arm9/source/fileOperations.h
View File

@ -1,3 +1,5 @@
#include <nds.h>
#ifndef FILE_COPY
#define FILE_COPY

9
arm9/source/file_browse.cpp
View File

@ -49,13 +49,6 @@ using namespace std;
static char path[PATH_MAX];
struct DirEntry {
string name;
off_t size;
bool isDirectory;
bool isApp;
} ;
bool nameEndsWith (const string& name) {
if (name.size() == 0) return false;
@ -594,7 +587,7 @@ string browseForFile (void) {
getDirectoryContents (dirContents);
}
}
} else if ((strcmp(entry->name.c_str(), "..") != 0) && !entry->isDirectory) {
} else if (strcmp(entry->name.c_str(), "..") != 0) {
snprintf(clipboard, sizeof(clipboard), "%s%s", path, entry->name.c_str());
snprintf(clipboardFilename, sizeof(clipboardFilename), "%s", entry->name.c_str());
clipboardOn = true;

10
arm9/source/file_browse.h
View File

@ -25,7 +25,17 @@
#include <string>
#include <vector>
using namespace std;
struct DirEntry {
string name;
off_t size;
bool isDirectory;
bool isApp;
} ;
std::string browseForFile (void);
void getDirectoryContents (vector<DirEntry>& dirContents);