X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffileinserter.cpp;h=f4b6a797147701287984ff46cef1adddab715a52;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=4a82bda0e7184c4106acac47407e9d65b3c3bc9e;hpb=52581afffd81f5a71c129d87e3ac822d9522f12d;p=fms.git

diff --git a/src/freenet/fileinserter.cpp b/src/freenet/fileinserter.cpp
index 4a82bda..f4b6a79 100644
--- a/src/freenet/fileinserter.cpp
+++ b/src/freenet/fileinserter.cpp
@@ -4,12 +4,12 @@
 	#include <xmem.h>
 #endif
 
-FileInserter::FileInserter()
+FileInserter::FileInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)
 {
 	Initialize();
 }
 
-FileInserter::FileInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)
+FileInserter::FileInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)
 {
 	Initialize();
 }
@@ -30,7 +30,7 @@ void FileInserter::CheckForNeededInsert()
 	}
 }
 
-const bool FileInserter::HandlePutFailed(FCPMessage &message)
+const bool FileInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	long fileinsertid;
@@ -40,13 +40,13 @@ const bool FileInserter::HandlePutFailed(FCPMessage &message)
 
 	RemoveFromInsertList(fileinsertid);
 
-	m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FileInserter::HandlePutFailed failed to insert "+message["Identifier"]);
+	m_log->error("FileInserter::HandlePutFailed failed to insert "+message["Identifier"]);
 
 	return true;
 
 }
 
-const bool FileInserter::HandlePutSuccessful(FCPMessage &message)
+const bool FileInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	long fileinsertid;
@@ -69,9 +69,9 @@ void FileInserter::Initialize()
 	m_fcpuniquename="FileInserter";
 }
 
-void FileInserter::StartInsert(const long &fileinsertid)
+const bool FileInserter::StartInsert(const long &fileinsertid)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string fileinsertidstr="";
 	std::string sizestr="";
 	std::string filename="";
@@ -105,8 +105,10 @@ void FileInserter::StartInsert(const long &fileinsertid)
 	message["Identifier"]=m_fcpuniquename+"|"+fileinsertidstr;
 	message["UploadFrom"]="direct";
 	message["DataLength"]=sizestr;
-	m_fcp->SendMessage(message);
-	m_fcp->SendRaw(&data[0],data.size());
+	m_fcp->Send(message);
+	m_fcp->Send(data);
 
 	m_inserting.push_back(fileinsertid);
+
+	return true;
 }