added possibility to remove extra shared file

This commit is contained in:
csoler 2018-09-27 16:53:08 +02:00
parent 1383846364
commit 7ab7c7db93
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
13 changed files with 125 additions and 69 deletions

View file

@ -166,11 +166,9 @@ bool ftExtraList::addExtraFile(std::string path, const RsFileHash& hash,
return true;
}
bool ftExtraList::removeExtraFile(const RsFileHash& hash, TransferRequestFlags flags)
bool ftExtraList::removeExtraFile(const RsFileHash& hash)
{
/* remove unused parameter warnings */
(void) flags;
#ifdef DEBUG_ELIST
std::cerr << "ftExtraList::removeExtraFile()";
std::cerr << " hash: " << hash;

View file

@ -117,7 +117,7 @@ public:
bool addExtraFile(std::string path, const RsFileHash &hash,
uint64_t size, uint32_t period, TransferRequestFlags flags);
bool removeExtraFile(const RsFileHash& hash, TransferRequestFlags flags);
bool removeExtraFile(const RsFileHash& hash);
bool moveExtraFile(std::string fname, const RsFileHash& hash, uint64_t size,
std::string destpath);

View file

@ -677,9 +677,10 @@ bool ftServer::ExtraFileAdd(std::string fname, const RsFileHash& hash, uint64_t
return mFtExtra->addExtraFile(fname, hash, size, period, flags);
}
bool ftServer::ExtraFileRemove(const RsFileHash& hash, TransferRequestFlags flags)
bool ftServer::ExtraFileRemove(const RsFileHash& hash)
{
return mFtExtra->removeExtraFile(hash, flags);
mFileDatabase->removeExtraFile(hash);
return true;
}
bool ftServer::ExtraFileHash(std::string localpath, uint32_t period, TransferRequestFlags flags)
@ -714,9 +715,9 @@ int ftServer::RequestDirDetails(void *ref, DirDetails &details, FileSearchFlags
{
return mFileDatabase->RequestDirDetails(ref,details,flags) ;
}
uint32_t ftServer::getType(void *ref, FileSearchFlags /* flags */)
uint32_t ftServer::getType(void *ref, FileSearchFlags flags)
{
return mFileDatabase->getType(ref) ;
return mFileDatabase->getType(ref,flags) ;
}
/***************************************************************/
/******************** Search Interface *************************/

View file

@ -180,7 +180,7 @@ public:
* Extra List Access
***/
virtual bool ExtraFileAdd(std::string fname, const RsFileHash& hash, uint64_t size, uint32_t period, TransferRequestFlags flags);
virtual bool ExtraFileRemove(const RsFileHash& hash, TransferRequestFlags flags);
virtual bool ExtraFileRemove(const RsFileHash& hash);
virtual bool ExtraFileHash(std::string localpath, uint32_t period, TransferRequestFlags flags);
virtual bool ExtraFileStatus(std::string localpath, FileInfo &info);
virtual bool ExtraFileMove(std::string fname, const RsFileHash& hash, uint64_t size, std::string destpath);