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

 	CBaseFile();
 	virtual ~CBaseFile();
 	// Get basic Settings
-	CyString GetName ()			{ return m_sName; }
-	CyString GetVersion ()		{ return m_sVersion; }
-	CyString GetAuthor ()		{ return m_sAuthor; }
-	CyString GetCreationDate ()	{ return m_sCreationDate; }
 	virtual CyString GetFullPackageName(int language, CyString byString) { return GetFullPackageName(language, true, byString); }
 	virtual CyString GetFullPackageName(int language, bool includeVersion = true, CyString byString = "by")
+	{
 		CyString p;
 		if ( language == -1 )
-			p = m_sName;
+			p = this->name();
 		else
 			p = GetLanguageName(language);
 		if ( includeVersion )
+		{
 			p += " V";
-			p += m_sVersion;
+			p += this->version();
+		}
 		p += " ";
-		p += byString + " " + m_sAuthor;
+		p += byString + " " + this->author();
 		return p;
+	}
 	CLinkList<C_File> *GetFileList() { return &m_lFiles; }
 	C_File *GetIcon () { return m_pIconFile; }
 	CyString GetIconExt () { return m_sIconExt; }
 	int GetDataCompression () { return m_SHeader2.iDataCompression; }
 	float GetFileVersion () { return m_SHeader.fVersion; }
 	long GetFullFileSize ();
 	CyString GetLanguageName ( int lang );
 	virtual CyString GetFullPackageName(CyString format, int lang);
-	CyString GetAutosaveName();
+	Utils::String GetAutosaveName();
-	void SetAutosaveName() { m_sFilename = GetAutosaveName(); }
+	void SetAutosaveName() { this->setFilename(GetAutosaveName()); }
 	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);
 	void ConvertAutoText(C_File *f);
 	C_File *FindMatchingMod(C_File *f);
 	void RenameFile(C_File *f, CyString baseName);
 	// set basic settings
-	void SetName			( CyString str ) { m_sName = str.Remove ( '|' ); m_bChanged = true; }
-	void SetVersion			( CyString str ) { m_sVersion = str; m_bChanged = true; }
-	void SetAuthor			( CyString str ) { m_sAuthor = str.Remove ( '|' ); m_bChanged = true; }
-	void SetCreationDate	( CyString str ) { m_sCreationDate = str; m_bChanged = true; }
-	void AddWebMirror		( CyString str ) { m_lMirrors.PushBack(str, "", true); m_bChanged = true; }
+	void AddWebMirror		( CyString str ) { m_lMirrors.PushBack(str, "", true); _changed(); }
-	void RemoveWebMirror	( CyString str ) { m_lMirrors.Remove(str, true); m_bChanged = true; }
+	void RemoveWebMirror	( CyString str ) { m_lMirrors.Remove(str, true); _changed(); }
 	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; m_sIconExt = ext; m_pIconFile = file; m_bChanged = true; }
+	void SetIcon ( C_File *file, CyString ext ) { if ( m_pIconFile ) delete m_pIconFile; m_sIconExt = ext; m_pIconFile = file; _changed(); }
 	void SetFtpAddr			( CyString str ) { m_sFtpAddr = str; }
 	void AddFileScript(int filetype, bool shared, CyString rest);
-	void SetFilename ( CyString str ) { m_sFilename = str; }
-	CyString GetFilename() { return m_sFilename; }
-	CyString GetExportFilename() { return m_sExportFilename; }
 	bool IsMod();
 	bool IsFakePatch() const;
 	// error handling
 	void AddFakePatchOrder(bool after, CyString scriptName, CyString author);
 	bool AnyFakePatchOrder() { if ( !m_lFakePatchBefore.Empty() || !m_lFakePatchAfter.Empty() ) return true; return false; }
 	CyStringList &GetFakePatchBeforeOrder() { return m_lFakePatchBefore; }
 	CyStringList &GetFakePatchAfterOrder() { return m_lFakePatchAfter; }
-	bool IsChanged() { return m_bChanged; }
+//	bool IsChanged() { return m_bChanged; }
-	void SetChanged(bool b) { m_bChanged = b; }
+//	void SetChanged(bool b) { m_bChanged = b; }
 	int  FindFirstGameInPackage();
 	bool IsAnyGameInPackage();
 	bool IsMultipleGamesInPackage();
 	bool IsGameInPackage(int game);
 	virtual void ReadValues ( CyString values );
 	virtual void ReadFiles ( CyString 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_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);
+	bool _install_checkFileEnable(C_File *pCheckFile, C_File *fit, const Utils::String &sDestination, bool bEnabled, CyStringList *errorStr);
 	SSPKHeader m_SHeader;
 	SSPKHeader2 m_SHeader2;
-	CyString m_sName;
-	CyString m_sVersion;
-	CyString m_sAuthor;
-	CyString m_sCreationDate;
 	C_File *m_pIconFile;
 	CyString m_sIconExt;
 	CyString m_sLastError;
 	int m_iLastError;
-	CyString m_sFilename;
-	CyString m_sExportFilename;
 	CLinkList<C_File>  m_lFiles;
 	CLinkList<SNames> m_lNames;			//TODO: move to CorePackage
 	CyStringList m_lMirrors;			//TODO: move to CorePackage
 	CyStringList m_lFakePatchBefore;
 	CyStringList m_lFakePatchAfter;
-	//int m_iPluginType;
 	CLinkList<SGameCompat> m_lGames;
 	bool m_bSigned;
 	bool m_bFullyLoaded;
 	int m_iLoadError;
 	CBaseFile *m_pParent;
 	int m_iNum;
-	bool	m_bChanged;
 	CLinkList<SNeededLibrary> m_lNeededLibrarys;
 	bool	m_bOverrideFiles;
 	CyString	m_sFtpAddr;
 class SPKEXPORT CArchiveFile : public CBaseFile
+{
 public:
 	CArchiveFile();
 	virtual ~CArchiveFile();
-	virtual CyString GetFullPackageName(CyString format, int lang) { return CyString("Archive(") + m_sName + ")"; }
+	virtual CyString GetFullPackageName(CyString format, int lang) { return CyString("Archive(") + this->name() + ")"; }
-	virtual CyString GetFullPackageName(int language, CyString byString) { return CyString("Archive(") + m_sName + ")"; }
+	virtual CyString GetFullPackageName(int language, CyString byString) { return CyString("Archive(") + this->name() + ")"; }
-	virtual CyString GetFullPackageName(int language, bool includeVersion = true, CyString byString = "by") { return CyString("Archive(") + m_sName + ")"; }
+	virtual CyString GetFullPackageName(int language, bool includeVersion = true, CyString byString = "by") { return CyString("Archive(") + this->name() + ")"; }
 	virtual int GetType () { return TYPE_ARCHIVE; }
 };
 #endif //__BASEFILE_H__

Subversion Repositories spk

(root)//libspk/src/BaseFile.h – Rev 49 → 50