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

 void CPackages::LoadVirtualFileSystem()
+{
 	if ( !m_bLoadVFS )
 		return;
+	m_pGameVFS.SetAddon(this->GetAddonDir().ToString());
 	if ( m_pEnabledMod )
+	{
 		C_File *f;
 		for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )
+		{
+ *
  * Searching for the next gap in automatic text files, start with 0003-LXXX or XX0003
  */
 int CPackages::FindNextTextFile(int start, CyString dir)
+{
-	CDirIO Dir((dir.Empty()) ? m_sCurrentDir : dir);
-	Dir.cd("t");
 	int check = start;
 	if ( check < 2 ) check = 2;
 	while ( check < 9999 )
+	{
 		++check;
-		CyString newFilename = SPK::FormatTextName(check, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT));
+		Utils::String newFilename = SPK::FormatTextName(check, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT)).ToString();
-		// check if a packed file exists
+		// check the vfs
-		if ( !Dir.Exists(newFilename + ".pck") )
+		if ( m_pGameVFS.isFileAvailable("t/" + newFilename + ".pck") ) continue;
-		{
-			// it doen't, check if theres an unpacked file
-			if ( !Dir.Exists(newFilename + ".xml") )
+		if ( m_pGameVFS.isFileAvailable("t/" + newFilename + ".xml") ) continue;
-				break;
+		break;
-		}
+	}
 	return check;
+}
 	if ( File.CheckFileExtension("cat") || File.CheckFileExtension("dat") )
 		return FILETYPE_MOD;
 	// check for text files
 	if ( File.GetFilename().IsIn("-L") && File.GetFilename().Left(4).ToInt() )
 		return FILETYPE_TEXT;
+	if ( File.GetBaseName().Compare("conversations") )
+		return FILETYPE_TEXT;
 	if ( basename.Length() <= 4 && basename.IsNumber() && (File.CheckFileExtension("xml") || File.CheckFileExtension("pck")) )
 		return FILETYPE_TEXT;
 	// X2/X3 text file
 	if ( basename.Length() >= 5 && basename.Length() <= 8 && File.GetBaseName().ToInt() )
 		return FILETYPE_TEXT;
+	}
 	CLEANSPLIT(str, max)
+}
-CBaseFile *CPackages::CreateFromArchive(CyString filename, bool toInstall )
+CBaseFile *CPackages::_archive_fromRar(CyString filename, bool toInstall )
+{
 	// make sure we can open the zip file
 	CBaseFile *archive = NULL;
-	if ( CFileIO(filename).CheckFileExtension("rar") )
-	{
 #ifdef _RAR
-		HANDLE hArcData;
+	HANDLE hArcData;
-		int RHCode,PFCode;
+	int RHCode,PFCode;
-		char CmtBuf[16384];
+	char CmtBuf[16384];
-		struct RARHeaderDataEx HeaderData;
+	struct RARHeaderDataEx HeaderData;
-		struct RAROpenArchiveDataEx OpenArchiveData;
+	struct RAROpenArchiveDataEx OpenArchiveData;
-		if ( toInstall )
-		{
-			memset(&OpenArchiveData,0,sizeof(OpenArchiveData));
-			OpenArchiveData.ArcName=(char *)filename.c_str();
-			OpenArchiveData.CmtBuf=CmtBuf;
-			OpenArchiveData.CmtBufSize=sizeof(CmtBuf);
-			OpenArchiveData.OpenMode=RAR_OM_LIST;
-	//		OpenArchiveData.UserData=LIST;
-			hArcData=RAROpenArchiveEx(&OpenArchiveData);
-			if (OpenArchiveData.OpenResult!=0)
-				return NULL;
-			HeaderData.CmtBuf=NULL;
-			memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
-			while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
-			{
-				if ( CyString(HeaderData.FileName).Compare("pluginmanager.txt") )
-				{
-					toInstall = false;
-					break;
-				}
-			}
-			RARCloseArchive(hArcData);
-		}
-		if ( toInstall )
-			archive = new CArchiveFile(); // just installing an archive file
-		else
-			archive = new CSpkFile(); // converting to a spk file
+	// find the pluginmanager text to covnert to spkfile
+	if ( toInstall ) {
 		memset(&OpenArchiveData,0,sizeof(OpenArchiveData));
 		OpenArchiveData.ArcName=(char *)filename.c_str();
 		OpenArchiveData.CmtBuf=CmtBuf;
 		OpenArchiveData.CmtBufSize=sizeof(CmtBuf);
-		OpenArchiveData.OpenMode=RAR_OM_EXTRACT;
+		OpenArchiveData.OpenMode=RAR_OM_LIST;
-		OpenArchiveData.UserData=EXTRACT;
 		hArcData=RAROpenArchiveEx(&OpenArchiveData);
-		if (OpenArchiveData.OpenResult!=0)
+		if (OpenArchiveData.OpenResult!=0) return NULL;
-			return NULL;
 		HeaderData.CmtBuf=NULL;
 		memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
-		bool error = false;
-		CyString extractedFile = CDirIO(m_sTempDir).File("extracted.tst").findreplace("/", "\\").findreplace("\\\\", "\\");
-		while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
+		while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0) {
-		{
-			CyString fileName = HeaderData.FileName;
+			if ( CyString(HeaderData.FileName).Compare("pluginmanager.txt") ) {
-			if ( HeaderData.FileAttr == 16 )
-				continue;
-			wchar_t wText[200];
-			::MultiByteToWideChar(CP_ACP, NULL, (char *)extractedFile.c_str(), -1, wText, extractedFile.Length() + 1);
-			PFCode=RARProcessFileW(hArcData, RAR_EXTRACT, NULL, NULL);
-			if (PFCode!=0)
-			{
-				error = true;
+				toInstall = false;
 				break;
+			}
-			CFileIO File(fileName);
-			if ( File.Exists() )
-			{
-				if ( fileName.Compare("pluginmanager.txt") )
-					this->ReadArchiveData(File.GetFullFilename(), archive);
-				else
-				{
-					CyString 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());
-				}
-				File.Remove();
-			}
+		}
 		RARCloseArchive(hArcData);
-		if ( error )
-		{
-			delete archive;
-			archive = NULL;
-		}
-#endif
+	}
-	else if ( CFileIO(filename).CheckFileExtension("zip") )
-	{
-		TCHAR buf[5000];
-		wsprintf(buf, L"%hs", filename.c_str());
-		HZIP hz = OpenZip(buf, 0);
-		if ( !hz )
-			return NULL;
-		int index;
-		// move the files from the zip to the package
-		ZIPENTRY ze;
-		if ( FindZipItem(hz, L"pluginmanager.txt", true, &index, &ze) == Z_OK )
-			toInstall = false;
-		CloseZip(hz);
-		hz = OpenZip(buf, 0);
-		if ( !hz )
-			return NULL;
-		// create the correct package
-		if ( toInstall )
+	if ( toInstall )
-			archive = new CArchiveFile(); // just installing an archive file
+		archive = new CArchiveFile(); // just installing an archive file
-		else
+	else
-			archive = new CSpkFile(); // converting to a spk file
+		archive = new CSpkFile(); // converting to a spk file
-		GetZipItem(hz, -1, &ze);
-		int numitems = ze.index;
-		bool error = false;
+	memset(&OpenArchiveData,0,sizeof(OpenArchiveData));
-		for ( int zi = 0; zi < numitems; zi++ )
+	OpenArchiveData.ArcName=(char *)filename.c_str();
-		{
-			ZIPENTRY ze;
+	OpenArchiveData.CmtBuf=CmtBuf;
-			if ( GetZipItem(hz, zi, &ze) != Z_OK )
+	OpenArchiveData.CmtBufSize=sizeof(CmtBuf);
-			{
-				error = true;
+	OpenArchiveData.OpenMode=RAR_OM_EXTRACT;
-				break;
+	OpenArchiveData.UserData=EXTRACT;
-			}
+	hArcData=RAROpenArchiveEx(&OpenArchiveData);
-			if ( ze.attr & FILE_ATTRIBUTE_DIRECTORY )
+	if (OpenArchiveData.OpenResult!=0) return NULL;
-				continue; // dont do directories
+	HeaderData.CmtBuf=NULL;
+	memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
-			char *iBuf = new char[ze.unc_size];
+	bool error = false;
+	CyString extractedFile = CDirIO(m_sTempDir).File("extracted.tst").findreplace("/", "\\").findreplace("\\\\", "\\");
+	while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
+	{
-			UnzipItem(hz, zi, iBuf, ze.unc_size);
+		CyString fileName = HeaderData.FileName;
+		if ( HeaderData.FileAttr == 16 )
+			continue;
-			CyString Name(ze.name);
+		wchar_t wText[200];
+		::MultiByteToWideChar(CP_ACP, NULL, (char *)extractedFile.c_str(), -1, wText, extractedFile.Length() + 1);
+		PFCode=RARProcessFileW(hArcData, RAR_EXTRACT, NULL, NULL);
+		if (PFCode!=0)
+		{
+			error = true;
+			break;
+		}
-			// if its the data file, dont add it, but extract to get settings from
+		CFileIO File(fileName);
-			if ( Name.Compare("pluginmanager.txt") )
+		if ( File.Exists() )
-			{
+		{
+			if ( fileName.Compare("pluginmanager.txt") )
-				this->ReadArchiveData(iBuf, ze.unc_size, archive);
+				this->ReadArchiveData(File.GetFullFilename(), archive);
-				delete[] iBuf;
-			}
 			else
+			{
 				CyString extradir;
-				int type = SPK::GetAutomaticFiletype(Name, &extradir, true);
+				int type = SPK::GetAutomaticFiletype(fileName, &extradir, true);
+				// check for special file types
 				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);
+					f = archive->AddFile(CFileIO(fileName).GetFilename(), CFileIO(fileName).GetDir(), FILETYPE_SCRIPT);
 					if ( f ) {
-						f->SetData((const unsigned char *)iBuf, ze.unc_size);
+						f->ReadFromFile(File.GetFullFilename());
+					}
 					type = FILETYPE_UNINSTALL;
+				}
 				if ( type == -1 )
-					f = archive->AddFile(CFileIO(Name).GetFilename(), CFileIO(Name).GetDir(), FILETYPE_EXTRA);
+					f = archive->AddFile(CFileIO(fileName).GetFilename(), CFileIO(fileName).GetDir(), FILETYPE_EXTRA);
 				else
-					f = archive->AddFile(CFileIO(Name).GetFilename(), extradir, type);
+					f = archive->AddFile(CFileIO(fileName).GetFilename(), extradir, type);
-				if ( f )
-					f->SetData((const unsigned char *)iBuf, ze.unc_size);
+				f->ReadFromFile(File.GetFullFilename());
-				else
-					delete[] iBuf;
+			}
+			File.Remove();
+		}
+	}
+	RARCloseArchive(hArcData);
+	if ( error )
+	{
+		delete archive;
+		archive = NULL;
+	}
+#endif
+	return archive;
+}
+CBaseFile *CPackages::_archive_fromZip(CyString filename, bool toInstall)
+{
+	CBaseFile *archive = NULL;
+	TCHAR buf[5000];
+	wsprintf(buf, L"%hs", filename.c_str());
+	HZIP hz = OpenZip(buf, 0);
+	if ( !hz )
+		return NULL;
+	int index;
+	// move the files from the zip to the package
+	ZIPENTRY ze;
+	if ( FindZipItem(hz, L"pluginmanager.txt", true, &index, &ze) == Z_OK )
+		toInstall = false;
+	CloseZip(hz);
+	hz = OpenZip(buf, 0);
+	if ( !hz )
+		return NULL;
+	// create the correct package
+	if ( toInstall )
+		archive = new CArchiveFile(); // just installing an archive file
+	else
+		archive = new CSpkFile(); // converting to a spk file
+	GetZipItem(hz, -1, &ze);
+	int numitems = ze.index;
+	bool error = false;
+	for ( int zi = 0; zi < numitems; zi++ )
+	{
+		ZIPENTRY ze;
+		if ( GetZipItem(hz, zi, &ze) != Z_OK )
+		{
+			error = true;
+			break;
+		}
+		if ( ze.attr & FILE_ATTRIBUTE_DIRECTORY )
-		CloseZip(hz);
+			continue; // dont do directories
+		char *iBuf = new char[ze.unc_size];
+		UnzipItem(hz, zi, iBuf, ze.unc_size);
+		CyString Name(ze.name);
+		// if its the data file, dont add it, but extract to get settings from
+		if ( Name.Compare("pluginmanager.txt") )
+		{
+			this->ReadArchiveData(iBuf, ze.unc_size, archive);
-		if ( error )
+			delete[] iBuf;
+		}
+		else
+		{
-			delete archive;
+			CyString extradir;
+			int type = SPK::GetAutomaticFiletype(Name, &extradir, true);
-			archive = NULL;
+			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->copyData((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);
+			if ( f )
+				f->SetData((const unsigned char *)iBuf, ze.unc_size);
+			else
+				delete[] iBuf;
+		}
+	}
+	CloseZip(hz);
-	if ( archive )
+	if ( error )
+	{
+		delete archive;
+		archive = NULL;
+	}
+	return archive;
+}
+CBaseFile *CPackages::CreateFromArchive(CyString filename, bool toInstall )
+{
+	// make sure we can open the zip file
+	CBaseFile *archive = NULL;
+	if ( CFileIO(filename).CheckFileExtension("rar") )
+		archive = this->_archive_fromRar(filename, toInstall);
+	else if ( CFileIO(filename).CheckFileExtension("zip") )
+		archive = this->_archive_fromZip(filename, toInstall);
+	if ( archive ) {
 		archive->SetFilename(CFileIO(filename).ChangeFileExtension("spk"));
 		if ( toInstall )
 			archive->SetName(CFileIO(filename).GetFilename());
 		else
 			archive->SetName(CFileIO(filename).GetBaseName());

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 42 → 43