X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessageinserter.cpp;h=f3aab0066e882b4652dc59e4723dedd6bb3265c0;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=3d5af9aa8e4a8ceab2ad6e93c058e84b8e530b47;hpb=52c0819bfc1d083c6e0738f75f0d7eeba521295a;p=fms.git

diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index 3d5af9a..f3aab00 100644
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -1,34 +1,52 @@
 #include "../../include/freenet/messageinserter.h"
 #include "../../include/freenet/messagexml.h"
 
-MessageInserter::MessageInserter()
+#include <Poco/DateTime.h>
+#include <Poco/DateTimeFormatter.h>
+#include <Poco/Timestamp.h>
+
+MessageInserter::MessageInserter(SQLite3DB::DB *db):IIndexInserter<std::string>(db)
 {
 	Initialize();
 }
 
-MessageInserter::MessageInserter(FCPv2 *fcp):IIndexInserter<std::string>(fcp)
+MessageInserter::MessageInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<std::string>(db,fcp)
 {
 	Initialize();
 }
 
 void MessageInserter::CheckForNeededInsert()
 {
+	Poco::DateTime now;
+	bool didinsert=false;
 	// only do 1 insert at a time
 	if(m_inserting.size()==0)
 	{
-		SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' AND tblMessageInserts.Inserted='false';");
+		SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' AND tblMessageInserts.Inserted='false' AND tblMessageInserts.SendDate<=?;");
+		st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
 		st.Step();
 
-		if(st.RowReturned())
+		while(st.RowReturned() && m_inserting.size()==0)
 		{
-			std::string messageuuid;
+			std::string messageuuid="";
 			st.ResultText(0,messageuuid);
-			StartInsert(messageuuid);
+
+			// make sure there are no uninserted files attached to this message
+			SQLite3DB::Statement st2=m_db->Prepare("SELECT FileInsertID FROM tblFileInserts WHERE Key IS NULL AND MessageUUID=?;");
+			st2.Bind(0,messageuuid);
+			st2.Step();
+
+			if(st2.RowReturned()==false)
+			{
+				StartInsert(messageuuid);
+			}
+
+			st.Step();
 		}
 	}
 }
 
-const bool MessageInserter::HandlePutFailed(FCPMessage &message)
+const bool MessageInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	int index;
 	int localidentityid;
@@ -47,18 +65,21 @@ const bool MessageInserter::HandlePutFailed(FCPMessage &message)
 		st.Step();
 	}
 
+	m_log->trace("MessageInserter::HandlePutFailed error code "+message["Code"]+" fatal="+message["Fatal"]);
+
 	RemoveFromInsertList(idparts[1]);
 
 	return true;
 }
 
-const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
+const bool MessageInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	MessageXML xml;
-	DateTime date;
+	Poco::DateTime date;
 	int localidentityid;
 	int index;
 	std::vector<std::string> idparts;
+
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(idparts[3],index);
 	StringFunctions::Convert(idparts[2],localidentityid);
@@ -70,10 +91,10 @@ const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
 	st.Step();
 
 	// insert record into temp table so MessageList will be inserted ASAP
-	date.SetToGMTime();
+	date=Poco::Timestamp();
 	st=m_db->Prepare("INSERT INTO tmpMessageListInsert(LocalIdentityID,Date) VALUES(?,?);");
 	st.Bind(0,localidentityid);
-	st.Bind(1,date.Format("%Y-%m-%d"));
+	st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d"));
 	st.Step();
 
 	// update the messageuuid to the real messageuuid
@@ -92,11 +113,17 @@ const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
 		st2.Bind(1,xml.GetXML());
 		st2.Bind(2,idparts[1]);
 		st2.Step();
+
+		//update file insert MessageUUID as well
+		st2=m_db->Prepare("UPDATE tblFileInserts SET MessageUUID=? WHERE MessageUUID=?;");
+		st2.Bind(0,idparts[4]);
+		st2.Bind(1,idparts[1]);
+		st2.Step();
 	}
 
 	RemoveFromInsertList(idparts[1]);
 
-	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]);
+	m_log->debug("MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]);
 
 	return true;
 }
@@ -106,11 +133,10 @@ void MessageInserter::Initialize()
 	m_fcpuniquename="MessageInserter";
 }
 
-void MessageInserter::StartInsert(const std::string &messageuuid)
+const bool MessageInserter::StartInsert(const std::string &messageuuid)
 {
 	MessageXML xmlfile;
-	DateTime now;
-	now.SetToGMTime();
+	Poco::DateTime now;
 	SQLite3DB::Statement st=m_db->Prepare("SELECT MessageXML,PrivateKey,tblLocalIdentity.LocalIdentityID,PublicKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE MessageUUID=?;");
 	st.Bind(0,messageuuid);
 	st.Step();
@@ -123,7 +149,7 @@ void MessageInserter::StartInsert(const std::string &messageuuid)
 		std::string xmlsizestr;
 		std::string privatekey;
 		std::string publickey;
-		FCPMessage message;
+		FCPv2::Message message;
 		std::string indexstr;
 		int index=0;
 		
@@ -134,7 +160,7 @@ void MessageInserter::StartInsert(const std::string &messageuuid)
 		StringFunctions::Convert(localidentityid,idstr);
 
 		st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageInserts WHERE Day=? AND LocalIdentityID=?;");
-		st.Bind(0,now.Format("%Y-%m-%d"));
+		st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d"));
 		st.Bind(1,localidentityid);
 		st.Step();
 
@@ -145,9 +171,27 @@ void MessageInserter::StartInsert(const std::string &messageuuid)
 		}
 		StringFunctions::Convert(index,indexstr);
 
+		xmlfile.ParseXML(xml);
+
+		// add file attachments to xml - must do this before we change UUID
+		st=m_db->Prepare("SELECT Key, Size FROM tblFileInserts WHERE MessageUUID=?;");
+		st.Bind(0,xmlfile.GetMessageID());
+		st.Step();
+		while(st.RowReturned())
+		{
+			std::string key="";
+			int size;
+			
+			st.ResultText(0,key);
+			st.ResultInt(1,size);
+
+			xmlfile.AddFileAttachment(key,size);
+
+			st.Step();
+		}
+
 		// recreate messageuuid in xml - UUID of message will not match entry in MessageInserts table until we successfully insert it
 		// see HandlePutSuccessful
-		xmlfile.ParseXML(xml);
 		// if we don't already have an @sskpart - add it
 		if(xmlfile.GetMessageID().find("@")==std::string::npos)
 		{
@@ -160,16 +204,22 @@ void MessageInserter::StartInsert(const std::string &messageuuid)
 		StringFunctions::Convert(xml.size(),xmlsizestr);
 
 		message.SetName("ClientPut");
-		message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Message|"+indexstr+".xml";
+		message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Message|"+indexstr+".xml";
 		message["Identifier"]=m_fcpuniquename+"|"+messageuuid+"|"+idstr+"|"+indexstr+"|"+xmlfile.GetMessageID()+"|"+message["URI"];
 		message["UploadFrom"]="direct";
 		message["DataLength"]=xmlsizestr;
-		m_fcp->SendMessage(message);
-		m_fcp->SendRaw(xml.c_str(),xml.size());
+		m_fcp->Send(message);
+		m_fcp->Send(std::vector<char>(xml.begin(),xml.end()));
 
 		m_inserting.push_back(messageuuid);
 
-		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::StartInsert started message insert "+message["URI"]);
+		m_log->debug("MessageInserter::StartInsert started message insert "+message["URI"]);
+	
+		return true;
+	}
+	else
+	{
+		return false;
 	}
 
 }