Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

RsFiles::parseFilesLink support old link formats

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-03-25 01:31:58 +01:00
parent 8b4fcbe9e0
commit 198fa7d8bc
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

57
libretroshare/src/ft/ftserver.cc
View file

@ -2277,6 +2277,63 @@ std::error_condition ftServer::parseFilesLink(
const std::string& link, RsFileTree& collection ) const std::string& link, RsFileTree& collection )
{ {
RsUrl tUrl(link); RsUrl tUrl(link);
{
/* Handle retrocompatibility with old stile single file links
* retroshare://file?name=$FILE_NAME&size=$FILE_SIZE&hash=$FILE_HASH
*/
if( tUrl.scheme() == "retroshare" && tUrl.host() == "file"
&& tUrl.hasQueryK("name") && !tUrl.getQueryV("name")->empty()
&& tUrl.hasQueryK("size") && !tUrl.getQueryV("size")->empty()
&& tUrl.hasQueryK("hash") && !tUrl.getQueryV("hash")->empty() )
{
DirDetails dt;
dt.type = DIR_TYPE_FILE;
dt.hash = RsFileHash(*tUrl.getQueryV("hash"));
dt.name = *tUrl.getQueryV("name");
try
{
dt.count = std::stoull(*tUrl.getQueryV("size"));
std::unique_ptr<RsFileTree> ft;
if( !dt.hash.isNull() &&
(ft = RsFileTree::fromDirDetails(dt, true)) )
{
collection = *ft;
return std::error_condition();
}
}
catch (...) {}
}
}
{
/* Handle retrocompatibility with old stile collection links
* retroshare://collection?name=$NAME&size=$SIZE&radix=$RADIX&files=$COUNT
*/
if( tUrl.scheme() == "retroshare" && tUrl.host() == "collection"
&& tUrl.hasQueryK("name") && !tUrl.getQueryV("name")->empty()
&& tUrl.hasQueryK("size") && !tUrl.getQueryV("size")->empty()
&& tUrl.hasQueryK("radix") && !tUrl.getQueryV("radix")->empty()
&& tUrl.hasQueryK("files") && !tUrl.getQueryV("files")->empty() )
{
try
{
// Don't need the values just check they are valid numbers
std::stoull(*tUrl.getQueryV("size"));
std::stoull(*tUrl.getQueryV("files"));
auto ft = RsFileTree::fromRadix64(*tUrl.getQueryV("radix"));
if(ft)
{
collection = *ft;
return std::error_condition();
}
}
catch (...) {}
}
}
// Finaly handle the new files link format
rs_view_ptr<const std::string> radixPtr = rs_view_ptr<const std::string> radixPtr =
tUrl.getQueryV(FILES_URL_DATA_FIELD); tUrl.getQueryV(FILES_URL_DATA_FIELD);
if(!radixPtr) radixPtr = &link; if(!radixPtr) radixPtr = &link;

5
libretroshare/src/retroshare/rsfiles.h
View file

@ -948,8 +948,9 @@ public:
/** /**
* @brief Parse RetroShare files link * @brief Parse RetroShare files link
* @jsonapi{development} * @jsonapi{development}
* @param[in] link files link either in radix or URL format * Support also old RetroShare-gui file and collections links format.
* @param[out] collection optional storage for parsed files link * @param[in] link files link either in base64 or URL format
* @param[out] collection storage for parsed files link
* @return error information if some error occurred, 0/SUCCESS otherwise * @return error information if some error occurred, 0/SUCCESS otherwise
*/ */
virtual std::error_condition parseFilesLink( virtual std::error_condition parseFilesLink(