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

 		SPKINSTALL_MISSINGFILE, SPKINSTALL_SHARED, SPKINSTALL_SHARED_FAIL, SPKINSTALL_ORPHANED, SPKINSTALL_ORPHANED_FAIL, SPKINSTALL_UNCOMPRESS_FAIL, SPKINSTALL_AUTOTEXT, SPKINSTALL_AUTOTEXT_FAIL
 };
 enum {PACKAGETYPE_NORMAL, PACKAGETYPE_LIBRARY, PACKAGETYPE_CUSTOMSTART, PACKAGETYPE_PATCH, PACKAGETYPE_UPDATE, PACKAGETYPE_MOD, PACKAGETYPE_SHIP, PACKAGETYPE_FAKEPATCH};
-enum {TYPE_BASE, TYPE_SPK, TYPE_XSP, TYPE_ARCHIVE};
+enum BaseFileType {TYPE_BASE, TYPE_SPK, TYPE_XSP, TYPE_ARCHIVE};
 // spk header struct
 tstruct SSPKHeader {
 	SSPKHeader () { fVersion = 0; iValueCompression = lValueCompressSize = 0; }
 	float fVersion;
 	unsigned long lValueCompressSize;
 } SSPKHeader;
 tstruct SSPKHeader2 {
-	SSPKHeader2 () { iNumFiles = 0; lSize = 0; lFullSize = 0; }
+	SSPKHeader2 () : iFileCompression(0), iDataCompression(0), iNumFiles(0), lSize(0), lFullSize(0) { }
 	int iNumFiles;
 	long lSize;
 	long lFullSize;
 	int iFileCompression;
 	int iDataCompression;
 	static Utils::String ErrorString(int error, const Utils::String &errorStr = Utils::String::Null());
 	CBaseFile();
 	virtual ~CBaseFile();
-	// Get basic Settings
+	// Virtual Functions
-	virtual CyString GetFullPackageName(int language, CyString byString) { return GetFullPackageName(language, true, byString); }
+	virtual Utils::String getFullPackageName(int language, const Utils::String &byString) const;
-	virtual CyString GetFullPackageName(int language, bool includeVersion = true, CyString byString = "by")
+	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;
-	{
-		CyString p;
-		if ( language == -1 )
+	virtual Utils::String CreateValuesLine() const;
-			p = this->name();
-		else
+	virtual bool LoadPackageData(const Utils::String& sFirst, const Utils::String& sRest, const Utils::String& sMainGame, Utils::CStringList& otherGames, Utils::CStringList& gameAddons, CProgressInfo* progress);
-			p = GetLanguageName(language);
+	virtual bool GeneratePackagerScript(bool wildcard, Utils::CStringList* list, int game, const Utils::CStringList& gameAddons, bool datafile = false);
-		if ( includeVersion )
+	virtual bool GeneratePackagerScriptFile(bool wildcard, Utils::CStringList* list, int game, const Utils::CStringList& gameAddons);
-		{
-			p += " V";
+	// Getters
-			p += this->version();
+	Utils::String getNameValidFile() const;
-		}
-		p += &quot; ";
+	const CLinkList&lt;C_File> &;fileList() const;
-		p += byString + " "; + this-&gt;author();
+	CLinkList<C_File>& fileList(FileType type, CLinkList<C_File>; &amp;list) const;
-		return p;
+	CLinkList<C_File>& fileList(FileType type);
-	}
 	CLinkList<C_File> *GetFileList() { return &m_lFiles; }
-	C_File *GetIcon () { return m_pIconFile; }
+	C_File *icon() const { return m_pIconFile; }
 	const Utils::String &iconExt() const { return _sIconExt; }
-	Utils::String getNameValidFile() const;
-	int GetDataCompression () { return m_SHeader2.iDataCompression; }
+	int dataCompression () const { return m_SHeader2.iDataCompression; }
-	float GetFileVersion () { return m_SHeader.fVersion; }
+	float fileVersion () const { return m_SHeader.fVersion; }
-	long GetFullFileSize ();
+	size_t fileSize() const;
-	CyString GetLanguageName(int lang) const;
+	const Utils::String& getLanguageName(int lang) const;
-	const Utils::String &getLanguageName(int lang) const;
+	Utils::String getAutosaveName() const;
+	bool IsMod();
-	virtual CyString GetFullPackageName(CyString format, int lang);
+	bool IsFakePatch() const;
-	Utils::String GetAutosaveName();
+	// Setters
-	void SetAutosaveName() { this->setFilename(GetAutosaveName()); }
+	void SetAutosaveName() { this->setFilename(getAutosaveName()); }
+	void addWebMirror(const Utils::String& str);
+	void removeWebMirror(const Utils::String& str);
+	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);
+	SGameCompat* GetGameCompatability(int game);
 	bool RemoveGameCompatability(int game);
 	void AddGameCompatability(int game, const Utils::String &version);
 	bool CheckGameCompatability(int game);
-	bool CheckGameVersionCompatability(int game, CyString sVersion, int iVersion);
+	bool checkGameVersionCompatability(int game, const Utils::String &sVersion, int iVersion) const;
 	bool AnyGameCompatability() { return !m_lGames.empty(); }
+	// Web Mirrors
 	bool anyWebMirrors() { return !_lMirrors.empty(); }
-	const Utils::CStringList *getWebMirrors() const { return &_lMirrors; }
+	const Utils::CStringList &webMirrors() const { return _lMirrors; }
 	int getMaxWebMirrors() { return _lMirrors.size(); }
 	Utils::String getWebMirror(size_t i) { if ( i >= 0 && i < _lMirrors.size() ) return _lMirrors.get(i)->str; return Utils::String::Null(); }
 	void clearWebMirrors() { _lMirrors.clear(); }
-	const CLinkList<C_File> *fileList() const;
+	// Files
-	CLinkList<C_File> *fileList(int type) const;
 	C_File *GetFirstFile(int type) const;
 	C_File *GetNextFile(C_File *prev) const;
 	C_File *GetPrevFile(C_File *next) const;
+	C_File* findMatchingMod(C_File* f) 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 ConvertNormalMod(C_File *f, CyString to);
+	void convertNormalMod(C_File *f, const Utils::String &to) const;
-	void ConvertFakePatch(C_File *f);
+	void convertFakePatch(C_File *f) const;
-	void ConvertAutoText(C_File *f);
+	void convertAutoText(C_File *f) const;
-	C_File *FindMatchingMod(C_File *f);
-	void RenameFile(C_File *f, CyString baseName);
+	void renameFile(C_File *f, const Utils::String &baseName) const;
-	// set basic settings
-	void addWebMirror		(const Utils::String &str);
+	size_t countFiles(FileType filetype) const;
-	void removeWebMirror	(const Utils::String &str);
+	C_File* findFileAt(FileType filetype, size_t pos) const;
-	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, CyString ext ) { if ( m_pIconFile ) delete m_pIconFile; _sIconExt = ext.c_str(); m_pIconFile = file; _changed(); }
+	C_File* findFile(const Utils::String& file, FileType type, const Utils::String&; dir = Utils::String::Null(), int game = 0) const;
-	void SetFtpAddr			( CyString str ) { m_sFtpAddr = str; }
 	void AddFileScript(FileType filetype, bool shared, bool packed, const Utils::String &rest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress = NULL);
+	void AddFile(C_File* file);
+	C_File* addFile(const Utils::String& file, const Utils::String& dir, FileType type, int game = 0, bool packed = false);
+	C_File* appendFile(const Utils::String& file, int type, int game, bool packed, const Utils::String& dir = Utils::String::Null(), CProgressInfo* progress = NULL);
+	bool addFileNow(const Utils::String&, const Utils::String&, FileType type, CProgressInfo* progress = NULL);
+	virtual bool RemoveFile(int pos);
+	virtual bool RemoveFile(C_File* files);
+	virtual bool removeFile(const Utils::String &file, FileType type, const Utils::String &dir = Utils::String::Null(), int game = 0);
+	virtual bool RemoveFile(CyString file, int type, CyString dir = NullString, int game = 0) { return removeFile(file.ToString(), static_cast<FileType>(type), dir.ToString(), game); }
+	void removeAllFiles(FileType type, int game);
-	bool IsMod();
-	bool IsFakePatch() const;
+	Utils::String createFilesLine(bool updateheader, CProgressInfo* = NULL);
 	// error handling
 	void ClearError () { _sLastError = ""; _iLastError = SPKERR_NONE; }
 	int lastError() const { return _iLastError; }
 	const Utils::String lastErrorString() const { return _sLastError; }
-	// file handling
-	void AddFile ( C_File *file );
-	C_File *AddFile(CyString, CyString, int type, int game = 0);
-	C_File *addFile(const Utils::String &file, const Utils::String &dir, FileType type, int game = 0, bool packed = false);
-	C_File *appendFile(const Utils::String &file, int type, int game, bool packed, const Utils::String &dir = Utils::String::Null(), CProgressInfo *progress = NULL );
-	C_File *FindFile ( CyString, int, CyString = NullString, int game = 0 );
-	bool AddFileNow ( CyString, CyString, int type, CProgressInfo *progress = NULL );
-	int CountFiles ( int filetype );
-	C_File *FindFileAt ( int filetype, int pos );
-	virtual bool RemoveFile ( int pos );
-	virtual bool RemoveFile ( C_File *files );
-	virtual bool RemoveFile ( CyString file, int type, CyString dir = NullString, int game = 0 );
-	void removeAllFiles(FileType type, int game);
-	CyString CreateFilesLine ( bool updateheader, CProgressInfo * = NULL );
 	virtual bool WriteHeader(CFileIO &file, int iHeader, int iLength);
 	virtual bool WriteData(CFileIO &file, CProgressInfo * = NULL );
 	virtual bool WriteFile ( CyString filename, CProgressInfo * = NULL );
 	virtual bool ReadFile(CyString filename, int readType = SPKREAD_ALL, 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();
-	CLinkList<SNames> *GetNamesList() { return &m_lNames; }
 	// reading files
 	void ReadAllFilesToMemory ();
 	void ReadIconFileToMemory ();
 	bool ReadFileToMemory(C_File *f);
 	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 );
 	// installer functions
 	bool IsProfileEnabled () { return m_bProfile; }
 	bool IsEnabled () { return m_bEnable; }
 	bool IsModifiedEnabled () { return m_bModifiedEnabled; }
 	bool IsGlobalEnabled () { return m_bGlobal; }
 	void SetProfileEnabled ( bool en ) { m_bProfile = en; }
 	void SetEnabled ( bool en ) { m_bEnable = en; }
 	void SetModifiedEnabled ( bool en ) { m_bModifiedEnabled = en; }
 	void SetGlobalEnabled ( bool en ) { m_bGlobal = en; }
 	int  GetLoadError() { return m_iLoadError; }
 	void SetLoadError(int i) { m_iLoadError = i; }
 	Utils::String createUpdateFile(const Utils::String &dir) const;
-	// language functions
-	void RemoveLanguageName ( int lang );
-	void AddLanguageName ( int lang, const Utils::String &name );
-	void ClearNames ();
 	virtual bool ParseValueLine(const Utils::String &line);
 	CLinkList<SGameCompat>  *GetGameCompatabilityList() { return &m_lGames; }
-	CyString GetFullFileSizeString();
+	Utils::String fileSizeString() const;
 	CLinkList<SNeededLibrary> *GetNeededLibraries() { return &m_lNeededLibrarys; }
 	void AddNeededLibrary(const Utils::String &scriptName, const Utils::String &author, const Utils::String &minVersion);
 	bool IsPackageNeeded(const Utils::String &scriptName, const Utils::String &author);
 	SNeededLibrary *FindPackageNeeded(const Utils::String &scriptName, const Utils::String &author);
 	void updateTextDB() { this->_resetTextDB(); }
 	virtual bool readWares(int iLang, CLinkList<SWareEntry> &list, const Utils::String &empWares);
 	virtual bool readCommands(int iLang, CLinkList<SCommandSlot> &list);
 	virtual bool readWingCommands(int iLang, CLinkList<SCommandSlot> &list);
-//	bool IsChanged() { return m_bChanged; }
-//	void SetChanged(bool b) { m_bChanged = b; }
 	int  FindFirstGameInPackage();
 	bool IsAnyGameInPackage();
 	bool IsMultipleGamesInPackage();
 	bool IsGameInPackage(int game);
+	virtual BaseFileType type () const { return BaseFileType::TYPE_BASE; }
-	virtual int GetType () { return TYPE_BASE; }
+	virtual int GetType() { return type(); }
 	bool AnyFileType ( int type );
 	CBaseFile *GetParent () { return m_pParent; }
 	void SetParent ( CBaseFile *file ) { m_pParent = file; }
 	int ParseLanguage(const Utils::String &lang) const;
 	Utils::String _sIconExt;
 	Utils::String _sLastError;
 	int _iLastError;
 	CLinkList<C_File>  m_lFiles;
-	CLinkList<SNames> m_lNames;			//TODO: move to CorePackage
+	CLinkList<C_File>  m_lTempFiles;
 	Utils::CStringList _lMirrors;			//TODO: move to CorePackage
 	Utils::CStringList _lFakePatchBefore;
 	Utils::CStringList _lFakePatchAfter;
 	CTextDB	*_pTextDB;
 	CLinkList<SNeededLibrary> m_lNeededLibrarys;
 	bool	_bCombineFiles;
 	bool	m_bOverrideFiles;
-	CyString	m_sFtpAddr;
+	Utils::String	_sFtpAddr;
-	bool	m_bAutoGenerateUpdateFile;
+	bool			m_bAutoGenerateUpdateFile;
-	bool m_bUpdate;
+	bool			m_bUpdate;
 };
 class SPKEXPORT CArchiveFile : public CBaseFile
+{
 public:
 	CArchiveFile();
 	virtual ~CArchiveFile();
-	virtual CyString GetFullPackageName(CyString format, int lang) { return CyString(&quot;Archive(") + this->name() + ")"; }
+	virtual Utils::String getFullPackageName(const Utils::String& format, int lang) const override { return &quot;Archive(" + name() + ")"; }
-	virtual CyString GetFullPackageName(int language, CyString byString) { return CyString("Archive(") + this->name() + ")"; }
+	virtual Utils::String getFullPackageName(int language, const Utils::String& byString) const override { return "Archive(" + name() + ")"; }
-	virtual CyString GetFullPackageName(int language, bool includeVersion = true, CyString byString = "by") { return CyString(";Archive(") + this->name() + ")"; }
+	virtual Utils::String getFullPackageName(int language, bool includeVersion = true, const Utils::String& byString = "by") const override { return ";Archive(" + name() + ")"; }
-	virtual int GetType () { return TYPE_ARCHIVE; }
+	virtual BaseFileType type() const override { return BaseFileType::TYPE_ARCHIVE; }
 };
 #endif //__BASEFILE_H__

Subversion Repositories spk

(root)//libspk/src/BaseFile.h – Rev 166 → 170