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

 #define DEFAULT_COMPRESSION_LEVEL	5
 #include "spkdefines.h"
 #include "File_IO.h"
 #include "zlib/zlib.h"
+#include "enums.h"
 //#include "x2bc/x2bc_common/bob_dom.h"
 //#include "x2bc/x2bc_common/bob_realfile_stream.h"
 // compression type
 enum { SPKCOMPRESS_NONE, SPKCOMPRESS_ZLIB, SPKCOMPRESS_7ZIP, SPKCOMPRESS_LZMA, SPKCOMPRESS_BEST };
-// file type
-typedef enum {
-	FILETYPE_SCRIPT,
-	FILETYPE_TEXT,
-	FILETYPE_README,
-	FILETYPE_MAP,
-	FILETYPE_MOD,
-	FILETYPE_UNINSTALL,
-	FILETYPE_SOUND,
-	FILETYPE_EXTRA,
-	FILETYPE_SCREEN,
-	FILETYPE_MISSION,
-	FILETYPE_ADVERT,
-	FILETYPE_SHIPOTHER,
-	FILETYPE_SHIPMODEL,
-	FILETYPE_SHIPSCENE,
-	FILETYPE_COCKPITSCENE,
-	FILETYPE_MAX,
-	FILETYPE_BACKUP
-} FileType;
 // special file types used internally
 enum {
 	FILETYPE_SCRIPT_UNINSTALL		= 1000,
 };
 	virtual void ProgressPercent ( float percent ) = 0;
 };
 Utils::String SPKEXPORT GetFileTypeString ( int type );
-int		 SPKEXPORT GetFileTypeFromString ( CyString type );
+FileType SPKEXPORT GetFileTypeFromString ( CyString type );
 CyString SPKEXPORT FormatErrorString ( int error, CyString rest );
 float	 SPKEXPORT GetLibraryVersion ();
 float	 SPKEXPORT GetFileFormatVersion ();
 class CBaseFile;
 class SPKEXPORT C_File
+{
 public:
+	static Utils::String GetDirectory(FileType eType, const Utils::String &filename, CBaseFile *file);
-	static bool DoesTypeHaveExtraDir(int i)
+	static bool DoesTypeHaveExtraDir(int i);
-	{
-		switch (i)
+public:
-		{
-			case FILETYPE_EXTRA:
-			case FILETYPE_SHIPSCENE:
-			case FILETYPE_COCKPITSCENE:
-			case FILETYPE_SHIPMODEL:
-			case FILETYPE_SHIPOTHER:
-				return true;
-		}
-		return false;
-	}
 	void ClearUsed () { m_iUsed = 0; }
 	void IncUsed () { ++m_iUsed; }
 	void DeleteData ();
 	// varible setting functions
-	void SetFileType ( int t ) { m_iFileType = t; }
+	void SetFileType(FileType t) { m_iFileType = t; }
+	void setFileType(FileType t) { m_iFileType = t; }
 	void SetFilename ( CyString filename );
 	void SetName ( CyString name ) { m_sName = name; }
 	void SetDir ( CyString dir ) { m_sDir = dir; }
 	void SetCreationTime ( time_t time ) { m_tTime = time; }
 	void SetFileSize ( long size ) { m_lSize = size; }
 	void copyData(const unsigned char *data, size_t size);
 	// get functions
 	int GetUsed () { return m_iUsed; }
 	int GetLastError () { return m_iLastError; }
-	int GetFileType () { return m_iFileType; }
+	int GetFileType() { return m_iFileType; }
+	FileType fileType() { return m_iFileType; }
 	CyString GetFilename () { return m_sName; }
 	CyString GetFullFilename () { return m_sFullDir + "/" + m_sName; }
 	long GetSize () { return m_lSize; }
 	time_t GetCreationTime () { return m_tTime; }
 	CyString GetName () { return m_sName; }
 	CyString GetFileTypeString () { return ::GetFileTypeString ( m_iFileType ); }
 	CyString GetCreationTimeString ();
 	CyString GetTempFile () { return m_sTmpFile; }
 	CyString GetFullDir () { return m_sFullDir; }
 	CyString GetBaseName ();
-	CyString GetOriginalName() { return m_sOriginalName; }
+	CyString GetOriginalName() { return CyString(_sOriginalName); }
+	const Utils::String &originalName() { return _sOriginalName; }
 	CyString GetInMod() { return m_sInMod; }
 	CyString GetSignature() { if ( !m_bUpdatedSignature ) UpdateSignature(); return m_sSignature; }
 	void UpdateSignature();
 	void ChangeBaseName(CyString b) { m_sName = b + "." + this->GetFileExt(); }
 	bool RenameScript(CyString baseName);
 	bool IsInMod() { return !m_sInMod.Empty(); }
-	void FixOriginalName() { m_sOriginalName = m_sName; }
+	void FixOriginalName() { _sOriginalName = m_sName.ToString(); }
-	void SetOriginalName(CyString name) { m_sOriginalName = name; }
+	void SetOriginalName(const Utils::String &name) { _sOriginalName = name; }
 	bool isFileInAddon() const;
 	bool IsFakePatch () const;
 	bool IsAutoTextFile();
 	int  GetTextFileID(CyString name = NullString);
 			return m_lSize;
 		return m_lDataSize;
+	}
 	CyString GetNameDirectory ( CBaseFile *spkfile );
+	unsigned int game() const;
-	int  GetGame() { return m_iGame; }
+	void setGame(unsigned int i);
+	//TODO
-	void SetGame(int i) { m_iGame = i; }
+	unsigned int GetGame() const { return _iGame;  }
 	unsigned char *GetData () { return m_sData; }
 	bool IsShared () { return m_bShared; }
 	bool IsSigned () { return m_bSigned; }
 	bool UpdateSigned();
 	//bool readFromFile(std::fstream &stream, long lSize, bool bDoSize = true );
 	bool ReadFromData ( char *data, long size );
 	int ReadScriptVersion ();
 	CyString GetFilePointer ();
 	Utils::String filePointer() const;
+	bool isExternalFile() const;
 	// file writing functions
 	bool WriteToFile ( CyString filename, unsigned char * = NULL, long = 0 );
 	bool WriteToDir ( CyString &dir, CBaseFile *, bool = true, CyString appendDir = NullString, unsigned char * = NULL, long = 0 );
 	bool WriteFilePointer ( unsigned char *cData = NULL, long len = 0 );
 	bool BobDecompile();
 	bool BodCompile();
 	// contructor/decontructor
 	C_File();
-	C_File ( CyString filename );
+	C_File(const Utils::String &filename);
-	C_File ( const char *filename );
 	virtual ~C_File();
 protected:
 	static int m_iTempNum; // Used when creating temp files, allows new tmp files without overrighing used ones
 	long	m_lDataSize;  // size of the data stream in what ever compression is set
 	long	m_lUncomprDataSize; // size of stream if it was uncompressed
 	unsigned char   *m_sData;  // stores the file data if loaded in memory
 	int		m_iDataCompression; // the current compression of m_sData
-	int     m_iFileType; // type if file, ie Script, Text, etc
+	FileType m_iFileType; // type if file, ie Script, Text, etc
 	bool    m_bUsedMalloc; // malloc type of m_sData, so it can use with free() or delete
 	CyString	m_sTmpFile;
 	bool	m_bCompressedToFile;
 	bool	m_bLoaded;
 	bool	m_bDisabled;	// if the file has be disabled
 	bool	m_bUpdatedSignature;
 	int		m_iPos;
-	int		m_iGame;
+	unsigned int _iGame;
-	CyString	m_sOriginalName;
+	Utils::String _sOriginalName;
 	int m_iLastError;
 	bool	m_bDontDeleteData; // fix for bad data deleteion
 };

Subversion Repositories spk

(root)/libspk/src/File.h – Rev 126 → 127