Started implementing flags to handle the sharing mode.

What works:
- the gui shows the flags in ShareManager
- the flags are loaded/saved to ft_shared.cfg and passed on to FileIndexMonitor
What does not work yet:
- the flags are not accounted for yet by FileIndexMonitor

In addition:
- simplified the directories dialog in Preferences, so that it calls the ShareManager instead of dupplicating the directories management 
code that becomes larger.
- setup the ShareManager to be a singleton, so as to coherently call it from different places.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1486 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/ft/ftdbase.cc

@@ -136,7 +136,10 @@ bool ftFiMonitor::search(std::string hash, uint64_t size, uint32_t hintflags, Fi
 	std::cerr << std::endl;
 #endif
 
-	if (findLocalFile(hash, path, fsize))
+	// setup search flags according to hintflags
+	uint32_t flags = 0;
+	
+	if(findLocalFile(hash, flags, path, fsize))
 	{
 		/* fill in details */
 #ifdef DB_DEBUG
@@ -184,15 +187,16 @@ std::list<RsItem *> ftFiMonitor::saveList(bool &cleanup)
 #endif
 
 	/* get list of directories */
-	std::list<std::string> dirList;
-	std::list<std::string>::iterator it;
+	std::list<SharedDirInfo> dirList;
+	std::list<SharedDirInfo>::iterator it;
 
 	getSharedDirectories(dirList);
 
 	for(it = dirList.begin(); it != dirList.end(); it++)
 	{
 		RsFileConfigItem *fi = new RsFileConfigItem();
-		fi->file.path = *it;
+		fi->file.path = (*it).filename ;
+		fi->flags = (*it).shareflags ;
 
 		sList.push_back(fi);
 	}
@@ -214,7 +218,7 @@ bool    ftFiMonitor::loadList(std::list<RsItem *> load)
 
 	time_t ts = time(NULL);
 
-	std::list<std::string> dirList;
+	std::list<SharedDirInfo> dirList;
 
 	std::list<RsItem *>::iterator it;
 	for(it = load.begin(); it != load.end(); it++)
@@ -228,7 +232,11 @@ bool    ftFiMonitor::loadList(std::list<RsItem *> load)
 
 		/* ensure that it exists? */
 
-		dirList.push_back(fi->file.path);
+		SharedDirInfo info ;
+		info.filename = fi->file.path;
+		info.shareflags = fi->flags & (RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE) ;
+
+		dirList.push_back(info) ;
 	}
 
 	/* set directories */
@@ -236,7 +244,15 @@ bool    ftFiMonitor::loadList(std::list<RsItem *> load)
 	return true;
 }
 
-void	ftFiMonitor::setSharedDirectories(std::list<std::string> dirList)
+void	ftFiMonitor::updateShareFlags(const SharedDirInfo& info)
+{
+	FileIndexMonitor::updateShareFlags(info);
+
+	/* flag for config */
+	IndicateConfigChanged();
+}
+
+void	ftFiMonitor::setSharedDirectories(std::list<SharedDirInfo> dirList)
 {
 	FileIndexMonitor::setSharedDirectories(dirList);
 

libretroshare/src/ft/ftdbase.h

@@ -60,7 +60,8 @@ class ftFiMonitor: public FileIndexMonitor, public ftSearch, public p3Config
 	virtual bool search(std::string hash, uint64_t size, uint32_t hintflags, FileInfo &info) const;
 
 	/* overloaded set dirs enables config indication */
-	virtual void setSharedDirectories(std::list<std::string> dirList);
+	virtual void setSharedDirectories(std::list<SharedDirInfo> dirList);
+	virtual void updateShareFlags(const SharedDirInfo& info) ;
 
 	/***
 	* Configuration - store shared directories

libretroshare/src/ft/ftserver.cc

@@ -246,6 +246,8 @@ bool ftServer::FileRequest(std::string fname, std::string hash, uint64_t size,
 //						dest, flags, srcIds);
 	const DwlDetails details(fname, hash, size, dest, flags, srcIds, Normal);
 	mFtDwlQueue->insertDownload(details);
+
+	return true ;
 }
 
 bool ftServer::FileCancel(std::string hash)
@@ -471,32 +473,46 @@ bool    ftServer::InDirectoryCheck()
 	return mFiMon->inDirectoryCheck();
 }
 
-bool	ftServer::getSharedDirectories(std::list<std::string> &dirs)
+bool	ftServer::getSharedDirectories(std::list<SharedDirInfo> &dirs)
 {
 	mFiMon->getSharedDirectories(dirs);
 	return true;
 }
 
-bool	ftServer::setSharedDirectories(std::list<std::string> &dirs)
+bool	ftServer::setSharedDirectories(std::list<SharedDirInfo> &dirs)
 {
 	mFiMon->setSharedDirectories(dirs);
 	return true;
 }
 
-bool 	ftServer::addSharedDirectory(std::string dir)
+bool 	ftServer::addSharedDirectory(SharedDirInfo dir)
 {
-	std::list<std::string> dirList;
+	std::list<SharedDirInfo> dirList;
 	mFiMon->getSharedDirectories(dirList);
+
+	// check that the directory is not already in the list.
+	for(std::list<SharedDirInfo>::const_iterator it(dirList.begin());it!=dirList.end();++it)
+		if((*it).filename == dir.filename)
+			return false ;
+	
+	// ok then, add the shared directory.
 	dirList.push_back(dir);
 
 	mFiMon->setSharedDirectories(dirList);
 	return true;
 }
 
+bool ftServer::updateShareFlags(const SharedDirInfo& info)
+{
+	mFiMon->updateShareFlags(info);
+
+	return true ;
+}
+
 bool 	ftServer::removeSharedDirectory(std::string dir)
 {
-	std::list<std::string> dirList;
-	std::list<std::string>::iterator it;
+	std::list<SharedDirInfo> dirList;
+	std::list<SharedDirInfo>::iterator it;
 
 #ifdef SERVER_DEBUG
 	std::cerr << "ftServer::removeSharedDirectory(" << dir << ")";
@@ -509,13 +525,14 @@ bool 	ftServer::removeSharedDirectory(std::string dir)
 	for(it = dirList.begin(); it != dirList.end(); it++)
 	{
 		std::cerr << "ftServer::removeSharedDirectory()";
-		std::cerr << " existing: " << *it;
+		std::cerr << " existing: " << (*it).filename;
 		std::cerr << std::endl;
 	}
 #endif
 
-	if (dirList.end() == (it =
-		std::find(dirList.begin(), dirList.end(), dir)))
+	for(it = dirList.begin();it!=dirList.end() && (*it).filename != dir;++it) ;
+
+	if(it == dirList.end())
 	{
 #ifdef SERVER_DEBUG
 		std::cerr << "ftServer::removeSharedDirectory()";
@@ -551,8 +568,11 @@ bool ftServer::getShareDownloadDirectory()
 
 bool ftServer::shareDownloadDirectory()
 {
-	std::string dir = mFtController->getDownloadDirectory();
-	return addSharedDirectory(dir);
+	SharedDirInfo inf ;
+	inf.filename = mFtController->getDownloadDirectory();
+	inf.shareflags = RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_BROWSABLE ;
+
+	return addSharedDirectory(inf);
 }
 
 bool ftServer::unshareDownloadDirectory()

libretroshare/src/ft/ftserver.h

@@ -175,9 +175,10 @@ virtual void	setPartialsDirectory(std::string path);
 virtual std::string getDownloadDirectory();
 virtual std::string getPartialsDirectory();
 
-virtual bool	getSharedDirectories(std::list<std::string> &dirs);
-virtual bool	setSharedDirectories(std::list<std::string> &dirs);
-virtual bool 	addSharedDirectory(std::string dir);
+virtual bool	getSharedDirectories(std::list<SharedDirInfo> &dirs);
+virtual bool	setSharedDirectories(std::list<SharedDirInfo> &dirs);
+virtual bool 	addSharedDirectory(SharedDirInfo dir);
+virtual bool   updateShareFlags(const SharedDirInfo& dir); 	// updates the flags. The directory should already exist !
 virtual bool 	removeSharedDirectory(std::string dir);
 
 virtual void	setShareDownloadDirectory(bool value);