#include <xmem.h>\r
#endif\r
\r
-IntroductionPuzzleInserter::IntroductionPuzzleInserter()\r
+IntroductionPuzzleInserter::IntroductionPuzzleInserter():IIndexInserter<long>()\r
{\r
Initialize();\r
}\r
\r
-IntroductionPuzzleInserter::IntroductionPuzzleInserter(FCPv2 *fcp):IFCPConnected(fcp)\r
+IntroductionPuzzleInserter::IntroductionPuzzleInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)\r
{\r
Initialize();\r
}\r
\r
void IntroductionPuzzleInserter::CheckForNeededInsert()\r
{\r
- // select all local ids that aren't single use and that aren't currently inserting a puzzle and are publishing a trust list\r
- SQLite3DB::Recordset rs=m_db->Query("SELECT LocalIdentityID FROM tblLocalIdentity WHERE PublishTrustList='true' AND SingleUse='false' AND InsertingPuzzle='false' AND PrivateKey IS NOT NULL AND PrivateKey <> '' ORDER BY LastInsertedPuzzle;");\r
- \r
- while(!rs.AtEnd())\r
+ // only do 1 insert at a time\r
+ if(m_inserting.size()==0)\r
{\r
- std::string localidentityidstr;\r
- DateTime now;\r
- now.SetToGMTime();\r
-\r
- if(rs.GetField(0))\r
+ // select all local ids that aren't single use and that aren't currently inserting a puzzle and are publishing a trust list\r
+ SQLite3DB::Recordset rs=m_db->Query("SELECT LocalIdentityID FROM tblLocalIdentity WHERE PublishTrustList='true' AND SingleUse='false' AND PrivateKey IS NOT NULL AND PrivateKey <> '' ORDER BY LastInsertedPuzzle;");\r
+ \r
+ while(!rs.AtEnd())\r
{\r
- localidentityidstr=rs.GetField(0);\r
- }\r
+ std::string localidentityidstr;\r
+ DateTime now;\r
+ now.SetToGMTime();\r
\r
- // if this identity has any non-solved puzzles for today, we don't need to insert a new puzzle\r
- SQLite3DB::Recordset rs2=m_db->Query("SELECT UUID FROM tblIntroductionPuzzleInserts WHERE Day='"+now.Format("%Y-%m-%d")+"' AND FoundSolution='false' AND LocalIdentityID="+localidentityidstr+";");\r
+ if(rs.GetField(0))\r
+ {\r
+ localidentityidstr=rs.GetField(0);\r
+ }\r
\r
- // identity doesn't have any non-solved puzzles for today - start a new insert\r
- if(rs2.Empty()==true)\r
- {\r
- StartInsert(rs.GetInt(0));\r
- }\r
+ // if this identity has any non-solved puzzles for today, we don't need to insert a new puzzle\r
+ SQLite3DB::Recordset rs2=m_db->Query("SELECT UUID FROM tblIntroductionPuzzleInserts WHERE Day='"+now.Format("%Y-%m-%d")+"' AND FoundSolution='false' AND LocalIdentityID="+localidentityidstr+";");\r
\r
- rs.Next();\r
- }\r
-}\r
+ // identity doesn't have any non-solved puzzles for today - start a new insert\r
+ if(rs2.Empty()==true)\r
+ {\r
+ StartInsert(rs.GetInt(0));\r
+ }\r
\r
-void IntroductionPuzzleInserter::FCPConnected()\r
-{\r
- m_db->Execute("UPDATE tblLocalIdentity SET InsertingPuzzle='false';");\r
-}\r
-\r
-void IntroductionPuzzleInserter::FCPDisconnected()\r
-{\r
- \r
+ rs.Next();\r
+ }\r
+ }\r
}\r
\r
void IntroductionPuzzleInserter::GenerateCaptcha(std::string &encodeddata, std::string &solution)\r
\r
}\r
\r
-const bool IntroductionPuzzleInserter::HandleMessage(FCPMessage &message)\r
-{\r
-\r
- if(message["Identifier"].find("IntroductionPuzzleInserter")==0)\r
- {\r
-\r
- // ignore URIGenerated message\r
- if(message.GetName()=="URIGenerated")\r
- {\r
- return true;\r
- }\r
-\r
- if(message.GetName()=="PutSuccessful")\r
- {\r
- return HandlePutSuccessful(message);\r
- }\r
-\r
- if(message.GetName()=="PutFailed")\r
- {\r
- return HandlePutFailed(message);\r
- }\r
-\r
- }\r
-\r
- return false;\r
-}\r
-\r
const bool IntroductionPuzzleInserter::HandlePutFailed(FCPMessage &message)\r
{\r
SQLite3DB::Statement st;\r
StringFunctions::Split(message["Identifier"],"|",idparts);\r
StringFunctions::Convert(idparts[1],localidentityid);\r
\r
- st=m_db->Prepare("UPDATE tblLocalIdentity SET InsertingPuzzle='false' WHERE LocalIdentityID=?;");\r
- st.Bind(0,localidentityid);\r
- st.Step();\r
- st.Finalize();\r
-\r
- // if fatal error or collision - mark index\r
- if(message["Fatal"]=="true" || message["Code"]=="9")\r
+ // non USK\r
+ if(idparts[0]==m_fcpuniquename)\r
{\r
- m_db->Execute("UPDATE tblIntroductionPuzzleInserts SET Day='"+idparts[5]+"', InsertIndex="+idparts[2]+", FoundSolution='true' WHERE UUID='"+idparts[3]+"';");\r
- }\r
+ // if fatal error or collision - mark index\r
+ if(message["Fatal"]=="true" || message["Code"]=="9")\r
+ {\r
+ m_db->Execute("UPDATE tblIntroductionPuzzleInserts SET Day='"+idparts[5]+"', InsertIndex="+idparts[2]+", FoundSolution='true' WHERE UUID='"+idparts[3]+"';");\r
+ }\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IntroductionPuzzleInserter::HandlePutFailed failed to insert puzzle "+idparts[3]);\r
+ RemoveFromInsertList(localidentityid);\r
+\r
+ m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IntroductionPuzzleInserter::HandlePutFailed failed to insert puzzle "+idparts[3]);\r
+ }\r
\r
return true;\r
}\r
\r
now.SetToGMTime();\r
StringFunctions::Split(message["Identifier"],"|",idparts);\r
- StringFunctions::Convert(idparts[1],localidentityid);\r
- StringFunctions::Convert(idparts[2],insertindex);\r
-\r
- st=m_db->Prepare("UPDATE tblIntroductionPuzzleInserts SET Day=?, InsertIndex=? WHERE UUID=?;");\r
- st.Bind(0,idparts[5]);\r
- st.Bind(1,insertindex);\r
- st.Bind(2,idparts[3]);\r
- st.Step();\r
- st.Finalize();\r
\r
- st=m_db->Prepare("UPDATE tblLocalIdentity SET InsertingPuzzle='false', LastInsertedPuzzle=? WHERE LocalIdentityID=?;");\r
- st.Bind(0,now.Format("%Y-%m-%d %H:%M:%S"));\r
- st.Bind(1,localidentityid);\r
- st.Step();\r
- st.Finalize();\r
-\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IntroductionPuzzleInserter::HandlePutSuccessful inserted puzzle "+idparts[3]);\r
-\r
- return true;\r
-}\r
-\r
-void IntroductionPuzzleInserter::Initialize()\r
-{\r
- m_lastchecked.SetToGMTime();\r
-}\r
+ // non USK\r
+ if(idparts[0]==m_fcpuniquename)\r
+ {\r
+ StringFunctions::Convert(idparts[1],localidentityid);\r
+ StringFunctions::Convert(idparts[2],insertindex);\r
\r
-void IntroductionPuzzleInserter::Process()\r
-{\r
+ st=m_db->Prepare("UPDATE tblIntroductionPuzzleInserts SET Day=?, InsertIndex=? WHERE UUID=?;");\r
+ st.Bind(0,idparts[5]);\r
+ st.Bind(1,insertindex);\r
+ st.Bind(2,idparts[3]);\r
+ st.Step();\r
+ st.Finalize();\r
\r
- DateTime now;\r
+ st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedPuzzle=? WHERE LocalIdentityID=?;");\r
+ st.Bind(0,now.Format("%Y-%m-%d %H:%M:%S"));\r
+ st.Bind(1,localidentityid);\r
+ st.Step();\r
+ st.Finalize();\r
\r
- now.SetToGMTime();\r
+ RemoveFromInsertList(localidentityid);\r
\r
- if(m_lastchecked<(now-(1.0/1440.0)))\r
- {\r
- CheckForNeededInsert();\r
- m_lastchecked=now;\r
+ m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IntroductionPuzzleInserter::HandlePutSuccessful inserted puzzle "+idparts[3]);\r
}\r
\r
+ return true;\r
}\r
\r
-void IntroductionPuzzleInserter::RegisterWithThread(FreenetMasterThread *thread)\r
+void IntroductionPuzzleInserter::Initialize()\r
{\r
- thread->RegisterFCPConnected(this);\r
- thread->RegisterFCPMessageHandler(this);\r
- thread->RegisterPeriodicProcessor(this);\r
+ m_fcpuniquename="IntroductionPuzzleInserter";\r
}\r
\r
-void IntroductionPuzzleInserter::StartInsert(const long localidentityid)\r
+const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)\r
{\r
DateTime now;\r
std::string idstring;\r
\r
message.SetName("ClientPut");\r
message["URI"]=privatekey+messagebase+"|"+now.Format("%Y-%m-%d")+"|IntroductionPuzzle|"+indexstr+".xml";\r
- message["Identifier"]="IntroductionPuzzleInserter|"+idstring+"|"+indexstr+"|"+xml.GetUUID()+"|"+message["URI"];\r
+ message["Identifier"]=m_fcpuniquename+"|"+idstring+"|"+indexstr+"|"+xml.GetUUID()+"|"+message["URI"];\r
message["UploadFrom"]="direct";\r
message["DataLength"]=xmldatasizestr;\r
m_fcp->SendMessage(message);\r
m_fcp->SendRaw(xmldata.c_str(),xmldata.size());\r
\r
- m_db->Execute("UPDATE tblLocalIdentity SET InsertingPuzzle='true' WHERE LocalIdentityID="+idstring+";");\r
+ // insert to USK\r
+ message.Reset();\r
+ message.SetName("ClientPutComplexDir");\r
+ message["URI"]="USK"+privatekey.substr(3)+messagebase+"|"+now.Format("%Y.%m.%d")+"|IntroductionPuzzle/0/";\r
+ message["Identifier"]=m_fcpuniquename+"USK|"+message["URI"];\r
+ message["DefaultName"]="IntroductionPuzzle.xml";\r
+ message["Files.0.Name"]="IntroductionPuzzle.xml";\r
+ message["Files.0.UplaodFrom"]="direct";\r
+ message["Files.0.DataLength"]=xmldatasizestr;\r
+ m_fcp->SendMessage(message);\r
+ m_fcp->SendRaw(xmldata.c_str(),xmldata.size());\r
+\r
m_db->Execute("INSERT INTO tblIntroductionPuzzleInserts(UUID,Type,MimeType,LocalIdentityID,PuzzleData,PuzzleSolution) VALUES('"+xml.GetUUID()+"','captcha','image/bmp',"+idstring+",'"+encodedpuzzle+"','"+solutionstring+"');");\r
\r
+ m_inserting.push_back(localidentityid);\r
+\r
m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IntroductionPuzzleInserter::StartInsert started insert for id "+idstring);\r
\r
+ return true;\r
+\r
}\r
projects / fms.git / blobdiff