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

Enabled new File Transfer Code in libretroshare.

Browse source 
NB: This is not yet working. so SVN is now officially broken :(
Hope to have the bugs ironed out soon.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-11-02 11:38:11 +00:00
parent 9f68fc5393
commit 0d96b43d34
29 changed files with 567 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/dbase/cachestrapper.cc
View file

@ -34,7 +34,6 @@
* #define CS_DEBUG 1
***/
#define CS_DEBUG 1
bool operator<(const CacheId &a, const CacheId &b)
{

12
libretroshare/src/dbase/fimonitor.cc
View file

@ -39,6 +39,7 @@
/***********
* #define FIM_DEBUG 1
***********/
#define FIM_DEBUG 1
FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid)
:CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid),
@ -596,6 +597,17 @@ void FileIndexMonitor::setSharedDirectories(std::list<std::string> dirs)
{
fiMutex.lock(); { /* LOCKED DIRS */
#ifdef FIM_DEBUG
std::list<std::string>::iterator it;
std::cerr << "FileIndexMonitor::setSharedDirectories() :\n";
for(it = dirs.begin(); it != dirs.end(); it++)
{
std::cerr << "\t" << *it;
std::cerr << std::endl;
}
#endif
pendingDirs = true;
pendingDirList = dirs;

17
libretroshare/src/dbase/findex.cc
View file

@ -37,6 +37,9 @@
* #define FI_DEBUG 1
****/
#define FI_DEBUG 1
#define FI_DEBUG_ALL 1
DirEntry::~DirEntry()
{
@ -609,7 +612,7 @@ int FileIndex::removeOldDirectory(std::string fpath, std::string name, time_t
{
/* path is to parent */
#ifdef FI_DEBUG_ALL
std::cerr << "FileIndex::removeOldDir() Path: \"";
std::cerr << "FileIndex::removeOldDirectory() Path: \"";
std::cerr << fpath << "\"" << " + \"" << name << "\"";
std::cerr << std::endl;
#endif
@ -617,11 +620,21 @@ int FileIndex::removeOldDirectory(std::string fpath, std::string name, time_t
/* because of this find - we cannot get a child of
* root (which is what we want!)
*/
DirEntry *parent = root->findDirectory(fpath);
/* for root directory case ... no subdir. */
if (fpath == "")
{
#ifdef FI_DEBUG
std::cerr << "FileIndex::removeOldDirectory() removing a root dir";
std::cerr << std::endl;
#endif
parent = root;
}
if (!parent) {
#ifdef FI_DEBUG
std::cerr << "FileIndex::removeOldDir() NULL parent";
std::cerr << "FileIndex::removeOldDirectory() NULL parent";
std::cerr << std::endl;
#endif
return 0;