mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-20 12:24:24 -04:00
Lots of bugfixes and tweaks:
* Switched p3Ranking to share Friends Links as well as own. * Modified rankmsgs to contain source id. * Fixed up rsNotify, added pqiNotify and global function call to get it. * Added notify for Bad Incoming Directory * Added Emergency Incoming directory so RS can keep running. * Added notify for Bad Packet (connecting to V0.3.X) * Added notify for Incomplete Packet Read (not been triggered yet!) * added close() to BinInterface, close on pqissl calls reset() * removed exit(1) calls from pqistreamer, replaced with bio->close(). * Increased Maximum Packet Size for HTML messages. * Fixed Online/Offline Message Forwarding. (TEST). * Increased DHT bootstrap buckets to 4. * Cleaned up much of serialiser debug (was slowing down Mac) * Added directory path to File Listings. * added ConvertSharedFilePath() so correct local dir can be found. * Added ForceDirectoryCheck() and InDirectoryCheck() for file hashing. * removed old TMP cache loading. * switched off Cache debug. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a76baa5421
commit
5e41b21cef
36 changed files with 632 additions and 224 deletions
|
@ -146,6 +146,13 @@ void filedexserver::setSaveDir(std::string d)
|
|||
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
|
||||
}
|
||||
|
||||
void filedexserver::setEmergencySaveDir(std::string s)
|
||||
{
|
||||
if (ftFiler)
|
||||
{
|
||||
ftFiler -> setEmergencyBasePath(s);
|
||||
}
|
||||
}
|
||||
|
||||
bool filedexserver::getSaveIncSearch()
|
||||
{
|
||||
|
@ -198,6 +205,29 @@ int filedexserver::reScanDirs()
|
|||
return 1;
|
||||
}
|
||||
|
||||
bool filedexserver::ConvertSharedFilePath(std::string path, std::string &fullpath)
|
||||
{
|
||||
if (fimon)
|
||||
return fimon->convertSharedFilePath(path, fullpath);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void filedexserver::ForceDirectoryCheck()
|
||||
{
|
||||
if (fimon)
|
||||
fimon->forceDirectoryCheck();
|
||||
return;
|
||||
}
|
||||
|
||||
bool filedexserver::InDirectoryCheck()
|
||||
{
|
||||
if (fimon)
|
||||
return fimon->inDirectoryCheck();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/*************************************** NEW File Cache Stuff ****************************/
|
||||
|
||||
void filedexserver::initialiseFileStore()
|
||||
|
@ -234,41 +264,6 @@ void filedexserver::setFileCallback(std::string ownId, CacheStrapper *strappe
|
|||
CachePair cp(fimon, fiStore, CacheId(RS_SERVICE_TYPE_FILE_INDEX, 0));
|
||||
mCacheStrapper -> addCachePair(cp);
|
||||
|
||||
#if 0
|
||||
/************ TMP HACK LOAD until new serialiser is finished */
|
||||
/* get filename and hash from configuration */
|
||||
std::string localCacheFile; // = getSSLRoot()->getSetting(LOCAL_CACHE_FILE_KEY);
|
||||
std::string localCacheHash; // = getSSLRoot()->getSetting(LOCAL_CACHE_HASH_KEY);
|
||||
std::string localCacheSize; // = getSSLRoot()->getSetting(LOCAL_CACHE_SIZE_KEY);
|
||||
|
||||
std::list<std::string> saveLocalCaches;
|
||||
std::list<std::string> saveRemoteCaches;
|
||||
|
||||
if ((localCacheFile != "") &&
|
||||
(localCacheHash != "") &&
|
||||
(localCacheSize != ""))
|
||||
{
|
||||
/* load it up! */
|
||||
std::string loadCacheFile = localcachedir + "/" + localCacheFile;
|
||||
CacheData cd;
|
||||
cd.pid = ownId;
|
||||
cd.cid = CacheId(RS_SERVICE_TYPE_FILE_INDEX, 0);
|
||||
cd.name = localCacheFile;
|
||||
cd.path = localcachedir;
|
||||
cd.hash = localCacheHash;
|
||||
cd.size = atoi(localCacheSize.c_str());
|
||||
fimon -> loadLocalCache(cd);
|
||||
|
||||
saveLocalCaches.push_back(cd.name);
|
||||
}
|
||||
|
||||
/* cleanup cache directories */
|
||||
RsDirUtil::cleanupDirectory(localcachedir, saveLocalCaches);
|
||||
RsDirUtil::cleanupDirectory(remotecachedir, saveRemoteCaches); /* clean up all */
|
||||
|
||||
/************ TMP HACK LOAD until new serialiser is finished */
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue