Skip to content

Expose the read-only file API on embedded-filesystem builds #1262

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

Open
meeloo wants to merge 1 commit into
base: 3.7-dev
Choose a base branch
from
Open

Expose the read-only file API on embedded-filesystem builds #1262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/Networking/HttpResponder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,11 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
response->printf("{\"buff\":%u}", httpInput->BufferSpaceLeft());
}
}
#if HAS_MASS_STORAGE
// An embedded filesystem can be read and listed - EmbeddedFiles.cpp implements the MassStorage
// FileExists/DirectoryExists/FindFirst/FindNext used below - it just cannot be written to. Gating the
// whole file API on HAS_MASS_STORAGE therefore hid working functionality: rr_filelist answered {err:1}
// on an embedded-files build, so DWC and AxisControl showed an empty, broken file browser.
#if HAS_MASS_STORAGE || HAS_EMBEDDED_FILES
else if (StringEqualsIgnoreCase(request, "fileinfo"))
{
const char *_ecv_array _ecv_null const nameVal = GetKeyValue("name");
Expand Down Expand Up @@ -608,6 +612,7 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
const int maxItems = (maxVal == nullptr) ? -1 : StrToI32(maxVal, nullptr);
response = reprap.GetFilesResponse(nullptr, dir, startAt, maxItems, flagDirs); // this may return nullptr
}
#if HAS_MASS_STORAGE
else if (StringEqualsIgnoreCase(request, "upload"))
{
response->printf("{\"err\":%d}", (uploadError) ? 1 : 0);
Expand Down Expand Up @@ -643,6 +648,8 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
}
response->printf("{\"err\":%d}", (success) ? 0 : 1);
}
// thumbnail stays mass-storage only: it calls RepRap::GetFileFragment, which is not compiled
// for an embedded filesystem, and enabling it produced a link failure rather than a clean error.
else if (StringEqualsIgnoreCase(request, "thumbnail"))
{
const char *_ecv_array _ecv_null const nameVal = GetKeyValue("name");
Expand All @@ -658,6 +665,7 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
response->copy("{\"err\":1}");
}
}
#endif
#else
else if ( StringEqualsIgnoreCase(request, "fileinfo")
|| StringEqualsIgnoreCase(request, "upload")
Expand All @@ -669,7 +677,7 @@ bool HttpResponder::GetJsonResponse(const char *_ecv_array request, OutputBuffer
|| StringEqualsIgnoreCase(request, "thumbnail")
)
{
response->copy("{err:1}");
response->copy("{\"err\":1}");
}
#endif

Expand Down
Loading