Skip to content

Poor man implementation of delete all obs related files #269

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
merged 2 commits into from
Aug 5, 2021
Merged

Poor man implementation of delete all obs related files #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7500e35
Poor man implementation of delete all obs related files
amandel Aug 5, 2021
0700aab
Really delete files if marked for deletion in /trash
amandel Aug 5, 2021
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
73 changes: 69 additions & 4 deletions src/configServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,11 @@ static const char* const deleteIndex =
"<label for='config'>Clear current configuration, wifi connection will stay.</label>"
"<input type='checkbox' id='config' name='config'>"
"<h3>SD Card</h3>"
"<label for='sdcard'>Delete OBS related content (ald_ini.ubx, tracknumber.txt, current_14d.*, *.obsdata.csv, sdflash/*, trash/*, uploaded/*)</label>"
"<input type='checkbox' id='sdcard' name='sdcard' disabled='true'>"
"<input type=submit class=btn value='Delete'>";
"<label for='sdcard'>Delete OBS related content (aid_ini.ubx, tracknumber.txt, current_14d.*, "
"*.obsdata.csv, sdflash/*, trash/*, uploaded/*). The files are just removed from to filesystem "
"part of the data might be still read from the card. Be patient.</label>"
"<input type='checkbox' id='sdcard' name='sdcard'>"
"<input type='submit' class='btn' value='Delete' onclick=\"return confirm('Are you sure?')\" />";

static const char* const settingsSecurityIndex =
"<h3>Http</h3>"
Expand Down Expand Up @@ -1600,7 +1602,7 @@ static void handleDeleteFiles(HTTPRequest *req, HTTPResponse * res) {
log_w("Failed to moved '%s' to /", fullName.c_str());
html += HTML_ENTITY_FAILED_CROSS;
}
} else if (path != "trash") {
} else if (path != "/trash") {
if (SD.rename(fullName, "/trash/" + file)) {
log_i("Moved '%s'.", fullName.c_str());
html += HTML_ENTITY_WASTEBASKET;
Expand Down Expand Up @@ -2065,6 +2067,62 @@ static void handleDelete(HTTPRequest *, HTTPResponse * res) {
sendHtml(res, html);
}

static void deleteFilesFromDirectory(File dir) {
File entry = dir.openNextFile();
while (entry) {
if (!entry.isDirectory()) {
String fileName = entry.name();
entry.close();
log_i("Will delete %s", fileName.c_str());
SD.remove(fileName);
}
entry = dir.openNextFile();
}
}

static void deleteFilesFromDirectory(String dirName) {
File dir = SD.open(dirName);
if (dir.isDirectory()) {
deleteFilesFromDirectory(dir);
}
dir.close();
}

static void deleteObsdataFiles() {
File dir = SD.open("/");
if (dir.isDirectory()) {
File entry = dir.openNextFile();
while (entry) {
if (!entry.isDirectory()) {
String fileName = entry.name();
entry.close();
if (fileName.endsWith("obsdata.csv")) {
log_d("Will delete %s", fileName.c_str());
SD.remove(fileName);
}
}
entry = dir.openNextFile();
}
}
dir.close();
}

static void deleteAllFromSd() {
// ald_ini.ubx, tracknumber.txt, current_14d.*, *.obsdata.csv, sdflash/*, trash/*, uploaded/*
deleteFilesFromDirectory("/trash");
SD.rmdir("/trash");
deleteFilesFromDirectory("/uploaded");
SD.rmdir("/uploaded");
deleteFilesFromDirectory("/sdflash");
SD.rmdir("/sdflash");
SD.remove("/tracknumber.txt");
SD.remove("/aid_ini.ubx");
SD.remove(LAST_MODIFIED_HEADER_FILE_NAME);
SD.remove(ALP_DATA_FILE_NAME);
SD.remove(ALP_NEW_DATA_FILE_NAME);
deleteObsdataFiles();
}

static void handleDeleteAction(HTTPRequest *req, HTTPResponse * res) {
// TODO: Result page with status!
const auto params = extractParameters(req);
Expand All @@ -2080,9 +2138,16 @@ static void handleDeleteAction(HTTPRequest *req, HTTPResponse * res) {
}
}
if (getParameter(params, "config") == "on") {
#ifdef CUSTOM_OBS_DEFAULT_CONFIG
theObsConfig->parseJson(CUSTOM_OBS_DEFAULT_CONFIG);
#else
theObsConfig->parseJson("{}");
#endif
theObsConfig->fill(config);
}
if (getParameter(params, "sdcard") == "on") {
deleteAllFromSd();
}
sendRedirect(res, "/");
}

Expand Down