WebSVN – spk – Diff – //libspk/src/File_IO.cpp

+{
+}
 /*CFileIO::CFileIO(const Utils::String &sFilename, bool bBinary = true) : m_lSize(0), m_bBinary(bBinary), m_bAutoDelete(false)
+{
-	Open(sFilename, bBinary);
+	open(sFilename, bBinary);
+}
 */
 CFileIO::CFileIO(CyString filename) : m_lSize(0), m_bBinary(true), m_bAutoDelete(false), m_bSeekP(false)
+{
-	Open(filename, true);
+	open(filename.ToString(), true);
+}
 CFileIO::CFileIO(C_File *file) : m_lSize(0), m_bBinary(true), m_bAutoDelete(false), m_bSeekP(false)
+{
-	Open(file->GetFilePointer(), true);
+	open(file->GetFilePointer().ToString(), true);
+}
 CFileIO::~CFileIO()
+{
 	if ( this->isOpened() ) m_fId.close();
 void CFileIO::setAutoDelete(bool bDelete)
+{
 	m_bAutoDelete = true;
+}
-bool CFileIO::Open ( CyString filename, bool binary )
+bool CFileIO::open(const Utils::String &sFilename, bool bBinary)
 {
-	m_bBinary = binary;
+	m_bBinary = bBinary;
-	m_sFilename = filename.ToString();
+	m_sFilename = sFilename.asFilename();
-	m_sFilename = m_sFilename.findReplace("\\", "/");
-	m_sFilename = m_sFilename.findReplace("//", "/");
+	// check if there are any directories, and split the file and directory parts
 	if ( m_sFilename.isin('/') ) {
 		m_sDirIO.SetDir(m_sFilename.tokens("/", 1, -2));
 		m_sFile = m_sFilename.token("/", -1);
+	}
 	else
-		m_sFile = filename.ToString();
+		m_sFile = m_sFilename;
 	this->_readFileSize();
 	return true;
+}
+bool CFileIO::Open ( CyString filename, bool binary )
+{
+	return open(filename.ToString(), binary);
+}
 unsigned char *CFileIO::read(size_t iAmount)
+{
 	if ( !this->isOpened() ) startRead();
+}
 bool CFileIO::WriteData ( const char *data, size_t size )
+{
 	if ( NoFile() )
 		return false;
 	std::fstream File(m_sFilename, _out());
 	if ( !File.is_open() ) return false;
 	bool ret = true;
 	try {
 	if ( ret ) this->_readFileSize();
 	return ret;
+}
-bool CFileIO::WriteString ( CyString data )
+bool CFileIO::writeString ( const Utils::String &data )
 {
-	return WriteData ( data.c_str(), data.Length() );
+	return WriteData ( data.c_str(), data.length() );
 }
 bool CFileIO::Exists(const Utils::String &filename)
+{
 	std::fstream File(filename, std::ios::in | std::ios::binary);
 	bool bRet = File.good();
 	File.close();
 	return bRet;
 }
 bool CFileIO::ExistsOld () const
 {
 	return this->exists();
 }
 bool CFileIO::exists () const
 {
 	if ( this->isOpened() ) return true;
 	std::fstream File(m_sFilename, _in());
 	bool bRet = File.good();
 	File.close();
 	return bRet;
+}
-bool CFileIO::StartRead() { return startRead(); }
 bool CFileIO::startRead()
+{
 	return _start(_in(), false);
+}
 bool CFileIO::startWrite()
+{
 	return _start(_out(), true);
 }
 bool CFileIO::startModify()
+{
 	return _start(_inout(), true);
+}
+{
 	if ( !m_sFilename.empty() ) {
 		if ( this->isOpened() ) this->close();
 		m_fId.open(m_sFilename, iFlags);
 	}
 	m_bSeekP = bSeekP;
 	return m_fId.is_open();
 }
+std::vector<Utils::String> *CFileIO::readLines()
+{
+	if ( m_sFilename.empty() ) return 0;
+	std::vector<Utils::String> *file = new std::vector<Utils::String>;
+	std::string line;
+	file->clear();
+	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
+	while (getline(infile, line, '\n')) {
+		file->push_back(Utils::String(line).removeChar((char)0));
+	}
+	infile.close();
+	return file;
+}
 std::vector<CyString> *CFileIO::ReadLines()
+{
 	if ( m_sFilename.empty() ) return 0;
 	std::vector<CyString> *file = new std::vector<CyString>;
 	while (getline(infile, line, '\n'))
+	{
 		CyString l = line;
 		l.RemoveChar((char)0);
 		file->push_back(l);
 	}
 	infile.close();
 	return file;
+}
 	return file;
+}
 bool CFileIO::put(const unsigned char c)
 {
 	if ( !this->isOpened() ) return false;
 	m_fId.put(c);
 	return !m_fId.bad();
+}
 bool CFileIO::writeSize(unsigned int iSize)
 {
 	if ( !this->isOpened() ) return false;
 	if ( !this->put(static_cast<unsigned char>(iSize >> 24)) ) return false;
 	if ( !this->put(static_cast<unsigned char>(iSize >> 16)) ) return false;
 	if ( !this->put(static_cast<unsigned char>(iSize >> 8)) ) return false;
 	if ( !this->put(static_cast<unsigned char>(iSize)) ) return false;
 	m_lSize += 4;
 	if ( !this->isOpened() ) return false;
 	int iMaxSize = 1000000;
 	unsigned char *data;
 	try {
 		data = new unsigned char[iMaxSize + 1];
+	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::write(CFileIO, size_t) unable to malloc data, %d (%s)", iMaxSize + 1, e.what());
 		return false;
+}
 std::fstream &CFileIO::stream()
+{
 	return m_fId;
-}
-void CFileIO::StopRead()
-{
-	this->close();
+}
 bool CFileIO::isOpened() const
+{
 	if ( m_fId.is_open() )
+}
 void CFileIO::close()
+{
 	if ( this->isOpened() ) m_fId.close();
 }
 int CFileIO::readSize()
+{
 	unsigned char size[4];
 	if ( this->read(size, 4) ) return (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
 	return 0;
+}
-bool CFileIO::AtEnd() const
-{
-	return this->atEnd();
-}
 bool CFileIO::atEnd() const
 {
 	if ( !this->isOpened() ) return true;
 	if ( m_fId.eof() )		 return true;
 	return false;
+}
+bool CFileIO::appendFile ( const Utils::String &filename )
+{
+	std::fstream fromFile(filename, _in());
+	if ( !fromFile.is_open() ) return false;
+	std::fstream toFile(m_sFilename, _append());
+	if ( !toFile.is_open() ) {
+		fromFile.close();
+		return false;
+	}
+	// move to the end of the file
+	toFile.seekg(0, std::ios::end);
+	// get size of file
+	fromFile.seekg(0, std::ios::end);
+	size_t size = fromFile.tellg();
+	fromFile.seekg(0, std::ios::beg);
+	char data[500000];
+	while ( size > 0 )
+	{
+		size_t read = 500000;
+		if ( read > size )
+			read = size;
+		size -= read;
+		fromFile.read(data, read);
+		toFile.write(data, read);
+	}
+	fromFile.close();
+	toFile.close();
+	return true;
+}
 bool CFileIO::AppendFile ( CyString filename )
+{
 	std::fstream fromFile(filename.ToString().c_str(), _in());
+}
 Utils::String CFileIO::readEndOfLine()
+{
 	if ( !this->isOpened() ) {
-		if ( !StartRead() )	return "";
+		if ( !startRead() )	return "";
+	}
 	Utils::String str;
 	std::getline(m_fId, str, '\n');
 	return str;

Subversion Repositories spk

(root)//libspk/src/File_IO.cpp – Rev 81 → 82