Subversion Repositories spk

Rev

Rev 222 | Rev 226 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 222 Rev 223
Line 9271... Line 9271...
9271
 
9271
 
9272
		CFileIO File(fileName);
9272
		CFileIO File(fileName);
9273
		if ( File.exists() )
9273
		if ( File.exists() )
9274
		{
9274
		{
9275
			if ( fileName.Compare(L"pluginmanager.txt") )
9275
			if ( fileName.Compare(L"pluginmanager.txt") )
9276
				this->readArchiveData(File.fullFilenameStr(), archive);
9276
				this->readArchiveData(File.fullFilename(), archive);
9277
			else
9277
			else
9278
			{
9278
			{
9279
				Utils::WString extradir;
9279
				Utils::WString extradir;
9280
				int type = SPK::GetAutomaticFiletype(fileName, &extradir, true);
9280
				int type = SPK::GetAutomaticFiletype(fileName, &extradir, true);
9281
				// check for special file types
9281
				// check for special file types
Line 9428... Line 9428...
9428
		archive = this->_archive_fromZip(filename, toInstall);
9428
		archive = this->_archive_fromZip(filename, toInstall);
9429
 
9429
 
9430
	if ( archive ) {
9430
	if ( archive ) {
9431
		archive->setFilename(CFileIO(filename).changeFileExtension(L"spk"));
9431
		archive->setFilename(CFileIO(filename).changeFileExtension(L"spk"));
9432
		if ( toInstall )
9432
		if ( toInstall )
9433
			archive->setName(CFileIO(filename).filenameStr());
9433
			archive->setName(CFileIO(filename).filename());
9434
		else
9434
		else
9435
			archive->setName(CFileIO(filename).baseName());
9435
			archive->setName(CFileIO(filename).baseName());
9436
	}
9436
	}
9437
 
9437
 
9438
	return archive;
9438
	return archive;