mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
* Switched to rsFiles interface for all File Information.
* added TMP p3Files class to interface with old system. * cleaned up old RsControl + RsIface file information. * removed unnecessary functions from RsServer. * Tweaked interfaces for ftServer + ftExtraList. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob
parent
6d3c5679c5
commit
be392405e8
14 changed files with 571 additions and 390 deletions
|
|
@ -33,12 +33,10 @@
|
|||
|
||||
#include "rsiface/rstypes.h"
|
||||
|
||||
std::ostream &operator<<(std::ostream &out, const MessageInfo &info);
|
||||
std::ostream &operator<<(std::ostream &out, const ChatInfo &info);
|
||||
|
||||
class RsFiles;
|
||||
extern RsFiles *rsFiles;
|
||||
|
||||
class Expression;
|
||||
|
||||
const uint32_t RS_FILE_CTRL_PAUSE = 0x0100;
|
||||
const uint32_t RS_FILE_CTRL_START = 0x0200;
|
||||
|
|
@ -70,9 +68,9 @@ virtual ~RsFiles() { return; }
|
|||
*/
|
||||
|
||||
/* get Details of File Transfers */
|
||||
virtual bool FileDownloads(std::list<std::string> &hashs)= 0;
|
||||
virtual bool FileUploads(std::list<std::string> &hashs)= 0;
|
||||
virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info)= 0;
|
||||
virtual bool FileDownloads(std::list<std::string> &hashs) = 0;
|
||||
virtual bool FileUploads(std::list<std::string> &hashs) = 0;
|
||||
virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info) = 0;
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -81,11 +79,11 @@ virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info)=
|
|||
*/
|
||||
|
||||
|
||||
virtual int FileRequest(std::string fname, std::string hash,
|
||||
uint32_t size, std::string dest, uint32_t flags)= 0;
|
||||
virtual int FileCancel(std::string hash)= 0;
|
||||
virtual int FileControl(std::string hash, uint32_t flags)= 0;
|
||||
virtual int FileClearCompleted()= 0;
|
||||
virtual bool FileRequest(std::string fname, std::string hash,
|
||||
uint32_t size, std::string dest, uint32_t flags) = 0;
|
||||
virtual bool FileCancel(std::string hash) = 0;
|
||||
virtual bool FileControl(std::string hash, uint32_t flags) = 0;
|
||||
virtual bool FileClearCompleted() = 0;
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -101,12 +99,12 @@ virtual int FileClearCompleted()= 0;
|
|||
*/
|
||||
|
||||
/* Access ftExtraList - Details */
|
||||
virtual int ExtraFileAdd(std::string fname, std::string hash, uint32_t size,
|
||||
uint32_t period, uint32_t flags)= 0;
|
||||
virtual int ExtraFileRemove(std::string hash, uin32_t flags)= 0;
|
||||
virtual bool ExtraFileAdd(std::string fname, std::string hash, uint32_t size,
|
||||
uint32_t period, uint32_t flags) = 0;
|
||||
virtual bool ExtraFileRemove(std::string hash, uint32_t flags) = 0;
|
||||
virtual bool ExtraFileHash(std::string localpath,
|
||||
uint32_t period, uint32_t flags)= 0;
|
||||
virtual bool ExtraFileStatus(std::string localpath, FileInfo &info)= 0;
|
||||
uint32_t period, uint32_t flags) = 0;
|
||||
virtual bool ExtraFileStatus(std::string localpath, FileInfo &info) = 0;
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -114,20 +112,29 @@ virtual bool ExtraFileStatus(std::string localpath, FileInfo &info)= 0;
|
|||
*/
|
||||
|
||||
/* Directory Listing / Search Interface */
|
||||
virtual int RequestDirDetails(std::string uid, std::string path, DirDetails &details)= 0;
|
||||
virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)= 0;
|
||||
virtual int RequestDirDetails(std::string uid, std::string path, DirDetails &details) = 0;
|
||||
virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) = 0;
|
||||
|
||||
virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results)= 0;
|
||||
virtual int SearchBoolExp(Expression * exp, std::list<FileDetail> &results)= 0;
|
||||
virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results) = 0;
|
||||
virtual int SearchBoolExp(Expression * exp, std::list<FileDetail> &results) = 0;
|
||||
|
||||
/*
|
||||
* 5) Utility Functions.
|
||||
* 5) Directory Control / Shared Files Utility Functions.
|
||||
*/
|
||||
|
||||
virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath) = 0;
|
||||
virtual void ForceDirectoryCheck() = 0;
|
||||
virtual bool InDirectoryCheck() = 0;
|
||||
|
||||
virtual void setDownloadDirectory(std::string path) = 0;
|
||||
virtual void setPartialsDirectory(std::string path) = 0;
|
||||
virtual std::string getDownloadDirectory() = 0;
|
||||
virtual std::string getPartialsDirectory() = 0;
|
||||
|
||||
virtual bool getSharedDirectories(std::list<std::string> &dirs) = 0;
|
||||
virtual bool addSharedDirectory(std::string dir) = 0;
|
||||
virtual bool removeSharedDirectory(std::string dir) = 0;
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,9 +34,7 @@
|
|||
class NotifyBase;
|
||||
class RsIface;
|
||||
class RsControl;
|
||||
//class RsServer;
|
||||
class RsInit;
|
||||
class Expression;
|
||||
|
||||
/* declare single RsIface for everyone to use! */
|
||||
|
||||
|
|
@ -88,9 +86,6 @@ public:
|
|||
virtual void lockData() = 0;
|
||||
virtual void unlockData() = 0;
|
||||
|
||||
const std::list<FileTransferInfo> &getTransferList()
|
||||
{ return mTransferList; }
|
||||
|
||||
const std::list<FileInfo> &getRecommendList()
|
||||
{ return mRecommendList; }
|
||||
|
||||
|
|
@ -129,7 +124,6 @@ bool hasChanged(DataFlags set); /* resets it */
|
|||
void fillLists(); /* create some dummy data to display */
|
||||
|
||||
/* Internals */
|
||||
std::list<FileTransferInfo> mTransferList;
|
||||
std::list<FileInfo> mRecommendList;
|
||||
|
||||
bool mChanged[NumOfFlags];
|
||||
|
|
@ -156,34 +150,6 @@ virtual ~RsControl() { return; }
|
|||
/* Real Startup Fn */
|
||||
virtual int StartupRetroShare(RsInit *config) = 0;
|
||||
|
||||
/****************************************/
|
||||
/* Directory Actions */
|
||||
virtual int RequestDirDetails(std::string uid, std::string path, DirDetails &details) = 0;
|
||||
virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) = 0;
|
||||
|
||||
virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath) = 0;
|
||||
virtual void ForceDirectoryCheck() = 0;
|
||||
virtual bool InDirectoryCheck() = 0;
|
||||
|
||||
/****************************************/
|
||||
/* Search Actions */
|
||||
virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results) = 0;
|
||||
virtual int SearchBoolExp(Expression *exp, std::list<FileDetail> &results) = 0;
|
||||
|
||||
/****************************************/
|
||||
/* Actions For Upload/Download */
|
||||
|
||||
//virtual int FileDelete(std::string uId, std::string fname) = 0;
|
||||
//virtual int FileMove(std::string uId, std::string src, std::string dest) = 0;
|
||||
|
||||
virtual int FileRecommend(std::string fname, std::string hash, int size) = 0;
|
||||
virtual int FileRequest(std::string fname, std::string hash, uint32_t size, std::string dest) = 0;
|
||||
virtual int FileCancel(std::string fname, std::string hash, uint32_t size) = 0;
|
||||
|
||||
// Transfer control.
|
||||
virtual int FileClearCompleted() = 0;
|
||||
virtual int FileSetBandwidthTotals(float outkB, float inkB) = 0;
|
||||
|
||||
/****************************************/
|
||||
|
||||
/* Flagging Persons / Channels / Files in or out of a set (CheckLists) */
|
||||
|
|
@ -201,16 +167,8 @@ virtual int ClearInRecommend() = 0;
|
|||
virtual bool IsInChat(std::string id) = 0; /* friend : chat msgs */
|
||||
virtual bool IsInMsg(std::string id) = 0; /* friend : msg recpts*/
|
||||
|
||||
/****************************************/
|
||||
/* RsIface Networking */
|
||||
//virtual int NetworkDHTActive(bool active) = 0;
|
||||
//virtual int NetworkUPnPActive(bool active) = 0;
|
||||
|
||||
/****************************************/
|
||||
/* Config */
|
||||
virtual int ConfigAddSharedDir( std::string dir ) = 0;
|
||||
virtual int ConfigRemoveSharedDir( std::string dir ) = 0;
|
||||
virtual int ConfigSetIncomingDir( std::string dir ) = 0;
|
||||
|
||||
virtual int ConfigSetDataRates( int total, int indiv ) = 0;
|
||||
virtual int ConfigGetDataRates( float &inKb, float &outKb) = 0;
|
||||
|
|
|
|||
|
|
@ -105,9 +105,6 @@ class RsConfig
|
|||
std::string ownId;
|
||||
std::string ownName;
|
||||
|
||||
std::list<std::string> sharedDirList;
|
||||
std::string incomingDir;
|
||||
|
||||
std::string localAddr;
|
||||
int localPort;
|
||||
std::string extAddr;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue