Skip to content
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

Jump to bottom

not encode filename when uploading #79

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

not encode filename when uploading #79

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
08b902a
not encode filename when uploading
Oct 9, 2020
f15f018
Merge remote-tracking branch 'origin/master' into notEncodeFilenameWh…
Apr 29, 2022
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
64 changes: 18 additions & 46 deletions src/controllerclientimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,13 +1095,13 @@ void ControllerClientImpl::_EnsureWebDAVDirectories(const std::string& relativeu
}
}

std::string ControllerClientImpl::_PrepareDestinationURI_UTF8(const std::string& rawuri, bool bEnsurePath, bool bEnsureSlash, bool bIsDirectory)
std::string ControllerClientImpl::_PrepareDestinationURI_UTF8(const std::string& rawuri, bool bEncodeURI, bool bEnsurePath, bool bEnsureSlash, bool bIsDirectory)
{
std::string baseuploaduri;
if( rawuri.size() >= 7 && rawuri.substr(0,7) == "mujin:/" ) {
baseuploaduri = _basewebdavuri;
std::string s = rawuri.substr(7);
baseuploaduri += _EncodeWithoutSeparator(s);
baseuploaduri += bEncodeURI ? _EncodeWithoutSeparator(s) : s;
if( bEnsurePath ) {
if( !bIsDirectory ) {
size_t nBaseFilenameStartIndex = s.find_last_of(s_filesep);
Expand Down Expand Up @@ -1129,101 +1129,73 @@ std::string ControllerClientImpl::_PrepareDestinationURI_UTF8(const std::string&
return baseuploaduri;
}

std::string ControllerClientImpl::_PrepareDestinationURI_UTF16(const std::wstring& rawuri_utf16, bool bEnsurePath, bool bEnsureSlash, bool bIsDirectory)
std::string ControllerClientImpl::_PrepareDestinationURI_UTF16(const std::wstring& rawuri_utf16, bool bEncodeURI, bool bEnsurePath, bool bEnsureSlash, bool bIsDirectory)
{
std::string baseuploaduri;
std::string desturi_utf8;
utf8::utf16to8(rawuri_utf16.begin(), rawuri_utf16.end(), std::back_inserter(desturi_utf8));

if( desturi_utf8.size() >= 7 && desturi_utf8.substr(0,7) == "mujin:/" ) {
baseuploaduri = _basewebdavuri;
std::string s = desturi_utf8.substr(7);
baseuploaduri += _EncodeWithoutSeparator(s);
if( bEnsurePath ) {
if( !bIsDirectory ) {
size_t nBaseFilenameStartIndex = s.find_last_of(s_filesep);
if( nBaseFilenameStartIndex != std::string::npos ) {
s = s.substr(0, nBaseFilenameStartIndex);
} else {
s = "";
}
}
_EnsureWebDAVDirectories(s);
}
}
else {
if( !bEnsureSlash ) {
return desturi_utf8;
}
baseuploaduri = desturi_utf8;
}
if( bEnsureSlash ) {
// ensure trailing slash
if( baseuploaduri[baseuploaduri.size()-1] != '/' ) {
baseuploaduri.push_back('/');
}
}
return baseuploaduri;
return _PrepareDestinationURI_UTF8(desturi_utf8, bEncodeURI, bEnsurePath, bEnsureSlash, bIsDirectory);
}

void ControllerClientImpl::UploadFileToController_UTF8(const std::string& filename, const std::string& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadFileToController_UTF8(filename, _PrepareDestinationURI_UTF8(desturi, false));
_UploadFileToController_UTF8(filename, _PrepareDestinationURI_UTF8(desturi, false, false));
}

void ControllerClientImpl::UploadFileToController_UTF16(const std::wstring& filename_utf16, const std::wstring& desturi_utf16)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadFileToController_UTF16(filename_utf16, _PrepareDestinationURI_UTF16(desturi_utf16, false));
_UploadFileToController_UTF16(filename_utf16, _PrepareDestinationURI_UTF16(desturi_utf16, false, false));
}

void ControllerClientImpl::UploadDataToController_UTF8(const std::vector<unsigned char>& vdata, const std::string& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadDataToController(vdata, _PrepareDestinationURI_UTF8(desturi));
_UploadDataToController(vdata, _PrepareDestinationURI_UTF8(desturi, true));
}

void ControllerClientImpl::UploadDataToController_UTF16(const std::vector<unsigned char>& vdata, const std::wstring& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadDataToController(vdata, _PrepareDestinationURI_UTF16(desturi));
_UploadDataToController(vdata, _PrepareDestinationURI_UTF16(desturi, true));
}

void ControllerClientImpl::UploadDirectoryToController_UTF8(const std::string& copydir, const std::string& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadDirectoryToController_UTF8(copydir, _PrepareDestinationURI_UTF8(desturi, true, false, true));
_UploadDirectoryToController_UTF8(copydir, _PrepareDestinationURI_UTF8(desturi, true, true, false, true));
}

void ControllerClientImpl::UploadDirectoryToController_UTF16(const std::wstring& copydir, const std::wstring& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_UploadDirectoryToController_UTF16(copydir, _PrepareDestinationURI_UTF16(desturi, true, false, true));
_UploadDirectoryToController_UTF16(copydir, _PrepareDestinationURI_UTF16(desturi, true, true, false, true));
}

void ControllerClientImpl::DownloadFileFromController_UTF8(const std::string& desturi, std::vector<unsigned char>& vdata)
{
boost::mutex::scoped_lock lock(_mutex);
_CallGet(_PrepareDestinationURI_UTF8(desturi, false), vdata);
_CallGet(_PrepareDestinationURI_UTF8(desturi, true, false), vdata);
}

void ControllerClientImpl::DownloadFileFromController_UTF16(const std::wstring& desturi, std::vector<unsigned char>& vdata)
{
boost::mutex::scoped_lock lock(_mutex);
_CallGet(_PrepareDestinationURI_UTF16(desturi, false), vdata);
_CallGet(_PrepareDestinationURI_UTF16(desturi, true, false), vdata);
}

void ControllerClientImpl::DownloadFileFromControllerIfModifiedSince_UTF8(const std::string& desturi, long localtimeval, long& remotetimeval, std::vector<unsigned char>& vdata, double timeout)
{
boost::mutex::scoped_lock lock(_mutex);
_DownloadFileFromController(_PrepareDestinationURI_UTF8(desturi, false), localtimeval, remotetimeval, vdata, timeout);
_DownloadFileFromController(_PrepareDestinationURI_UTF8(desturi, true, false), localtimeval, remotetimeval, vdata, timeout);
}

void ControllerClientImpl::DownloadFileFromControllerIfModifiedSince_UTF16(const std::wstring& desturi, long localtimeval, long& remotetimeval, std::vector<unsigned char>& vdata, double timeout)
{
boost::mutex::scoped_lock lock(_mutex);
_DownloadFileFromController(_PrepareDestinationURI_UTF16(desturi, false), localtimeval, remotetimeval, vdata, timeout);
_DownloadFileFromController(_PrepareDestinationURI_UTF16(desturi, true, false), localtimeval, remotetimeval, vdata, timeout);
}

long ControllerClientImpl::GetModifiedTime(const std::string& uri, double timeout)
Expand Down Expand Up @@ -1367,25 +1339,25 @@ void ControllerClientImpl::DeleteAllITLPrograms(double timeout)
void ControllerClientImpl::DeleteFileOnController_UTF8(const std::string& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_DeleteFileOnController(_PrepareDestinationURI_UTF8(desturi, false));
_DeleteFileOnController(_PrepareDestinationURI_UTF8(desturi, true, false));
}

void ControllerClientImpl::DeleteFileOnController_UTF16(const std::wstring& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_DeleteFileOnController(_PrepareDestinationURI_UTF16(desturi, false));
_DeleteFileOnController(_PrepareDestinationURI_UTF16(desturi, true, false));
}

void ControllerClientImpl::DeleteDirectoryOnController_UTF8(const std::string& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_DeleteDirectoryOnController(_PrepareDestinationURI_UTF8(desturi, false, false, true));
_DeleteDirectoryOnController(_PrepareDestinationURI_UTF8(desturi, true, false, false, true));
}

void ControllerClientImpl::DeleteDirectoryOnController_UTF16(const std::wstring& desturi)
{
boost::mutex::scoped_lock lock(_mutex);
_DeleteDirectoryOnController(_PrepareDestinationURI_UTF16(desturi, false, false, true));
_DeleteDirectoryOnController(_PrepareDestinationURI_UTF16(desturi, true, false, false, true));
}

void ControllerClientImpl::ModifySceneAddReferenceObjectPK(const std::string &scenepk, const std::string &referenceobjectpk, double timeout)
Expand Down
5 changes: 3 additions & 2 deletions src/controllerclientimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,11 @@ class ControllerClientImpl : public ControllerClient, public boost::enable_share
/// \brief given a raw uri with "mujin:/", return the real network uri
///
/// mutex should be locked
/// \param bEncodeURI if true, encode URI. must be false for form data.
/// \param bEnsurePath if true, will make sure the directories on the server side are created
/// \param bEnsureSlash if true, will ensure returned uri ends with slash /
std::string _PrepareDestinationURI_UTF8(const std::string& rawuri, bool bEnsurePath=true, bool bEnsureSlash=false, bool bIsDirectory=false);
std::string _PrepareDestinationURI_UTF16(const std::wstring& rawuri, bool bEnsurePath=true, bool bEnsureSlash=false, bool bIsDirectory=false);
std::string _PrepareDestinationURI_UTF8(const std::string& rawuri, bool bEncodeURI=true, bool bEnsurePath=true, bool bEnsureSlash=false, bool bIsDirectory=false);
std::string _PrepareDestinationURI_UTF16(const std::wstring& rawuri, bool bEncodeURI=true, bool bEnsurePath=true, bool bEnsureSlash=false, bool bIsDirectory=false);

// encode a URL without the / separator
std::string _EncodeWithoutSeparator(const std::string& raw);
Expand Down