Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow arbitrary name in fstream url after hash.

Browse Source 
/fstream/fileshash/name
Useful for creating file links that contains the original file name.
This commit is contained in:
hunbernd 2015-11-04 22:02:02 +01:00
parent c4563dbb96
commit bdc70c6561
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libresapi/src/api/ApiServerMHD.cpp
View File

@ -275,11 +275,20 @@ public:
sendMessage(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, "Error: rsFiles is null. Retroshare is probably not yet started."); sendMessage(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, "Error: rsFiles is null. Retroshare is probably not yet started.");
return MHD_YES; return MHD_YES;
} }
if(url[0] == 0 || (mHash=RsFileHash(url+strlen(FILESTREAMER_ENTRY_PATH))).isNull()) std::string urls(url);
urls = urls.substr(strlen(FILESTREAMER_ENTRY_PATH));
size_t perpos = urls.find('/');
if(perpos == std::string::npos){
mHash = RsFileHash(urls);
}else{
mHash = RsFileHash(urls.substr(0, perpos));
}
if(urls.empty() || mHash.isNull())
{ {
sendMessage(connection, MHD_HTTP_NOT_FOUND, "Error: URL is not a valid file hash"); sendMessage(connection, MHD_HTTP_NOT_FOUND, "Error: URL is not a valid file hash");
return MHD_YES; return MHD_YES;
} }
FileInfo info; FileInfo info;
std::list<RsFileHash> dls; std::list<RsFileHash> dls;
rsFiles->FileDownloads(dls); rsFiles->FileDownloads(dls);