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



bool CBaseFile::_install_uncompress(C_File *fit, CProgressInfo *progress, CyStringList *errorStr, bool *uncomprToFile)
{
	*uncomprToFile = false;
	m_sLastError = fit->GetNameDirectory(this);
	m_iLastError = SPKERR_UNCOMPRESS;
 
	if ( !fit->UncompressData ( progress ) )
	{
		CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");
		if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )
		{

	{
		Utils::String filename = sRest;
		Utils::String cdate = this->creationDate().findReplace("/", ".").remove(' ');
		if ( filename.isin("$AUTOSAVE") )
		{
			if ( this->GetType() == TYPE_XSP )
				filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.xsp");
			else
				filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.spk");
		}
		filename = filename.findReplace("$NAME", this->name().remove(' '));

Subversion Repositories spk

(root)//libspk/src/BaseFile.cpp – Rev 91 → 96

Rev 91		Rev 96
Line 921...		Line 921...
921	`bool CBaseFile::_install_uncompress(C_File fit, CProgressInfo progress, CyStringList errorStr, bool uncomprToFile)`	921	`bool CBaseFile::_install_uncompress(C_File fit, CProgressInfo progress, CyStringList errorStr, bool uncomprToFile)`
922	`{`	922	`{`
923	`*uncomprToFile = false;`	923	`*uncomprToFile = false;`
924	`m_sLastError = fit->GetNameDirectory(this);`	924	`m_sLastError = fit->GetNameDirectory(this);`
925	`m_iLastError = SPKERR_UNCOMPRESS;`	925	`m_iLastError = SPKERR_UNCOMPRESS;`
-		926
926	`if ( !fit->UncompressData ( progress ) )`	927	`if ( !fit->UncompressData ( progress ) )`
927	`{`	928	`{`
928	`CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");`	929	`CLog::log(CLog::Log_Install, 2, "Failed to uncompress data, attempting file decompression");`
929	`if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )`	930	`if ( fit->GetCompressionType() == SPKCOMPRESS_7ZIP )`
930	`{`	931	`{`
Line 2609...		Line 2610...
2609	`{`	2610	`{`
2610	`Utils::String filename = sRest;`	2611	`Utils::String filename = sRest;`
2611	`Utils::String cdate = this->creationDate().findReplace("/", ".").remove(' ');`	2612	`Utils::String cdate = this->creationDate().findReplace("/", ".").remove(' ');`
2612	`if ( filename.isin("$AUTOSAVE") )`	2613	`if ( filename.isin("$AUTOSAVE") )`
2613	`{`	2614	`{`
2614	`if ( this->GetType() )`	2615	`if ( this->GetType() == TYPE_XSP )`
2615	`filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.xsp");`	2616	`filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.xsp");`
2616	`else`	2617	`else`
2617	`filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.spk");`	2618	`filename = filename.findReplace("$AUTOSAVE", "$NAME-V$VERSION-$CDATE.spk");`
2618	`}`	2619	`}`
2619	`filename = filename.findReplace("$NAME", this->name().remove(' '));`	2620	`filename = filename.findReplace("$NAME", this->name().remove(' '));`