* 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

libretroshare/src/rsserver/p3files.h

@@ -0,0 +1,118 @@
+#ifndef P3_FILES_TMP_INTERFACE_H
+#define P3_FILES_TMP_INTERFACE_H
+
+/*
+ * libretroshare/src/rsserver: p3files.h
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2008 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+
+#include <map>
+#include <list>
+#include <iostream>
+#include <string>
+
+#include "rsiface/rsfiles.h"
+
+#include "util/rsthreads.h"
+
+class filedexserver;
+class RsServer;
+class p3AuthMgr;
+
+class p3Files: public RsFiles
+{
+	public:
+
+	p3Files(filedexserver *s, RsServer *c, p3AuthMgr *a)
+	:mServer(s), mCore(c), mAuthMgr(a)  { return; }
+
+virtual ~p3Files() { return; }
+
+/****************************************/
+/* 1) Access to downloading / uploading files.  */
+
+virtual bool FileDownloads(std::list<std::string> &hashs);
+virtual bool FileUploads(std::list<std::string> &hashs);
+virtual bool FileDetails(std::string hash, uint32_t hintflags, FileInfo &info);
+
+/* 2) Control of Downloads. */
+virtual bool FileRequest(std::string fname, std::string hash, 
+		uint32_t size, std::string dest, uint32_t flags);
+virtual bool FileCancel(std::string hash);
+virtual bool FileControl(std::string hash, uint32_t flags);
+virtual bool FileClearCompleted();
+
+/* 3) Addition of Extra Files... From File System */
+
+virtual bool ExtraFileAdd(std::string fname, std::string hash, uint32_t size,
+				uint32_t period, uint32_t flags);
+virtual bool ExtraFileRemove(std::string hash, uint32_t flags);
+virtual bool ExtraFileHash(std::string localpath, 
+				uint32_t period, uint32_t flags);
+virtual bool ExtraFileStatus(std::string localpath, FileInfo &info);
+
+/* 4) Search and Listing Interface */
+
+virtual int RequestDirDetails(std::string uid, std::string path, DirDetails &details);
+virtual int RequestDirDetails(void *ref, DirDetails &details, uint32_t flags);
+
+virtual int SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results);
+virtual int SearchBoolExp(Expression * exp, std::list<FileDetail> &results);
+
+/* 5) Utility Functions.  */
+
+virtual bool ConvertSharedFilePath(std::string path, std::string &fullpath);
+virtual void ForceDirectoryCheck();
+virtual bool InDirectoryCheck();
+
+
+virtual void    setDownloadDirectory(std::string path);
+virtual void    setPartialsDirectory(std::string path);
+virtual std::string getDownloadDirectory();
+virtual std::string getPartialsDirectory();
+
+virtual bool    getSharedDirectories(std::list<std::string> &dirs);
+virtual bool    addSharedDirectory(std::string dir);
+virtual bool    removeSharedDirectory(std::string dir);
+
+
+	/* Update functions! */
+int     UpdateAllTransfers();
+
+	private:
+
+void    lockRsCore();
+void    unlockRsCore();
+
+	filedexserver *mServer;
+	RsServer      *mCore;
+	p3AuthMgr     *mAuthMgr;
+
+	RsMutex fMutex;
+	std::map<std::string, FileInfo> mTransfers;
+
+};
+
+
+#endif