Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added new folder capability in collection

Browse source
This commit is contained in:
csoler 2024-03-14 22:44:49 +01:00
parent 27f0962654
commit a36f7221e7
6 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/common/RsCollection.cpp
View file

@ -144,9 +144,9 @@ static QString purifyFileName(const QString& input,bool& bad)
return output ;
}
void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index)
{
mHashes[hash]= mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
mHashes[hash]= mFileTree->addFile(parent_index,fname.toStdString(),hash,size);
#ifdef TO_REMOVE
ColFileInfo info ;
info.type = DIR_TYPE_FILE ;
@ -157,9 +157,9 @@ void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash&
recursAddElements(_xml_doc,info,_root) ;
#endif
}
void RsCollection::merge_in(const RsFileTree& tree)
void RsCollection::merge_in(const RsFileTree& tree, RsFileTree::DirIndex parent_index)
{
recursMergeTree(mFileTree->root(),tree,tree.directoryData(tree.root())) ;
recursMergeTree(mFileTree->root(),tree,tree.directoryData(parent_index)) ;
}
void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)