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

 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 #include "lists.h"
-#include "StringList.h"
 #include "File.h"
 #include "Utils/String.h"
 #include "Utils/StringList.h"
 #include "archive/zip.h"
 } SSPKHeader2;
 class SPKEXPORT CBaseFile : public SPK::Package::CCorePackage
+{
 public:
+	// static functions
 	static Utils::String ConvertGameToString(int game);
 	static int GetGameFromString(const Utils::String &game);
 	static Utils::String ErrorString(int error, const Utils::String &errorStr = Utils::String::Null());
+	static Utils::String GetEndOfLine(FILE* id, int* line = NULL, bool upper = true);
+	static int CheckFile(const Utils::String &filename, float* version = NULL);
 	CBaseFile();
 	virtual ~CBaseFile();
 	// Virtual Functions
 	virtual Utils::String getFullPackageName(int language, const Utils::String &byString) const;
 	virtual Utils::String getFullPackageName(int language, bool includeVersion = true, const Utils::String &byString = "by") const;
 	virtual Utils::String getFullPackageName(const Utils::String &format, int lang) const;
-	virtual Utils::String CreateValuesLine() const;
+	virtual Utils::String createValuesLine() const;
 	virtual bool LoadPackageData(const Utils::String& sFirst, const Utils::String& sRest, const Utils::String& sMainGame, Utils::CStringList& otherGames, Utils::CStringList& gameAddons, CProgressInfo* progress);
 	virtual bool GeneratePackagerScript(bool wildcard, Utils::CStringList* list, int game, const Utils::CStringList& gameAddons, bool datafile = false);
 	virtual bool GeneratePackagerScriptFile(bool wildcard, Utils::CStringList* list, int game, const Utils::CStringList& gameAddons);
 	void SetDataCompression(int c) { m_SHeader2.iDataCompression = c; }
 	void SetFileCompression(int c) { m_SHeader2.iFileCompression = c; }
 	void SetValueCompression(int c) { m_SHeader.iValueCompression = c; }
 	void setIcon(C_File* file, const Utils::String& ext) { if (m_pIconFile) delete m_pIconFile; _sIconExt = ext.c_str(); m_pIconFile = file; _changed(); }
 	void setFtpAddr(const Utils::String& str) { _sFtpAddr = str; }
 	// Game Compatability
 	SGameCompat* GetGameCompatability(int game);
 	bool RemoveGameCompatability(int game);
 	void AddGameCompatability(int game, const Utils::String &version);
 	bool CheckGameCompatability(int game);
 	bool removeFile(size_t pos);
 	bool removeFile(C_File* files);
 	bool removeFile(const Utils::String &file, FileType type, const Utils::String &dir = Utils::String::Null(), int game = 0);
 	void removeAllFiles(FileType type, int game);
-	Utils::String createFilesLine(bool updateheader, CProgressInfo* = NULL);
+	Utils::String createFilesLine(SSPKHeader2 *header, CProgressInfo* = NULL) const;
 	// error handling
 	void ClearError () { _sLastError = ""; _iLastError = SPKERR_NONE; }
 	int lastError() const { return _iLastError; }
 	const Utils::String lastErrorString() const { return _sLastError; }
-	virtual bool WriteHeader(CFileIO &file, int iHeader, int iLength);
+	virtual bool writeHeader(CFileIO &file, int iHeader, int iLength) const;
-	virtual bool WriteData(CFileIO &file, CProgressInfo * = NULL );
+	virtual bool writeData(CFileIO &file, CProgressInfo * = NULL) const;
-	virtual bool WriteFile ( CyString filename, CProgressInfo * = NULL );
+	virtual bool writeFile(const Utils::String &filename, CProgressInfo* = NULL) const;
-	virtual bool ReadFile(CyString filename, int readType = SPKREAD_ALL, CProgressInfo *progress = NULL);
 	virtual bool readFile(const Utils::String &filename, int readType = SPKREAD_ALL, CProgressInfo *progress = NULL);
 	bool readFile(CFileIO &File, int readtype, CProgressInfo *progress);
-	virtual bool ExtractFile(C_File *file, CyString dir, bool includedir = true, CProgressInfo *progress = NULL);
-	virtual bool ExtractFile(int file, CyString dir, bool includedir = true, CProgressInfo *progress = NULL);
 	virtual bool extractFile(int file, const Utils::String &dir, bool includedir = true, CProgressInfo *progress = NULL);
 	virtual bool extractFile(C_File *file, const Utils::String &dir, bool includedir = true, CProgressInfo *progress = NULL);
 	virtual bool extractFile(int filenum, const Utils::String &dir, unsigned int game, const Utils::CStringList &gameAddons, bool includedir = true, CProgressInfo *progress = NULL);
 	virtual bool extractFile(C_File *file, const Utils::String &dir, unsigned int game, const Utils::CStringList &gameAddons, bool includedir = true, CProgressInfo *progress = NULL);
 	virtual bool extractAll(const Utils::String &dir, int game, const Utils::CStringList &gameAddons, bool includedir = true, CProgressInfo *progress = NULL);
-	virtual bool SaveToArchive(CyString filename, int game, const CGameExe *exes, CProgressInfo *progress = NULL);
 	virtual bool saveToArchive(const Utils::String &filename, int game, const CGameExe *exes, CProgressInfo *progress = NULL);
 	virtual void addGeneratedFiles(HZIP &hz) {};
 	void ClearFileData();
 	// compression
 	void RecompressAllFiles ( int compresstype, CProgressInfo *progress );
 	void CompressAllFiles ( int compresstype, CProgressInfo *progress = NULL, CProgressInfo *overallProgress = NULL, int level = DEFAULT_COMPRESSION_LEVEL );
 	bool UncompressAllFiles ( CProgressInfo * = NULL );
-	// static functions
-	static CyString GetEndOfLine ( FILE *id, int *line = NULL, bool upper = true );
-	static int CheckFile ( CyString filename, float *version = NULL );
 	bool IsFileAdded(C_File *f) { return m_lFiles.FindData(f); }
 	// installing
 	void SwitchFilePointer(C_File *oldFile, C_File *newFile);
-	bool InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *spklist, CyStringList *errorStr, bool enabled = true, CPackages *packages = NULL );
+	bool installFiles(const Utils::String &destdir, CProgressInfo *progress, CLinkList<C_File> *spklist, Utils::CStringList *errorStr, bool enabled = true, CPackages *packages = NULL );
 	virtual bool IsPatch () { return false; }
 	// installer functions
 	bool IsProfileEnabled () { return m_bProfile; }
 	bool IsEnabled () { return m_bEnable; }
 	bool AnyFileType ( int type );
 	CBaseFile *GetParent () { return m_pParent; }
 	void SetParent ( CBaseFile *file ) { m_pParent = file; }
 	int ParseLanguage(const Utils::String &lang) const;
+	virtual bool computeSigned(bool updateFiles) const;
-	virtual bool UpdateSigned (bool updateFiles);
+	bool updateSigned (bool updateFiles);
 	int GetNum() { return m_iNum; }
 	void SetNum(int i) { m_iNum = i; }
 	bool	IsFullyLoaded() { return m_bFullyLoaded; }
 	virtual bool   IsSigned ()		{ return m_bSigned;}
 protected:
 	virtual void Delete ();
 	virtual void SetDefaults ();
 	// reading of files
-	virtual bool CheckHeader(const Utils::String header) const;
+	virtual bool _checkHeader(const Utils::String header) const;
-	virtual bool ParseHeader ( CyString header );
+	bool _parseHeader(const Utils::String &header);
-	virtual bool ParseFileHeader ( CyString header );
+	bool _parseFileHeader(const Utils::String& header);
-	virtual bool ParseFilesLine ( CyString line );
+	bool _parseFilesLine(const Utils::String& line);
-	virtual void ReadValues ( CyString values );
+	void _readValues(const Utils::String& values);
-	virtual void ReadFiles ( CyString values );
+	void _readFiles(const Utils::String& values);
 	void _install_adjustFakePatches(CPackages *pPackages);
 	void _install_renameText(CPackages *pPackages);
-	bool _install_uncompress(C_File *fit, CProgressInfo *progress, CyStringList *errorStr, bool *uncomprToFile);
+	bool _install_uncompress(C_File *fit, CProgressInfo *progress, Utils::CStringList *errorStr, bool *uncomprToFile);
 	bool _install_setEnabled(bool bEnable, C_File *fit);
 	bool _install_checkVersion(C_File *pFile, const Utils::String &sDestination);
 	Utils::String _install_adjustFilepointer(C_File *pFile, bool bEnabled, const Utils::String &sDestination);
-	C_File *_install_checkFile(C_File *pFile, CyStringList *errorStr, bool *bDoFile, CLinkList<C_File> *pFileList);
+	C_File *_install_checkFile(C_File *pFile, Utils::CStringList *errorStr, bool *bDoFile, CLinkList<C_File> *pFileList);
-	bool _install_checkFileEnable(C_File *pCheckFile, C_File *fit, const Utils::String &sDestination, bool bEnabled, CyStringList *errorStr);
+	bool _install_checkFileEnable(C_File *pCheckFile, C_File *fit, const Utils::String &sDestination, bool bEnabled, Utils::CStringList *errorStr);
-	bool _install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File *pFile, CyStringList *errorStr);
+	bool _install_createDirectory(CDirIO &Dir, const Utils::String &sTo, C_File *pFile, Utils::CStringList *errorStr);
-	void _install_writeFile(C_File *pFile, const Utils::String &sDestination, CyStringList *errorStr);
+	void _install_writeFile(C_File *pFile, const Utils::String &sDestination, Utils::CStringList *errorStr);
 	int _read_FileHeader(CFileIO &File, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress);
 	int _read_Header(CFileIO &File, int iReadType, int iMaxProgress, CProgressInfo *pProgress);
 	CFileIO *_startRead();

Subversion Repositories spk

(root)/libspk/src/BaseFile.h – Rev 172 → 175