WebSVN – spk – Diff – /libspk/src/Packages.cpp

 			CLEANSPLIT(empStr, empEntries);
+		}
+	}
+}
+CyString parseXmlText(const CyString &str)
+{
+	CyString newStr(str);
+	CyStringList changes;
+	// find all XML commands, &<command>;
+	std::string sStr = str.ToString();
+	std::string::size_type pos = sStr.find_first_of("&", 0);
+	while ( pos != std::string::npos ) {
+		// find the next space and next ;.  If ; comes first, assume its acommand
+		std::string::size_type spacePos = sStr.find_first_of(" ", pos);
+		std::string::size_type colonPos = sStr.find_first_of(";", pos);
+		if ( colonPos != std::string::npos && colonPos < spacePos ) {
+			// replace with <::command::> so they the & doesn't get replaced
+			std::string repStr = sStr.substr(pos, (colonPos + 1) - pos);
+			std::string repWithStr = "<::" + sStr.substr(pos + 1, colonPos - pos - 1) + "::>";
+			newStr.FindReplace(repStr, repWithStr);
+			changes.PushBack(repStr, repWithStr);
+		}
+		// find the next command
+		pos = sStr.find_first_of("&", pos + 1);
+	}
+	// replace the & now
+	newStr = newStr.FindReplace("&", "&amp;");
+	// restore the commands
+	for ( SStringList *strNode = changes.Head(); strNode; strNode = strNode->next ) {
+		newStr.FindReplace(strNode->data, strNode->str);
+	}
+	return newStr;
+}
 CyString CPackages::ConvertTextString(CyString text)
+{
+	//process any &
+	text = parseXmlText(text);
+	// change special cases
 	text = text.FindReplace("(", "\\(");
 	text = text.FindReplace(")", "\\)");
 	text = text.FindReplace("[", "{");
 	text = text.FindReplace("]", "}");
 	text = text.FindReplace(">", "&gt;");
 	text = text.FindReplace("<", "&lt;");
-	text = text.FindReplace("&", "&amp;");
 	return text;
+}
 void CPackages::CreatePluginManagerText()
+{
 		writeData.push_back(CyString("		<t id=\"5\">") + CyString::Number(start) + "</t>");
 		for ( CListNode<SGameWare> *node = lWares.Front(); node; node = node->next() )
+		{
 			SGameWare *w = node->Data();
 			if ( w->pWare && w->iType == WARETYPE_ADDED )
-				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">" + w->sWareName + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">" + this->ConvertTextString(w->sWareName) + "</t>");
 			else
 				writeData.push_back(CyString("		<t id=\"") + (long)start + "\">-1</t>");
 			writeData.push_back(CyString("		<t id=\"") + (long)(start + 1) + "\">" + CyString((char)w->cType) + "</t>");
 			writeData.push_back(CyString("		<t id=\"") + (long)(start + 2) + "\">" + (long)w->iPos + "</t>");
 			start += 10;
 			// find the correct text for the language
 			CyString name = CSpkFile::GetWareText(w->pWare, m_iLanguage);
 			CyString desc = CSpkFile::GetWareDesc(w->pWare, m_iLanguage);
 			if ( !name.Empty() )
-				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 3) + "\">" + name + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 3) + "\">" + this->ConvertTextString(name) + "</t>");
 			if ( !desc.Empty() )
-				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 4) + "\">" + desc + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)(w->iText + 4) + "\">" + this->ConvertTextString(desc) + "</t>");
+		}
 		for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
+		{
 			SGameShip *s = node->Data();
 			if ( !s->pPackage || s->iType != WARETYPE_ADDED )
 				continue;
 			CyString name = s->pPackage->GetTextName(m_iLanguage);
 			CyString desc = s->pPackage->GetTextDescription(m_iLanguage);
 			if ( !name.Empty() )
-				writeData.push_back(CyString("		<t id=\"") + (long)s->iText + "\">" + name + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)s->iText + "\">" + this->ConvertTextString(name) + "</t>");
 			if ( !desc.Empty() )
-				writeData.push_back(CyString("		<t id=\"") + (long)(s->iText + 1) + "\">" + desc + "</t>");
+				writeData.push_back(CyString("		<t id=\"") + (long)(s->iText + 1) + "\">" + this->ConvertTextString(desc) + "</t>");
+		}
 		writeData.push_back(CyString("  </page>"));
+	}
 	writeData.push_back(CyString("</language>"));
 	textFile.WriteFileUTF(&writeData);
 				if ( fileName.Compare("pluginmanager.txt") )
 					this->ReadArchiveData(File.GetFullFilename(), archive);
 				else
+				{
 					CyString extradir;
-					int type = SPK::GetAutomaticFiletype(fileName, &extradir);
+					int type = SPK::GetAutomaticFiletype(fileName, &extradir, true);
+					// check for special file types
 					C_File *f = NULL;
+					if ( type == FILETYPE_SCRIPT_UNINSTALL ) {
+						f = archive->AddFile(CFileIO(fileName).GetFilename(), CFileIO(fileName).GetDir(), FILETYPE_SCRIPT);
+						if ( f ) {
+							f->ReadFromFile(File.GetFullFilename());
+						}
+						type = FILETYPE_UNINSTALL;
+					}
 					if ( type == -1 )
 						f = archive->AddFile(CFileIO(fileName).GetFilename(), CFileIO(fileName).GetDir(), FILETYPE_EXTRA);
 					else
 						f = archive->AddFile(CFileIO(fileName).GetFilename(), extradir, type);
 					f->ReadFromFile(File.GetFullFilename());
 				delete[] iBuf;
+			}
 			else
+			{
 				CyString extradir;
-				int type = SPK::GetAutomaticFiletype(Name, &extradir);
+				int type = SPK::GetAutomaticFiletype(Name, &extradir, true);
 				C_File *f = NULL;
+				// check for special file types
+				if ( type == FILETYPE_SCRIPT_UNINSTALL ) {
+					f = archive->AddFile(CFileIO(Name).GetFilename(), CFileIO(Name).GetDir(), FILETYPE_SCRIPT);
+					if ( f ) {
+						f->SetData((const unsigned char *)iBuf, ze.unc_size);
+					}
+					type = FILETYPE_UNINSTALL;
+				}
 				if ( type == -1 )
 					f = archive->AddFile(CFileIO(Name).GetFilename(), CFileIO(Name).GetDir(), FILETYPE_EXTRA);
 				else
 					f = archive->AddFile(CFileIO(Name).GetFilename(), extradir, type);

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 14 → 17