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

Share Flags

Browse Source 
- now, only files with the NETWORK_WIDE flag are searchable by turtle hopping.

	Next move:
	    - integrate turtle search in default gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-08-10 19:44:45 +00:00
parent 45618c39c5
commit cb5f22a5c6
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libretroshare/src/dbase/fimonitor.cc
View File

@ -59,8 +59,39 @@ FileIndexMonitor::~FileIndexMonitor()
return; return;
} }
bool FileIndexMonitor::findLocalFile(std::string hash,uint32_t flags, int FileIndexMonitor::SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results,uint32_t flags)
std::string &fullpath, uint64_t &size) const {
results.clear();
std::list<FileEntry *> firesults;
fi.searchTerms(keywords, firesults);
time_t now = time(NULL) ;
/* translate/filter results */
for(std::list<FileEntry*>::const_iterator rit(firesults.begin()); rit != firesults.end(); ++rit)
{
DirDetails details ;
RequestDirDetails((*rit)->parent,details,0) ;
if(( details.flags & flags & (DIR_FLAGS_BROWSABLE | DIR_FLAGS_NETWORK_WIDE) ) > 0 )
{
FileDetail fd;
fd.id = "Local"; //localId;
fd.name = (*rit)->name;
fd.hash = (*rit)->hash;
fd.path = ""; /* TODO */
fd.size = (*rit)->size;
fd.age = now - (*rit)->modtime;
fd.rank = (*rit)->pop;
results.push_back(fd);
}
}
return !results.empty() ;
}
bool FileIndexMonitor::findLocalFile(std::string hash,uint32_t flags, std::string &fullpath, uint64_t &size) const
{ {
std::list<FileEntry *> results; std::list<FileEntry *> results;
bool ok = false; bool ok = false;
@ -72,6 +103,7 @@ bool FileIndexMonitor::findLocalFile(std::string hash,uint32_t flags,
#endif #endif
/* search through the fileIndex */ /* search through the fileIndex */
fi.searchHash(hash, results); fi.searchHash(hash, results);
if (results.size() > 0) if (results.size() > 0)
{ {
/* find the full path for the first entry */ /* find the full path for the first entry */
@ -937,7 +969,7 @@ int FileIndexMonitor::RequestDirDetails(void *ref, DirDetails &details, uint32_t
bool b = fi.RequestDirDetails(ref,details,flags) ; bool b = fi.RequestDirDetails(ref,details,flags) ;
// look for the top level and setup flags accordingly // look for the top level and setup flags accordingly
FileEntry *file = (FileEntry *) ref; FileEntry *file = (FileEntry *) ref;
DirEntry *dir = dynamic_cast<DirEntry *>(file); DirEntry *dir = dynamic_cast<DirEntry *>(file);
DirEntry *last_dir = NULL ; DirEntry *last_dir = NULL ;

3
libretroshare/src/dbase/fimonitor.h
View File

@ -74,7 +74,8 @@ class FileIndexMonitor: public CacheSource, public RsThread
virtual ~FileIndexMonitor(); virtual ~FileIndexMonitor();
/* external interface for filetransfer */ /* external interface for filetransfer */
bool findLocalFile(std::string hash,uint32_t f, std::string &fullpath, uint64_t &size) const; bool findLocalFile(std::string hash,uint32_t f, std::string &fullpath, uint64_t &size) const;
int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results,uint32_t flags) ;
/* external interface for local access to files */ /* external interface for local access to files */
bool convertSharedFilePath(std::string path, std::string &fullpath); bool convertSharedFilePath(std::string path, std::string &fullpath);

5
libretroshare/src/ft/ftserver.cc
View File

@ -447,7 +447,10 @@ int ftServer::SearchKeywords(std::list<std::string> keywords, std::list<FileDeta
} }
#endif #endif
return mFiStore->SearchKeywords(keywords, results,flags); if(flags & DIR_FLAGS_LOCAL)
return mFiMon->SearchKeywords(keywords, results,flags);
else
return mFiStore->SearchKeywords(keywords, results,flags);
} }
int ftServer::SearchBoolExp(Expression * exp, std::list<FileDetail> &results) int ftServer::SearchBoolExp(Expression * exp, std::list<FileDetail> &results)

2
libretroshare/src/turtle/p3turtle.cc
View File

@ -1307,7 +1307,7 @@ void p3turtle::performLocalSearch(const std::string& s,std::list<TurtleFileInfo>
words.push_back(s) ; words.push_back(s) ;
// now, search! // now, search!
rsFiles->SearchKeywords(words, initialResults,DIR_FLAGS_LOCAL); rsFiles->SearchKeywords(words, initialResults,DIR_FLAGS_LOCAL | DIR_FLAGS_NETWORK_WIDE);
result.clear() ; result.clear() ;