1 files changed, 97 insertions, 132 deletions

diff --git a/Source/modules/asura-base/FileSystem/File.h b/Source/modules/asura-base/FileSystem/File.h
index be772e0..3bb6067 100644
--- a/Source/modules/asura-base/FileSystem/File.h
+++ b/Source/modules/asura-base/FileSystem/File.h
@@ -8,139 +8,104 @@
 
 #include "FileData.h"
 
-namespace AsuraEngine
+namespace_begin(AsuraEngine)
+namespace_begin(FileSystem)
+
+///
+/// ��������ʽ���ļ�������ָ����д��㡢��С��������ʹ������ȡʱʹ�ñ��࣬����ʹ��Filesystem.read()ֱ�Ӷ�ȡ�ļ�ȫ��
+/// ���ݣ�������һ��FileData����
+///
+class File ASURA_FINAL : public AEScripting::Portable<File>
 {
-	namespace FileSystem
-	{
+public:
+
+	LUAX_DECL_FACTORY(File);
 
-		///
-		/// ��������ʽ���ļ�������ָ����д��㡢��С��������ʹ������ȡʱʹ�ñ��࣬����ʹ��Filesystem.read()ֱ�Ӷ�ȡ�ļ�ȫ��
-		/// ���ݣ�������һ��FileData����
-		///
-		class File ASURA_FINAL
-			: public AEScripting::Portable<File>
-		{
-		public:
-
-			LUAX_DECL_FACTORY(File);
-
-			///
-			/// �ļ���дģʽ
-			///
-			enum FileMode
-			{
-				FILE_MODE_CLOSED,
-				FILE_MODE_READ,
-				FILE_MODE_WRITE,
-				FILE_MODE_APPEND,
-			};
-
-			///
-			/// �ļ�д��ʱ��������Ϊ
-			///
-			enum BufferMode
-			{
-				BUFFER_MODE_NONE, ///< ��ʹ�û��壬����д���ļ�
-				BUFFER_MODE_LINE, ///< �л��壬�������з����ߴﵽ��������Сʱд���ļ�
-				BUFFER_MODE_FULL, ///< ��ȫ���壬��������ʱд���ļ�
-			};
-
-			File(const std::string& filename);
-			~File();
-
-			bool Open(FileMode mode); 
-			bool Close();
-			bool IsOpen();
-			FileMode GetMode();
-			size_t GetSize(); 
-
-			///
-			/// ��ȡ��data buffer������ض��������
-			///
-			size_t Read(ASURA_OUT DataBuffer* dst, size_t length);
-			size_t ReadAll(ASURA_OUT DataBuffer* dst);
-			size_t ReadAsync(ASURA_OUT DataBuffer* dst);
-
-			///
-			/// �Ƿ�������ļ���β
-			///
-			bool IsEOF();
-
-			///
-			/// ��data buffer�е�����д�룬�������Ƿ�ɹ�
-			///
-			bool Write(ASURA_REF DataBuffer* src);
-
-			///
-			/// �첽д�ļ�����д�ļ�task����thread�Ķ��С�
-			///
-			bool WriteAsync(ASURA_REF DataBuffer* src, AEThreading::Thread* thread);
-
-			///
-			/// ��������˻��壬ǿ����ջ�������д���ļ���
-			///
-			bool Flush();
-
-			///
-			/// ���ص�ǰ��дλ��
-			///
-			size_t Tell();
-
-			///
-			/// ������Ӧλ��
-			///
-			bool Seek(size_t pos);
-
-			///
-			/// ���û�������С��ģʽ
-			///
-			bool SetBuffer(BufferMode mode, size_t size);
-
-			///
-			/// ��ȡ��������С��ģʽ
-			///
-			BufferMode GetBuffer(ASURA_OUT size_t& size);
-
-			const std::string& GetFileName();
-			const std::string& GetName();
-			const std::string& GetExtension();
-
-		private:
-
-			PHYSFS_File* m_FileHandle; ///< physfs �ļ�
-			std::string  m_FileName;   ///< �ļ���
-			std::string  m_Extension;  ///< �����������չ��
-			std::string  m_Name;       ///< �����������չ�����ļ���
-			FileMode     m_Mode;       ///< �ļ���ģʽ
-			BufferMode   m_BufferMode;	///< д�뻺����ģʽ
-			size_t       m_BufferSize;	///< д�뻺������С
-
-			LUAX_DECL_ENUM(FileMode);
-			LUAX_DECL_ENUM(BufferMode);
-
-			LUAX_DECL_METHOD(_New);
-			LUAX_DECL_METHOD(_Open);
-			LUAX_DECL_METHOD(_Close);
-			LUAX_DECL_METHOD(_IsOpen);
-			LUAX_DECL_METHOD(_GetMode);
-			LUAX_DECL_METHOD(_GetSize);
-			LUAX_DECL_METHOD(_Read);
-			LUAX_DECL_METHOD(_Write);
-			LUAX_DECL_METHOD(_ReadAsync);
-			LUAX_DECL_METHOD(_WriteAsync);
-			LUAX_DECL_METHOD(_IsEOF);
-			LUAX_DECL_METHOD(_Flush);
-			LUAX_DECL_METHOD(_Tell);
-			LUAX_DECL_METHOD(_Seek);
-			LUAX_DECL_METHOD(_SetBuffer);
-			LUAX_DECL_METHOD(_GetBuffer);
-			LUAX_DECL_METHOD(_GetFileName);
-			LUAX_DECL_METHOD(_GetExtension);
-			LUAX_DECL_METHOD(_GetName);
-
-		};
-
-	}
-}
+	/// �ļ���дģʽ
+	enum FileMode
+	{
+		FILE_MODE_CLOSED,
+		FILE_MODE_READ,
+		FILE_MODE_WRITE,
+		FILE_MODE_APPEND,
+	};
+
+	/// �ļ�д��ʱ��������Ϊ
+	enum BufferMode
+	{
+		BUFFER_MODE_NONE, ///< ��ʹ�û��壬����д���ļ�
+		BUFFER_MODE_LINE, ///< �л��壬�������з����ߴﵽ��������Сʱд���ļ�
+		BUFFER_MODE_FULL, ///< ��ȫ���壬��������ʱд���ļ�
+	};
+
+	File(const std::string& filename);
+	~File();
+
+	bool Open(FileMode mode); 
+	bool Close();
+	bool IsOpen();
+	FileMode GetMode();
+	size_t GetSize(); 
+
+	size_t Read(ASURA_OUT DataBuffer* dst, size_t length);
+	size_t ReadAll(ASURA_OUT DataBuffer* dst);
+	size_t ReadAsync(ASURA_OUT DataBuffer* dst);
+
+	bool IsEOF();
+
+	bool Write(ASURA_REF DataBuffer* src);
+	bool WriteAsync(ASURA_REF DataBuffer* src, AEThreading::Thread* thread);
+
+	bool Flush();
+
+	size_t Tell();
+
+	bool Seek(size_t pos);
+
+	bool SetBuffer(BufferMode mode, size_t size);
+
+	BufferMode GetBuffer(ASURA_OUT size_t& size);
+
+	const std::string& GetFileName();
+	const std::string& GetName();
+	const std::string& GetExtension();
+
+private:
+
+	PHYSFS_File* m_FileHandle; ///< physfs �ļ�
+	std::string  m_FileName;   ///< �ļ���
+	std::string  m_Extension;  ///< �����������չ��
+	std::string  m_Name;       ///< �����������չ�����ļ���
+	FileMode     m_Mode;       ///< �ļ���ģʽ
+	BufferMode   m_BufferMode;	///< д�뻺����ģʽ
+	size_t       m_BufferSize;	///< д�뻺������С
+
+	LUAX_DECL_ENUM(FileMode);
+	LUAX_DECL_ENUM(BufferMode);
+
+	LUAX_DECL_METHOD(_New);
+	LUAX_DECL_METHOD(_Open);
+	LUAX_DECL_METHOD(_Close);
+	LUAX_DECL_METHOD(_IsOpen);
+	LUAX_DECL_METHOD(_GetMode);
+	LUAX_DECL_METHOD(_GetSize);
+	LUAX_DECL_METHOD(_Read);
+	LUAX_DECL_METHOD(_Write);
+	LUAX_DECL_METHOD(_ReadAsync);
+	LUAX_DECL_METHOD(_WriteAsync);
+	LUAX_DECL_METHOD(_IsEOF);
+	LUAX_DECL_METHOD(_Flush);
+	LUAX_DECL_METHOD(_Tell);
+	LUAX_DECL_METHOD(_Seek);
+	LUAX_DECL_METHOD(_SetBuffer);
+	LUAX_DECL_METHOD(_GetBuffer);
+	LUAX_DECL_METHOD(_GetFileName);
+	LUAX_DECL_METHOD(_GetExtension);
+	LUAX_DECL_METHOD(_GetName);
+
+};
+
+namespace_end
+namespace_end
 
 #endif
\ No newline at end of file