rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert windows EOL to unix EOL in Python uploads (#48)

Browse Source
This commit is contained in:
Peter Johnson 2019-01-11 01:10:37 -08:00 committed by GitHub
parent 7c5b84d7ef
commit bb71953788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps/tools/rpiConfigServer_src/Application.cpp vendored
View File

@ -87,12 +87,14 @@ void Application::Set(wpi::StringRef appType,
void Application::Upload(wpi::ArrayRef<uint8_t> contents, void Application::Upload(wpi::ArrayRef<uint8_t> contents,
std::function<void(wpi::StringRef)> onFail) { std::function<void(wpi::StringRef)> onFail) {
wpi::StringRef filename; wpi::StringRef filename;
bool text = false;
if (m_appType == "upload-java") { if (m_appType == "upload-java") {
filename = "/uploaded.jar"; filename = "/uploaded.jar";
} else if (m_appType == "upload-cpp") { } else if (m_appType == "upload-cpp") {
filename = "/uploaded"; filename = "/uploaded";
} else if (m_appType == "upload-python") { } else if (m_appType == "upload-python") {
filename = "/uploaded.py"; filename = "/uploaded.py";
text = true;
} else { } else {
wpi::SmallString<64> msg; wpi::SmallString<64> msg;
msg = "cannot upload application type '"; msg = "cannot upload application type '";
@ -137,7 +139,23 @@ void Application::Upload(wpi::ArrayRef<uint8_t> contents,
} }
// write contents and close file // write contents and close file
wpi::raw_fd_ostream(fd, true) << contents; wpi::raw_fd_ostream out(fd, true);
if (text) {
wpi::StringRef str(reinterpret_cast<const char*>(contents.data()),
contents.size());
// convert any Windows EOL to Unix
for (;;) {
size_t idx = str.find("\r\n");
if (idx == wpi::StringRef::npos) break;
out << str.slice(0, idx) << '\n';
str = str.slice(idx + 2, wpi::StringRef::npos);
}
out << str;
// ensure file ends with EOL
if (!str.empty() && str.back() != '\n') out << '\n';
} else {
out << contents;
}
} }
// terminate vision process so it reloads // terminate vision process so it reloads