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

Expose JSON API for ExtraFiles management

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-08-01 15:20:54 +02:00
parent 3ffb57f998
commit 354739fa0f
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
7 changed files with 72 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libretroshare/src/ft/ftextralist.cc
View file

@ -3,7 +3,8 @@
* *
* libretroshare: retroshare core library *
* *
* Copyright 2008 by Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2008 Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2018-2019 Gioacchino Mazzurco <gio@eigenlab.org> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
@ -272,7 +273,8 @@ bool ftExtraList::cleanupEntry(std::string /*path*/, TransferRequestFlags /*flag
* file is removed after period.
**/
bool ftExtraList::hashExtraFile(std::string path, uint32_t period, TransferRequestFlags flags)
bool ftExtraList::hashExtraFile(
std::string path, uint32_t period, TransferRequestFlags flags )
{
#ifdef DEBUG_ELIST
std::cerr << "ftExtraList::hashExtraFile() path: " << path;
@ -282,12 +284,25 @@ bool ftExtraList::hashExtraFile(std::string path, uint32_t period, TransferRequ
std::cerr << std::endl;
#endif
/* add into queue */
RS_STACK_MUTEX(extMutex);
auto failure = [](std::string errMsg)
{
RsErr() << __PRETTY_FUNCTION__ << " " << errMsg << std::endl;
return false;
};
if(!RsDirUtil::fileExists(path))
return failure("file: " + path + "not found");
if(RsDirUtil::checkDirectory(path))
return failure("Cannot add a directory: " + path + "as extra file");
FileDetails details(path, period, flags);
details.info.age = time(NULL) + period;
mToHash.push_back(details);
details.info.age = static_cast<int>(time(nullptr) + period);
{
RS_STACK_MUTEX(extMutex);
mToHash.push_back(details); /* add into queue */
}
return true;
}

11
libretroshare/src/ft/ftserver.cc
View file

@ -678,14 +678,13 @@ bool ftServer::ExtraFileAdd(std::string fname, const RsFileHash& hash, uint64_t
}
bool ftServer::ExtraFileRemove(const RsFileHash& hash)
{
mFileDatabase->removeExtraFile(hash);
return true;
}
{ return mFileDatabase->removeExtraFile(hash); }
bool ftServer::ExtraFileHash(std::string localpath, uint32_t period, TransferRequestFlags flags)
bool ftServer::ExtraFileHash(
std::string localpath, rstime_t period, TransferRequestFlags flags )
{
return mFtExtra->hashExtraFile(localpath, period, flags);
return mFtExtra->hashExtraFile(
localpath, static_cast<uint32_t>(period), flags );
}
bool ftServer::ExtraFileStatus(std::string localpath, FileInfo &info)

2
libretroshare/src/ft/ftserver.h
View file

@ -181,7 +181,7 @@ public:
***/
virtual bool ExtraFileAdd(std::string fname, const RsFileHash& hash, uint64_t size, uint32_t period, TransferRequestFlags flags);
virtual bool ExtraFileRemove(const RsFileHash& hash);
virtual bool ExtraFileHash(std::string localpath, uint32_t period, TransferRequestFlags flags);
virtual bool ExtraFileHash(std::string localpath, rstime_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);