From c1482227d7cb5d0fdc539682d0fbda830cb28001 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sat, 19 Dec 2015 23:24:45 +0000 Subject: [PATCH] Added source code, headers and unit tests for the IMPP vCard property type for ContactDataObject. --- source/contacteditor/ContactDataObject.cpp | 170 ++++++++++++++++++++- source/contacteditor/ContactDataObject.h | 1 + source/tests/LoadCheck-Load4.vcf | 6 + source/tests/xestiaab_contactload.h | 120 +++++++++++++++ 4 files changed, 291 insertions(+), 6 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index b49e0bb..b158e19 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -86,6 +86,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ int TimeZoneCount = 0; int AddressCount = 0; int EmailCount = 0; + int IMCount = 0; wxString ContactLine; wxString PropertyLine; wxString PropertySeg1; @@ -240,6 +241,13 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ ProcessEmail(PropertySeg1, PropertySeg2, &EmailCount); EmailCount++; + } else if (Property == wxT("IMPP")){ + + // See frmContactEditor-LoadIM.cpp + + ProcessIM(PropertySeg1, PropertySeg2, &IMCount); + IMCount++; + } } @@ -645,7 +653,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property intPrevValue = 9; - PropertyType PropType; + PropertyType PropType = PROPERTY_NONE; // Look for type before continuing. @@ -1136,7 +1144,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property intPrevValue = 3; - PropertyType PropType; + PropertyType PropType = PROPERTY_NONE; // Look for type before continuing. @@ -1315,8 +1323,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS intPrevValue = 4; - PropertyType PropType; - + PropertyType PropType = PROPERTY_NONE; + // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); @@ -1652,8 +1660,8 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg intPrevValue = 6; - PropertyType PropType; - + PropertyType PropType = PROPERTY_NONE; + // Look for type before continuing. CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); @@ -1782,6 +1790,156 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg } +void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount){ + + std::map SplitPoints; + std::map SplitLength; + + int intPrevValue = 6; + int intPref = 0; + + SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); + + intPrevValue = 5; + + PropertyType PropType = PROPERTY_NONE; + + // Look for type before continuing. + + CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType); + + std::map *IMList = NULL; + std::map *IMListType = NULL; + std::map *IMListAltID = NULL; + std::map *IMListPID = NULL; + std::map *IMListTokens = NULL; + std::map *IMListMediatype = NULL; + std::map *IMListPref = NULL; + + switch(PropType){ + case PROPERTY_NONE: + IMList = &GeneralIMList; + IMListType = &GeneralIMListType; + IMListAltID = &GeneralIMListAltID; + IMListPID = &GeneralIMListPID; + IMListTokens = &GeneralIMListTokens; + IMListMediatype = &GeneralIMListMediatype; + IMListPref = &GeneralIMListPref; + break; + case PROPERTY_HOME: + IMList = &HomeIMList; + IMListType = &HomeIMListType; + IMListAltID = &HomeIMListAltID; + IMListPID = &HomeIMListPID; + IMListTokens = &HomeIMListTokens; + IMListMediatype = &HomeIMListMediatype; + IMListPref = &HomeIMListPref; + break; + case PROPERTY_WORK: + IMList = &BusinessIMList; + IMListType = &BusinessIMListType; + IMListAltID = &BusinessIMListAltID; + IMListPID = &BusinessIMListPID; + IMListTokens = &BusinessIMListTokens; + IMListMediatype = &BusinessIMListMediatype; + IMListPref = &BusinessIMListPref; + break; + } + + intPrevValue = 5; + + std::map::iterator SLiter; + wxString PropertyData; + wxString PropertyName; + wxString PropertyValue; + wxString PropertyTokens; + bool FirstToken = TRUE; + + for (std::map::iterator intiter = SplitPoints.begin(); + intiter != SplitPoints.end(); ++intiter){ + + SLiter = SplitLength.find(intiter->first); + + PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second)); + + wxStringTokenizer PropertyElement (PropertyData, wxT("=")); + PropertyName = PropertyElement.GetNextToken(); + PropertyValue = PropertyElement.GetNextToken(); + + intPrevValue = intiter->second; + + CaptureString(&PropertyValue, FALSE); + + // Process properties. + + if (PropertyName == wxT("ALTID")){ + + IMListAltID->erase(*IMCount); + IMListAltID->insert(std::make_pair(*IMCount, PropertyValue)); + + } else if (PropertyName == wxT("PID")){ + + IMListPID->erase(*IMCount); + IMListPID->insert(std::make_pair(*IMCount, PropertyValue)); + + } else if (PropertyName == wxT("MEDIATYPE")){ + + IMListMediatype->erase(*IMCount); + IMListMediatype->insert(std::make_pair(*IMCount, PropertyValue)); + + } else if (PropertyName == wxT("PREF")){ + + int PriorityNumber = 0; + bool ValidNumber = TRUE; + + try{ + PriorityNumber = std::stoi(PropertyValue.ToStdString()); + } + + catch(std::invalid_argument &e){ + ValidNumber = FALSE; + } + + if (ValidNumber == TRUE){ + + IMListPref->erase(*IMCount); + IMListPref->insert(std::make_pair(*IMCount, PriorityNumber)); + + } + + } else { + + if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){ + + if (FirstToken == TRUE){ + + PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue); + FirstToken = FALSE; + + } else { + + PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue); + + } + + } + + } + + } + + IMList->insert(std::make_pair(*IMCount, PropertySeg2)); + + // Add the name token data. + + if (!PropertyTokens.IsEmpty()){ + + IMListTokens->insert(std::make_pair(*IMCount, PropertyTokens)); + + } + +} + void SplitValues(wxString *PropertyLine, std::map *SplitPoints, std::map *SplitLength, diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h index 6a9d90f..e55491b 100644 --- a/source/contacteditor/ContactDataObject.h +++ b/source/contacteditor/ContactDataObject.h @@ -575,6 +575,7 @@ class ContactDataObject{ void ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount); void ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount); void ProcessEmail(wxString PropertySeg1, wxString PropertySeg2, int *EmailCount); + void ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount); }; diff --git a/source/tests/LoadCheck-Load4.vcf b/source/tests/LoadCheck-Load4.vcf index 8a1fb57..55f13d4 100644 --- a/source/tests/LoadCheck-Load4.vcf +++ b/source/tests/LoadCheck-Load4.vcf @@ -35,4 +35,10 @@ ADR;TYPE=work;LABEL="7 Flyby Drive\nElaine\nCornwall\nPL84 9YE\nCornwall\nUn EMAIL;ALTID=10;PID=20;PREF=40;WONDERFUL=Colour:moo@example.com EMAIL;TYPE=home;ALTID=5;PID=10;PREF=20;PEACE=quiet:moo.home@example.com EMAIL;TYPE=work;ALTID=1;PID=2;PREF=3;BUSINESS=Money:moo.business@example.com +IMPP;ALTID=10;PID=20;MEDIATYPE=text/plain;PREF=40;WONDERFUL=Colour:moo@examp + le.com +IMPP;TYPE=home;ALTID=20;PID=40;PREF=80;MEDIATYPE=text/reallyplain;PEACE=quie + t:moo.home@example.com +IMPP;TYPE=work;ALTID=98;PID=99;PREF=50;MEDIATYPE=text/superplain;BUSINESS=Mo + ney:moo.business@example.com END:VCARD diff --git a/source/tests/xestiaab_contactload.h b/source/tests/xestiaab_contactload.h index 873911b..b76c13d 100644 --- a/source/tests/xestiaab_contactload.h +++ b/source/tests/xestiaab_contactload.h @@ -868,6 +868,126 @@ TEST(ContactLoad, EmailTests){ ASSERT_NE(TestFile.BusinessEmailListTokens.end(), TestFileIter); ASSERT_EQ("BUSINESS=Money", TestFileIter->second); +} + +TEST(ContactLoad, IMTests){ + + ContactDataObject TestFile; + + // Check that the vCard 4.0 file loads OK. + + ASSERT_EQ(CONTACTLOAD_OK, TestFile.LoadFile("LoadCheck-Load4.vcf")); + + std::map::iterator TestFileIter; + std::map::iterator TestFileIntIter; + + // Start with the general IM. + + TestFileIter = TestFile.GeneralIMList.find(0); + ASSERT_NE(TestFile.GeneralIMList.end(), TestFileIter); + ASSERT_EQ("moo@example.com", TestFileIter->second); + + // Check the ALTID section. + + TestFileIter = TestFile.GeneralIMListAltID.find(0); + ASSERT_NE(TestFile.GeneralIMListAltID.end(), TestFileIter); + ASSERT_EQ("10", TestFileIter->second); + + // Check the PID section. + + TestFileIter = TestFile.GeneralIMListPID.find(0); + ASSERT_NE(TestFile.GeneralIMListPID.end(), TestFileIter); + ASSERT_EQ("20", TestFileIter->second); + + // Check the MEDIATYPE section. + + TestFileIter = TestFile.GeneralIMListMediatype.find(0); + ASSERT_NE(TestFile.GeneralIMListMediatype.end(), TestFileIter); + ASSERT_EQ("text/plain", TestFileIter->second); + + // Check the PREF section. + + TestFileIntIter = TestFile.GeneralIMListPref.find(0); + ASSERT_NE(TestFile.GeneralIMListPref.end(), TestFileIntIter); + ASSERT_EQ(40, TestFileIntIter->second); + + // Check the extra tokens. + + TestFileIter = TestFile.GeneralIMListTokens.find(0); + ASSERT_NE(TestFile.GeneralIMListTokens.end(), TestFileIter); + ASSERT_EQ("WONDERFUL=Colour", TestFileIter->second); + + // Start with the home IM. + + TestFileIter = TestFile.HomeIMList.find(1); + ASSERT_NE(TestFile.HomeIMList.end(), TestFileIter); + ASSERT_EQ("moo.home@example.com", TestFileIter->second); + + // Check the ALTID section. + + TestFileIter = TestFile.HomeIMListAltID.find(1); + ASSERT_NE(TestFile.HomeIMListAltID.end(), TestFileIter); + ASSERT_EQ("20", TestFileIter->second); + + // Check the PID section. + + TestFileIter = TestFile.HomeIMListPID.find(1); + ASSERT_NE(TestFile.HomeIMListPID.end(), TestFileIter); + ASSERT_EQ("40", TestFileIter->second); + + // Check the MEDIATYPE section. + + TestFileIter = TestFile.HomeIMListMediatype.find(1); + ASSERT_NE(TestFile.HomeIMListMediatype.end(), TestFileIter); + ASSERT_EQ("text/reallyplain", TestFileIter->second); + + // Check the PREF section. + + TestFileIntIter = TestFile.HomeIMListPref.find(1); + ASSERT_NE(TestFile.HomeIMListPref.end(), TestFileIntIter); + ASSERT_EQ(80, TestFileIntIter->second); + + // Check the extra tokens. + + TestFileIter = TestFile.HomeIMListTokens.find(1); + ASSERT_NE(TestFile.HomeIMListTokens.end(), TestFileIter); + ASSERT_EQ("PEACE=quiet", TestFileIter->second); + + // Start with the business IM. + + TestFileIter = TestFile.BusinessIMList.find(2); + ASSERT_NE(TestFile.BusinessIMList.end(), TestFileIter); + ASSERT_EQ("moo.business@example.com", TestFileIter->second); + + // Check the ALTID section. + + TestFileIter = TestFile.BusinessIMListAltID.find(2); + ASSERT_NE(TestFile.BusinessIMListAltID.end(), TestFileIter); + ASSERT_EQ("98", TestFileIter->second); + + // Check the PID section. + + TestFileIter = TestFile.BusinessIMListPID.find(2); + ASSERT_NE(TestFile.BusinessIMListPID.end(), TestFileIter); + ASSERT_EQ("99", TestFileIter->second); + + // Check the MEDIATYPE section. + + TestFileIter = TestFile.BusinessIMListMediatype.find(2); + ASSERT_NE(TestFile.BusinessIMListMediatype.end(), TestFileIter); + ASSERT_EQ("text/superplain", TestFileIter->second); + + // Check the PREF section. + + TestFileIntIter = TestFile.BusinessIMListPref.find(2); + ASSERT_NE(TestFile.BusinessIMListPref.end(), TestFileIntIter); + ASSERT_EQ(50, TestFileIntIter->second); + + // Check the extra tokens. + + TestFileIter = TestFile.BusinessIMListTokens.find(2); + ASSERT_NE(TestFile.BusinessIMListTokens.end(), TestFileIter); + ASSERT_EQ("BUSINESS=Money", TestFileIter->second); } -- 2.39.2