Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed display of remote directories

Browse Source
This commit is contained in:
mr-alice 2016-08-17 14:48:54 +02:00
parent ac242ce58b
commit 78b8744183
6 changed files with 100 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/file_sharing/directory_storage.cc
View File

@ -719,7 +719,7 @@ bool LocalDirectoryStorage::extractData(const EntryIndex& indx,DirDetails& d)
/* find parent pointer, and row */
std::cerr << "LocalDirectoryStorage::extractData(): Returning this:" << std::endl;
std::cerr << "LocalDirectoryStorage::extractData(): indx=" << indx << " Returning this:" << std::endl;
std::cerr << d << std::endl;
return true;

15
libretroshare/src/file_sharing/directory_updater.cc
View File

@ -63,12 +63,12 @@ void LocalDirectoryUpdater::sweepSharedDirectories()
// now for each of them, go recursively and match both files and dirs
DirectoryStorage::DirIterator stored_dir_it(mSharedDirectories,mSharedDirectories->root()) ;
for(std::list<SharedDirInfo>::const_iterator real_dir_it(shared_directory_list.begin());real_dir_it!=shared_directory_list.end();++real_dir_it, ++stored_dir_it)
for(DirectoryStorage::DirIterator stored_dir_it(mSharedDirectories,mSharedDirectories->root()) ; stored_dir_it;++stored_dir_it)
{
std::cerr << " recursing into " << real_dir_it->filename << std::endl;
recursUpdateSharedDir(real_dir_it->filename, *stored_dir_it) ;
std::cerr << " recursing into " << stored_dir_it.name() << std::endl;
recursUpdateSharedDir(stored_dir_it.name(), *stored_dir_it) ; // here we need to use the list that was stored, instead of the shared dir list, because the two
// are not necessarily in the same order.
}
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0);
}
@ -128,7 +128,10 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
DirectoryStorage::DirIterator stored_dir_it(mSharedDirectories,indx) ;
for(std::set<std::string>::const_iterator real_dir_it(subdirs.begin());real_dir_it!=subdirs.end();++real_dir_it, ++stored_dir_it)
recursUpdateSharedDir(cumulated_path + "/" + *real_dir_it, *stored_dir_it) ;
{
std::cerr << " recursing into " << stored_dir_it.name() << std::endl;
recursUpdateSharedDir(cumulated_path + "/" + stored_dir_it.name(), *stored_dir_it) ;
}
}
void LocalDirectoryUpdater::hash_callback(uint32_t client_param, const std::string& name, const RsFileHash& hash, uint64_t size)

133
libretroshare/src/file_sharing/p3filelists.cc
View File

@ -107,25 +107,39 @@ int p3FileDatabase::tick()
if(last_print_time + 20 < now)
{
RS_STACK_MUTEX(mFLSMtx) ;
mLocalSharedDirs->print();
last_print_time = now ;
#warning this should be removed, but it's necessary atm for updating the GUI
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_FRIENDS, 0);
}
if(mUpdateFlags)
{
IndicateConfigChanged();
if(mUpdateFlags & P3FILELISTS_UPDATE_FLAG_LOCAL_DIRS_CHANGED)
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0);
if(mUpdateFlags & P3FILELISTS_UPDATE_FLAG_REMOTE_DIRS_CHANGED)
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_FRIENDS, 0);
mUpdateFlags = P3FILELISTS_UPDATE_FLAG_NOTHING_CHANGED ;
}
return 0;
}
void p3FileDatabase::startThreads()
{
std::cerr << "Starting hash cache thread..." ;
mHashCache->start();
std::cerr << "Done." << std::endl;
RS_STACK_MUTEX(mFLSMtx) ;
std::cerr << "Starting directory watcher thread..." ;
mLocalDirWatcher->start();
std::cerr << "Done." << std::endl;
}
void p3FileDatabase::stopThreads()
{
RS_STACK_MUTEX(mFLSMtx) ;
std::cerr << "Stopping hash cache thread..." ; std::cerr.flush() ;
mHashCache->fullstop();
std::cerr << "Done." << std::endl;
@ -138,7 +152,6 @@ void p3FileDatabase::stopThreads()
void p3FileDatabase::tickWatchers()
{
}
void p3FileDatabase::tickRecv()
{
}
@ -165,58 +178,55 @@ bool p3FileDatabase::saveList(bool &cleanup, std::list<RsItem *>&)
void p3FileDatabase::cleanup()
{
RS_STACK_MUTEX(mFLSMtx) ;
// look through the list of friend directories. Remove those who are not our friends anymore.
//
P3FILELISTS_DEBUG() << "Cleanup pass." << std::endl;
std::set<RsPeerId> friend_set ;
{
std::list<RsPeerId> friend_lst ;
RS_STACK_MUTEX(mFLSMtx) ;
rsPeers->getFriendList(friend_lst);
// look through the list of friend directories. Remove those who are not our friends anymore.
//
std::set<RsPeerId> friend_set ;
{
std::list<RsPeerId> friend_lst ;
for(std::list<RsPeerId>::const_iterator it(friend_lst.begin());it!=friend_lst.end();++it)
friend_set.insert(*it) ;
}
rsPeers->getFriendList(friend_lst);
for(uint32_t i=1;i<mDirectories.size();++i) // start at 1, so that we don't cleanup our own.
if(friend_set.find(mDirectories[i]->peerId()) == friend_set.end())
{
P3FILELISTS_DEBUG() << " removing file list of non friend " << mDirectories[i]->peerId() << std::endl;
delete mDirectories[i];
mDirectories[i] = NULL ;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
friend_set.erase(mDirectories[i]->peerId());
mFriendIndexMap.erase(mDirectories[i]->peerId());
mFriendIndexTab[i].clear();
for(std::list<RsPeerId>::const_iterator it(friend_lst.begin());it!=friend_lst.end();++it)
friend_set.insert(*it) ;
}
// look through the remaining list of friends, which are the ones for which no remoteDirectoryStorage class has been allocated.
//
for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it)
{
// Check if a remote directory exists for that friend, possibly creating the index.
for(uint32_t i=1;i<mDirectories.size();++i) // start at 1, so that we don't cleanup our own.
if(friend_set.find(mDirectories[i]->peerId()) == friend_set.end())
{
P3FILELISTS_DEBUG() << " removing file list of non friend " << mDirectories[i]->peerId() << std::endl;
uint32_t friend_index = getFriendIndex(*it) ;
delete mDirectories[i];
mDirectories[i] = NULL ;
if(mDirectories.size() > friend_index && mDirectories[friend_index] != NULL)
continue ;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
friend_set.erase(mDirectories[i]->peerId());
mDirectories[friend_index] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
mFriendIndexMap.erase(mDirectories[i]->peerId());
mFriendIndexTab[i].clear();
}
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
// look through the remaining list of friends, which are the ones for which no remoteDirectoryStorage class has been allocated.
//
for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it)
{
// Check if a remote directory exists for that friend, possibly creating the index.
uint32_t friend_index = locked_getFriendIndex(*it) ;
if(mDirectories.size() > friend_index && mDirectories[friend_index] != NULL)
continue ;
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
mDirectories[friend_index] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
}
}
if(mUpdateFlags)
IndicateConfigChanged();
}
std::string p3FileDatabase::makeRemoteFileName(const RsPeerId& pid) const
@ -225,7 +235,7 @@ std::string p3FileDatabase::makeRemoteFileName(const RsPeerId& pid) const
return "dirlist_"+pid.toStdString()+".txt" ;
}
uint32_t p3FileDatabase::getFriendIndex(const RsPeerId& pid)
uint32_t p3FileDatabase::locked_getFriendIndex(const RsPeerId& pid)
{
std::map<RsPeerId,uint32_t>::const_iterator it = mFriendIndexMap.find(pid) ;
@ -271,7 +281,7 @@ uint32_t p3FileDatabase::getFriendIndex(const RsPeerId& pid)
}
}
const RsPeerId& p3FileDatabase::getFriendFromIndex(uint32_t indx) const
const RsPeerId& p3FileDatabase::locked_getFriendFromIndex(uint32_t indx) const
{
static const RsPeerId null_id ;
@ -329,6 +339,8 @@ bool p3FileDatabase::convertEntryIndexToPointer(const EntryIndex& e, uint32_t fi
int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags flags) const
{
RS_STACK_MUTEX(mFLSMtx) ;
// Case where the pointer is NULL, which means we're at the top of the list of shared directories for all friends (including us)
// or at the top of our own list of shred directories, depending on the flags.
@ -389,14 +401,26 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
// a pointer into an int.
convertEntryIndexToPointer((intptr_t)d.ref,fi,d.ref) ;
convertEntryIndexToPointer((intptr_t)d.parent,fi,d.parent) ;
for(std::list<DirStub>::iterator it(d.children.begin());it!=d.children.end();++it)
convertEntryIndexToPointer((intptr_t)it->ref,fi,it->ref);
d.prow = mDirectories[fi]->parentRow(e) ;
if(e == 0)
{
d.prow = fi-1 ;
d.parent = NULL ;
}
else
{
d.prow = mDirectories[fi]->parentRow(e) ;
convertEntryIndexToPointer((intptr_t)d.parent,fi,d.parent) ;
}
d.id = mDirectories[fi]->peerId();
std::cerr << "ExtractData: ref=" << ref << ", flags=" << flags << " : returning this: " << std::endl;
std::cerr << d << std::endl;
return true;
}
@ -412,6 +436,8 @@ int p3FileDatabase::RequestDirDetails(const std::string& path, DirDetails &detai
}
uint32_t p3FileDatabase::getType(void *ref) const
{
RS_STACK_MUTEX(mFLSMtx) ;
EntryIndex e ;
uint32_t fi;
@ -469,6 +495,8 @@ void p3FileDatabase::setRememberHashCache(bool)
bool p3FileDatabase::findLocalFile(const RsFileHash& hash,FileSearchFlags flags,const RsPeerId& peer_id, std::string &fullpath, uint64_t &size,FileStorageFlags& storage_flags,std::list<std::string>& parent_groups) const
{
RS_STACK_MUTEX(mFLSMtx) ;
std::list<EntryIndex> firesults;
mLocalSharedDirs->searchHash(hash,firesults) ;
@ -478,6 +506,8 @@ bool p3FileDatabase::findLocalFile(const RsFileHash& hash,FileSearchFlags flags,
int p3FileDatabase::SearchKeywords(const std::list<std::string>& keywords, std::list<DirDetails>& results,FileSearchFlags flags,const RsPeerId& client_peer_id)
{
RS_STACK_MUTEX(mFLSMtx) ;
std::list<EntryIndex> firesults;
mLocalSharedDirs->searchTerms(keywords,firesults) ;
@ -485,6 +515,8 @@ int p3FileDatabase::SearchKeywords(const std::list<std::string>& keywords, std::
}
int p3FileDatabase::SearchBoolExp(Expression *exp, std::list<DirDetails>& results,FileSearchFlags flags,const RsPeerId& client_peer_id) const
{
RS_STACK_MUTEX(mFLSMtx) ;
std::list<EntryIndex> firesults;
mLocalSharedDirs->searchBoolExp(exp,firesults) ;
@ -492,6 +524,8 @@ int p3FileDatabase::SearchBoolExp(Expression *exp, std::list<DirDetails>& result
}
bool p3FileDatabase::search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const
{
RS_STACK_MUTEX(mFLSMtx) ;
if(hintflags & RS_FILE_HINTS_LOCAL)
{
std::list<EntryIndex> res;
@ -557,5 +591,6 @@ int p3FileDatabase::filterResults(const std::list<EntryIndex>& firesults,std::li
bool p3FileDatabase::convertSharedFilePath(const std::string& path,std::string& fullpath)
{
RS_STACK_MUTEX(mFLSMtx) ;
return mLocalSharedDirs->convertSharedFilePath(path,fullpath) ;
}

6
libretroshare/src/file_sharing/p3filelists.h
View File

@ -157,8 +157,8 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
static bool convertEntryIndexToPointer(const EntryIndex &e, uint32_t friend_index, void *& p);
static bool convertPointerToEntryIndex(const void *p, EntryIndex& e, uint32_t& friend_index) ;
uint32_t getFriendIndex(const RsPeerId& pid);
const RsPeerId& getFriendFromIndex(uint32_t indx) const;
uint32_t locked_getFriendIndex(const RsPeerId& pid);
const RsPeerId& locked_getFriendFromIndex(uint32_t indx) const;
std::map<RsPeerId,uint32_t> mFriendIndexMap ;
std::vector<RsPeerId> mFriendIndexTab;
@ -169,7 +169,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
// Local flags and mutexes
RsMutex mFLSMtx ;
mutable RsMutex mFLSMtx ;
uint32_t mUpdateFlags ;
};

4
libretroshare/src/rsserver/rstypes.cc
View File

@ -47,8 +47,8 @@
std::ostream &operator<<(std::ostream &out, const DirDetails& d)
{
std::cerr << "====DIR DETAILS====" << std::endl;
std::cerr << " parent pointer: " << (intptr_t)d.parent << std::endl;
std::cerr << " current pointer: " << (intptr_t)d.ref << std::endl;
std::cerr << " parent pointer: " << d.parent << std::endl;
std::cerr << " current pointer: " << d.ref << std::endl;
std::cerr << " parent row : " << d.prow << std::endl;
std::cerr << " type : " << (int)d.type << std::endl;
std::cerr << " PeerId : " << d.id << std::endl;

2
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -825,7 +825,7 @@ void SharedFilesDialog::preModDirectories(bool local)
void SharedFilesDialog::postModDirectories(bool local)
{
if (isRemote() == local) {
if (isRemote() == local) {
return;
}