Skip to content

Save and Restore WorkdirDepth when removeFile #16667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
Jan 27, 2020
Merged

Save and Restore WorkdirDepth when removeFile #16667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad065d0
Save and Restore WorkdirDepth when removeFile
robbycandra Jan 25, 2020
fce0102
Option for diveToFile to leave CWD alone
thinkyhead Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions Marlin/src/sd/cardreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ void CardReader::openFileRead(char * const path, const uint8_t subcall_type/*=0*
stopSDPrint();

SdFile *curDir;
const char * const fname = diveToFile(curDir, path);
const char * const fname = diveToFile(true, curDir, path);
if (!fname) return;

if (file.open(curDir, fname, O_READ)) {
Expand Down Expand Up @@ -532,7 +532,7 @@ void CardReader::openFileWrite(char * const path) {
stopSDPrint();

SdFile *curDir;
const char * const fname = diveToFile(curDir, path);
const char * const fname = diveToFile(false, curDir, path);
if (!fname) return;

if (file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
Expand All @@ -557,7 +557,7 @@ void CardReader::removeFile(const char * const name) {
//stopSDPrint();

SdFile *curDir;
const char * const fname = diveToFile(curDir, name);
const char * const fname = diveToFile(false, curDir, name);
if (!fname) return;

if (file.remove(curDir, fname)) {
Expand Down Expand Up @@ -704,26 +704,28 @@ uint16_t CardReader::countFilesInWorkDir() {
*
* A nullptr result indicates an unrecoverable error.
*/
const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
const char* CardReader::diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo/*=false*/) {
// Track both parent and subfolder
static SdFile newDir1, newDir2;
SdFile *sub = &newDir1, *startDir;

// Parsing the path string
const char *item_name_adr = path;
if (path[0] == '/') {

if (path[0] == '/') { // Starting at the root directory?
curDir = &root;
workDirDepth = 0;
if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
item_name_adr++;
}
else
curDir = &workDir;
curDir = &workDir; // Dive from workDir (as set by the UI)

startDir = curDir;

// Start dive
while (item_name_adr) {
// Find next sub
// Find next subdirectory delimiter
char * const name_end = strchr(item_name_adr, '/');

// Last atom in the path? Item found.
if (name_end <= item_name_adr) break;

// Set subDirName
Expand All @@ -746,13 +748,16 @@ const char* CardReader::diveToFile(SdFile*& curDir, const char * const path, con
// curDir now subDir
curDir = sub;

// Update workDirParents and workDirDepth
if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
// Update workDirParents, workDirDepth, and workDir
if (update_cwd) {
if (workDirDepth < MAX_DIR_DEPTH) workDirParents[workDirDepth++] = *curDir;
workDir = *curDir;
}

// Point sub pointer to unused newDir
// Point sub at the other scratch object
sub = (curDir != &newDir1) ? &newDir1 : &newDir2;

// item_name_adr point to next sub
// Next path atom address
item_name_adr = name_end + 1;
}
return item_name_adr;
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/sd/cardreader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class CardReader {
static inline uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }

// Helper for open and remove
static const char* diveToFile(SdFile*& curDir, const char * const path, const bool echo=false);
static const char* diveToFile(const bool update_cwd, SdFile*& curDir, const char * const path, const bool echo=false);

#if ENABLED(SDCARD_SORT_ALPHA)
static void presort();
Expand Down