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

 ##########################################################################################
 ##################                Base Class Functions                  ##################
 ##########################################################################################
 */
+const CLinkList<C_File> *CBaseFile::fileList() const
+{
+	return &m_lFiles;
+}
 CLinkList<C_File> *CBaseFile::fileList(int type) const
+{
 	CLinkList<C_File> *list = new CLinkList<C_File>;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 	return true;
+}
-bool CBaseFile::ExtractFile ( C_File *file, CyString dir, bool includedir, CProgressInfo *progress )
+bool CBaseFile::ExtractFile(C_File *file, CyString dir, bool includedir, CProgressInfo *progress)
+{
+	return extractFile(file, dir.ToString(), includedir, progress);
+}
+bool CBaseFile::extractFile(C_File *file, const Utils::String &dir, bool includedir, CProgressInfo *progress)
+{
+	if (ReadFileToMemory(file))
+	{
+		// now finally, uncompress the file
+		long len = 0;
+		unsigned char *data = file->UncompressData(&len, progress);
+		if (!data)
+		{
+			// attempt a file decompress
+			if (file->GetCompressionType() == SPKCOMPRESS_7ZIP)
+			{
+				if (file->UncompressToFile(dir, this, includedir, progress))
+					return true;
+			}
+			return false;
+		}
+		if (!file->writeToDir(dir, this, includedir, Utils::String::Null(), data, len))
+			return false;
+		return true;
+	}
+	else
+		return false;
+}
+bool CBaseFile::extractFile(C_File *file, const Utils::String &dir, unsigned int game, const Utils::CStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
-	if ( ReadFileToMemory ( file ) )
+	if (ReadFileToMemory(file))
+	{
+		CDirIO Dir(dir);
+		Utils::String addonDir;
+		if (file->isFileInAddon())
+		{
+			int addonGame = file->getForSingleGame();
+			if (!addonGame) addonGame = game;
+			if (addonGame > 0)
+				addonDir = gameAddons.findString(Utils::String::Number(addonGame));
+		}
+		if (!addonDir.empty())
+			Dir.cd(addonDir);
+		// create directory first
+		Dir.create(file->getDirectory(this));
 		// now finally, uncompress the file
 		long len = 0;
-		unsigned char *data = file->UncompressData ( &len, progress );
+		unsigned char *data = file->UncompressData(&len, progress);
-		if ( !data )
+		if (!data)
+		{
 			// attempt a file decompress
-			if ( file->GetCompressionType() == SPKCOMPRESS_7ZIP )
+			if (file->GetCompressionType() == SPKCOMPRESS_7ZIP)
+			{
-				if ( file->UncompressToFile ( dir, this, includedir, progress ) )
+				if (file->UncompressToFile(Dir.dir(), this, includedir, progress))
 					return true;
+			}
 			return false;
+		}
-		if ( !file->writeToDir(dir.ToString(), this, includedir, Utils::String::Null(), data, len) )
+		if (!file->writeToDir(Dir.dir(), this, includedir, Utils::String::Null(), data, len))
 			return false;
 		return true;
+	}
 	else
 		return false;
+}
-bool CBaseFile::ExtractFile ( int filenum, CyString dir, bool includedir, CProgressInfo *progress )
+bool CBaseFile::ExtractFile(int filenum, CyString dir, bool includedir, CProgressInfo *progress)
+{
+	// invalid valus
+	if (filenum < 0)
+		return false;
+	// out of range
+	if (filenum > m_lFiles.size())
+		return false;
+	// get the file pointer
+	C_File *file = m_lFiles.Get(filenum);
+	return extractFile(file, dir.ToString(), includedir, progress);
+}
+bool CBaseFile::extractFile(int filenum, const Utils::String &dir, unsigned int game, const Utils::CStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
+	// invalid valus
+	if (filenum < 0)
+		return false;
+	// out of range
+	if (filenum > m_lFiles.size())
+		return false;
+	// get the file pointer
+	C_File *file = m_lFiles.Get(filenum);
+	return extractFile(file, dir, game, gameAddons, includedir, progress);
+}
+bool CBaseFile::extractFile(int filenum, const Utils::String &dir, bool includedir, CProgressInfo *progress)
+{
 	// invalid valus
-	if ( filenum < 0 )
+	if (filenum < 0)
 		return false;
 	// out of range
-	if ( filenum > m_lFiles.size() )
+	if (filenum > m_lFiles.size())
 		return false;
 	// get the file pointer
-	C_File *file = m_lFiles.Get ( filenum );
+	C_File *file = m_lFiles.Get(filenum);
-	return ExtractFile ( file, dir, includedir, progress );
+	return ExtractFile(file, dir, includedir, progress);
+}
 bool CBaseFile::extractAll(const Utils::String &dir, int game, const Utils::CStringList &gameAddons, bool includedir, CProgressInfo *progress)
+{
 	// no file to read from
+		}
 		bool done = false;
 		if ( wildcard )
+		{
-			Utils::String base = f->Data()->GetBaseName().ToString();
+			Utils::String base = f->Data()->baseName();
-			if ( f->Data()->GetFileType() == FILETYPE_SCRIPT )
+			if ( f->Data()->fileType() == FILETYPE_SCRIPT )
+			{
 				if ( base.token(".", 1).Compare("plugin") || base.token(".", 1).Compare("lib") )
+				{
-					name += f->Data()->GetDirectory(this).ToString() + "/" + base.tokens(".", 1, 2) + ".*";
+					name += f->Data()->getDirectory(this) + "/" + base.tokens(".", 1, 2) + ".*";
 					done = true;
+				}
 				else if ( base.token(".", 1).Compare("al") && !base.token(".", 2).Compare("plugin") )
+				{
-					name += f->Data()->GetDirectory(this).ToString() + "/" + base.tokens(".", 1, 2) + ".*";
+					name += f->Data()->getDirectory(this) + "/" + base.tokens(".", 1, 2) + ".*";
 					done = true;
+				}
+			}
-			else if ( f->Data()->GetFileType() == FILETYPE_TEXT )
+			else if ( f->Data()->fileType() == FILETYPE_TEXT )
+			{
 				if ( base.contains("-L") )
+				{
-					name += f->Data()->GetDirectory(this).ToString() + "/" + base.token("-L", 1) + "-L*";
+					name += f->Data()->getDirectory(this) + "/" + base.token("-L", 1) + "-L*";
 					done = true;
+				}
 				else
+				{
-					name += f->Data()->GetDirectory(this).ToString() + "/*" + base.right(4) + ".*";
+					name += f->Data()->getDirectory(this) + "/*" + base.right(4) + ".*";
 					done = true;
+				}
+			}
+		}
 		if ( !done )
-			name += f->Data()->GetNameDirectory(this).ToString();
+			name += f->Data()->getNameDirectory(this);
-		if ( !f->Data()->GetDir().Empty() )
+		if ( !f->Data()->dir().empty() )
+		{
 			name += "|";
-			name += f->Data()->GetDir().ToString();
+			name += f->Data()->dir();
+		}
 		Utils::String s = "GAME ";
 		if (!f->Data()->game() || f->Data()->game() == GAME_ALLNEW)
 			s += CBaseFile::ConvertGameToString(f->Data()->game());
 		else
 	else
 		Found->iVersion = version;
 	_changed();
+}
+Utils::String CBaseFile::_replaceFilename(const Utils::String &fname)
+{
+	Utils::String filename = fname;
+	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(' '));
+	filename = filename.findReplace("$AUTHOR", this->author().remove(' '));
+	filename = filename.findReplace("$DATE", cdate);
+	filename = filename.findReplace("$CDATE", cdate);
+	filename = filename.findReplace("$VERSION", this->version());
+	return filename;
+}
 bool CBaseFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)
+{
 	if ( sFirst.Compare("Name") )					this->setName(sRest);
 	else if ( sFirst.Compare("Author") )			this->setAuthor(sRest);
 	else if ( sFirst.Compare("ScriptName") )
 		this->AddGameCompatability(CBaseFile::GetGameFromString(sGame), sRest.token(" ", 2));
+	}
 	else if ( sFirst.Compare("Description") )		this->setDescription(sRest);
 	else if ( sFirst.Compare("AutoSave") || sFirst.Compare("AutoExport") || sFirst.Compare("AutoRarExport") || sFirst.Compare("AutoZipExport") )
+	{
-		Utils::String filename = sRest;
+		Utils::String filename = _replaceFilename(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(' '));
-		filename = filename.findReplace("$AUTHOR", this->author().remove(' '));
-		filename = filename.findReplace("$DATE", cdate);
-		filename = filename.findReplace("$CDATE", cdate);
-		filename = filename.findReplace("$VERSION", this->version());
 		if ( sFirst.Compare("AutoZipExport") || sFirst.Compare("AutoExport") )
-			this->setExportFilename(CFileIO(filename).ChangeFileExtension("zip").ToString());
+			this->setExportFilename(CFileIO(filename).changeFileExtension("zip"));
 		else if ( sFirst.Compare("AutoRarExport") )
-			this->setExportFilename(CFileIO(filename).ChangeFileExtension("rar").ToString());
+			this->setExportFilename(CFileIO(filename).changeFileExtension("rar"));
 		else
 			this->setFilename(filename);
+	}
 	else if ( sFirst.Compare("WebSite") )		this->setWebSite(sRest);
 	else if ( sFirst.Compare("ForumLink") || sFirst.Compare("Forum") ) this->setForumLink(sRest);
 		if ( icon->ReadFromFile() )
 			this->SetIcon(icon, CFileIO(sRest).GetFileExtension());
+	}
 	else if (sFirst.Compare("CombineGameFiles"))
 		_bCombineFiles = sRest.Compare("true") || sRest.Compare("yes") || sRest.toInt();
+	else if (sFirst.Compare("ExportZip"))
+	{
+		Utils::String ext = "zip";
+		Utils::String game = sRest.word(1);
+		Utils::String file = _replaceFilename(CFileIO(sRest.words(2)).fullFilename());
+		if (game.contains("|"))
+		{
+			int max;
+			Utils::String *games = game.tokenise("|", &max);
+			if (games)
+			{
+				for (int i = 0; i < max; ++i)
+				{
+					unsigned int g = CBaseFile::GetGameFromString(games[i]);
+					Utils::String filename = CFileIO(file).dir() + "/" + CFileIO(file).baseName() + "_" + CBaseFile::ConvertGameToString(g) + "." + ext;
+					this->addAutoExport(g, filename);
+				}
+				CLEANSPLIT(games, max);
+			}
+		}
+		else
+		{
+			unsigned int g = CBaseFile::GetGameFromString(game);
+			Utils::String filename = CFileIO(file).dir() + "/" + CFileIO(file).baseName() + "_" + CBaseFile::ConvertGameToString(g) + "." + ext;
+			this->addAutoExport(g, filename);
+		}
+	}
+	else if (sFirst.Compare("Extract"))
+	{
+		Utils::String game = sRest.word(1);
+		Utils::String dir = CDirIO(sRest.words(2)).dir();
+		if (game.contains("|"))
+		{
+			int max;
+			Utils::String *games = game.tokenise("|", &max);
+			if (games)
+			{
+				for(int i = 0; i < max; ++i)
+					this->addAutoExtract(CBaseFile::GetGameFromString(games[i]), dir);
+				CLEANSPLIT(games, max);
+			}
+		}
+		else
+			this->addAutoExtract(CBaseFile::GetGameFromString(game), dir);
+	}
 	else
+	{
 		Utils::String checkType = sFirst;
 		bool shared = false;
 		if ( checkType.left(6).Compare("Shared") )
 					game |= 1 << g;
+			}
 			CLEANSPLIT(games, max);
+		}
 		else
+		{
-			game = 1 << CBaseFile::GetGameFromString(gameStr);
+			unsigned int g = CBaseFile::GetGameFromString(gameStr);
+			if (g)
+				game = 1 << g;
+		}
 		rest = rest.tokens(" ", 3);
+	}
 	if (game)
 		game |= 1 << 31;
 	return CyString((long)error);
+}
 bool CBaseFile::SaveToArchive(CyString filename, int game, const CGameExe *exes, CProgressInfo *progress)
+{
+	return saveToArchive(filename.ToString(), game, exes, progress);
+}
+bool CBaseFile::saveToArchive(const Utils::String &filename, int game, const CGameExe *exes, CProgressInfo *progress)
+{
+	CDirIO Dir(CFileIO(filename).dir());
+	if (!Dir.exists())
+		Dir.create();
 	TCHAR buf[5000];
 	wsprintf(buf, L"%hs", filename.c_str());
 	HZIP hz = CreateZip(buf, 0);
 	if (!hz) return false;
 				continue;
 			// extracting for all games, so ignore files that have a game set
 			if (!game && node->Data()->game() && node->Data()->game() != GAME_ALLNEW)
 				continue;
+		}
-		Utils::String fname = node->Data()->GetNameDirectory(this).ToString();
+		Utils::String fname = node->Data()->getNameDirectory(this);
 		// use the addon directory
 		if (node->Data()->isFileInAddon() && exes)
+		{
 			unsigned int whatGame = game;

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 130 → 131