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



 
	CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");
	if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))
	{
		CCatFile openFile;
		if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)
		{
//			if ( openFile.internaldatFilename().Compare("PlugMan_Fake.dat") ) return true;
			int count = 0;
			int noncount = 0;
 

	// both the cat file and dat file exists, lets open it
	CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");
	if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))
	{
		CCatFile openFile;
		if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)
		{
			if ( openFile.findData("PlugMan\\TFake.pck") )
				return true;
			if ( openFile.findData("pluginmanagerfake.pck") )
				return true;

 
	if ( file->filePointer().contains(L"::")) {
		CFileIO CatFile(file->filePointer().token(L"::", 1));
		if ( CatFile.exists() ) {
			CCatFile cat;
			if ( cat.open(CatFile.fullFilename(), this->getAddonDir(), CATREAD_DAT, false) == CATERR_NONE) {
				Utils::WString fileName = file->filePointer().token(L"::", 2);
				if ( cat.findData(fileName) ) {
					if ( cat.removeFile(fileName) ) {
						this->addLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);
					}

		unsigned char *pckData = PCKData((unsigned char *)fileData, fileSize, &newFileSize, true);
		if ( pckData )
		{
			CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");
			pckFile.WriteData((char *)pckData, newFileSize);
			this->addCreatedFile(pckFile.fullFilename());
		}
	}
	textFile.remove();
}
 

		unsigned char *pckData = PCKData((unsigned char *)fileData, fileSize, &newFileSize, true);
		if ( pckData )
		{
			CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");
			pckFile.WriteData((char *)pckData, newFileSize);
			this->addCreatedFile(pckFile.fullFilename());
		}
	}
	textFile.remove();
}
 

 
				if ( type == -1 )
					f = archive->addFile(CFileIO(fileName).filename(), CFileIO(fileName).dir(), FILETYPE_EXTRA);
				else
					f = archive->addFile(CFileIO(fileName).filename(), extradir, static_cast<FileType>(type));
				f->readFromFile(File.fullFilename());
			}
 
			File.remove();
		}
	}

Rev 199	Rev 202
Line 886...	Line 886...
886		886
887	`CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");`	887	`CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");`
888	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`	888	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`
889	`{`	889	`{`
890	`CCatFile openFile;`	890	`CCatFile openFile;`
891	`if ( openFile.open(catFile.fullFilenameStr(), this->getAddonDir().toString(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`	891	`if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`
892	`{`	892	`{`
893	`// if ( openFile.internaldatFilename().Compare("PlugMan_Fake.dat") ) return true;`	893	`// if ( openFile.internaldatFilename().Compare("PlugMan_Fake.dat") ) return true;`
894	`int count = 0;`	894	`int count = 0;`
895	`int noncount = 0;`	895	`int noncount = 0;`
896		896
Line 921...	Line 921...
921	`// both the cat file and dat file exists, lets open it`	921	`// both the cat file and dat file exists, lets open it`
922	`CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");`	922	`CFileIO catFile(m_sCurrentDir + L"/" + filename + L".cat");`
923	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`	923	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`
924	`{`	924	`{`
925	`CCatFile openFile;`	925	`CCatFile openFile;`
926	`if ( openFile.open(catFile.fullFilenameStr(), this->getAddonDir().toString(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`	926	`if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`
927	`{`	927	`{`
928	`if ( openFile.findData("PlugMan\\TFake.pck") )`	928	`if ( openFile.findData("PlugMan\\TFake.pck") )`
929	`return true;`	929	`return true;`
930	`if ( openFile.findData("pluginmanagerfake.pck") )`	930	`if ( openFile.findData("pluginmanagerfake.pck") )`
931	`return true;`	931	`return true;`
Line 4883...	Line 4883...
4883		4883
4884	`if ( file->filePointer().contains(L"::")) {`	4884	`if ( file->filePointer().contains(L"::")) {`
4885	`CFileIO CatFile(file->filePointer().token(L"::", 1));`	4885	`CFileIO CatFile(file->filePointer().token(L"::", 1));`
4886	`if ( CatFile.exists() ) {`	4886	`if ( CatFile.exists() ) {`
4887	`CCatFile cat;`	4887	`CCatFile cat;`
4888	`if ( cat.open(CatFile.fullFilenameStr(), this->getAddonDir(), CATREAD_DAT, false) == CATERR_NONE) {`	4888	`if ( cat.open(CatFile.fullFilename(), this->getAddonDir(), CATREAD_DAT, false) == CATERR_NONE) {`
4889	`Utils::WString fileName = file->filePointer().token(L"::", 2);`	4889	`Utils::WString fileName = file->filePointer().token(L"::", 2);`
4890	`if ( cat.findData(fileName) ) {`	4890	`if ( cat.findData(fileName) ) {`
4891	`if ( cat.removeFile(fileName) ) {`	4891	`if ( cat.removeFile(fileName) ) {`
4892	`this->addLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);`	4892	`this->addLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);`
4893	`}`	4893	`}`
Line 5773...	Line 5773...
5773	`unsigned char pckData = PCKData((unsigned char )fileData, fileSize, &newFileSize, true);`	5773	`unsigned char pckData = PCKData((unsigned char )fileData, fileSize, &newFileSize, true);`
5774	`if ( pckData )`	5774	`if ( pckData )`
5775	`{`	5775	`{`
5776	`CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");`	5776	`CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");`
5777	`pckFile.WriteData((char *)pckData, newFileSize);`	5777	`pckFile.WriteData((char *)pckData, newFileSize);`
5778	`this->addCreatedFile(pckFile.fullFilenameStr());`	5778	`this->addCreatedFile(pckFile.fullFilename());`
5779	`}`	5779	`}`
5780	`}`	5780	`}`
5781	`textFile.remove();`	5781	`textFile.remove();`
5782	`}`	5782	`}`
5783		5783
Line 6040...	Line 6040...
6040	`unsigned char pckData = PCKData((unsigned char )fileData, fileSize, &newFileSize, true);`	6040	`unsigned char pckData = PCKData((unsigned char )fileData, fileSize, &newFileSize, true);`
6041	`if ( pckData )`	6041	`if ( pckData )`
6042	`{`	6042	`{`
6043	`CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");`	6043	`CFileIO pckFile(m_sCurrentDir + L"/t/" + filename + L".pck");`
6044	`pckFile.WriteData((char *)pckData, newFileSize);`	6044	`pckFile.WriteData((char *)pckData, newFileSize);`
6045	`this->addCreatedFile(pckFile.fullFilenameStr());`	6045	`this->addCreatedFile(pckFile.fullFilename());`
6046	`}`	6046	`}`
6047	`}`	6047	`}`
6048	`textFile.remove();`	6048	`textFile.remove();`
6049	`}`	6049	`}`
6050		6050
Line 9313...	Line 9313...
9313		9313
9314	`if ( type == -1 )`	9314	`if ( type == -1 )`
9315	`f = archive->addFile(CFileIO(fileName).filename(), CFileIO(fileName).dir(), FILETYPE_EXTRA);`	9315	`f = archive->addFile(CFileIO(fileName).filename(), CFileIO(fileName).dir(), FILETYPE_EXTRA);`
9316	`else`	9316	`else`
9317	`f = archive->addFile(CFileIO(fileName).filename(), extradir, static_cast<FileType>(type));`	9317	`f = archive->addFile(CFileIO(fileName).filename(), extradir, static_cast<FileType>(type));`
9318	`f->readFromFile(File.fullFilenameStr());`	9318	`f->readFromFile(File.fullFilename());`
9319	`}`	9319	`}`
9320		9320
9321	`File.remove();`	9321	`File.remove();`
9322	`}`	9322	`}`
9323	`}`	9323	`}`

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 199 → 202