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

 CFileIO::CFileIO () : m_lSize(0), m_bBinary(true), m_bAutoDelete(false), m_bSeekP(false)
+{
+}
-/*CFileIO::CFileIO(const Utils::String &sFilename, bool bBinary = true) : m_lSize(0), m_bBinary(bBinary), m_bAutoDelete(false)
+CFileIO::CFileIO(const Utils::String &sFilename, bool bBinary) : m_lSize(0), m_bBinary(bBinary), m_bAutoDelete(false)
+{
 	open(sFilename, bBinary);
+}
-*/
 CFileIO::CFileIO(CyString filename) : m_lSize(0), m_bBinary(true), m_bAutoDelete(false), m_bSeekP(false)
+{
 	open(filename.ToString(), true);
+}
 	m_sFile.removeFirstSpace();
 	m_sFile.removeChar(13);
 	this->_readFileSize();
 	return true;
 }
 unsigned char *CFileIO::read(size_t iAmount)
+{
 	if ( !this->isOpened() ) startRead();
 	if ( !this->isOpened() ) return NULL;
 	try {
 		data = new unsigned char[iAmount + 1];
+	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::read(size_t) unable to malloc data, %d (%s)", iAmount + 1, e.what());
 		return NULL;
+	}
 	if ( !read(data, iAmount, true) ) {
 		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::read(size_t) unable to read data from file, %s/%d", m_sFilename.c_str(), iAmount);
 		delete data;
 	return !m_fId.bad();
+}
 bool CFileIO::WritePartFile ( size_t *offsets, size_t numOffset )
 {
 	if ( NoFile() )	return false;
 	std::fstream File(m_sFilename, _in());
 	if ( !File.is_open() ) return false;
 	// first find file size
 	File.seekg(0, std::ios::end);
-	size_t fullsize = File.tellg(), size = fullsize;
+	size_t fullsize = static_cast<size_t>(File.tellg()), size = fullsize;
 	File.seekg(0, std::ios::beg);
 	std::fstream writeFile(CPackages::tempDirectory() + "/temp.tmp", _out());
 	if ( !File.is_open() ) {
 		File.close();
 	size_t off = 0;
 	size_t startPos = 0;
 	size_t remainingSize = fullsize;
 	while ( off < numOffset ) {
-		startPos = File.tellg();
+		startPos = static_cast<size_t>(File.tellg());
 		size_t offset = offsets[off++];
 		size_t size = offset - startPos;
 		try {
 			char *data = new char[size];
 			File.read(data, size);
 	std::fstream file(m_sFilename, (m_bBinary) ? (std::ios::in | std::ios::binary) : (std::ios::in));
 	if ( !file.is_open() ) return;
 	file.seekg(0, std::ios::end);
-	m_lSize = file.tellg();
+	m_lSize = static_cast<size_t>(file.tellg());
 	file.close();
+}
 bool CFileIO::WipeFile()
+{
+}
 bool CFileIO::writeString ( const Utils::String &data )
+{
 	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();
 	va_list args;
 	va_start(args, buf);
 	bool ret = this->_write((char *)buf, args);
 	va_end(args);
 	return ret;
 }
 void CFileIO::_seek(int iPos, int iFrom)
 {
 	if ( !this->isOpened() ) {
 		if ( !this->startRead() ) return;
+	}
 	if ( m_bSeekP ) m_fId.seekp(iPos, iFrom);
 	else m_fId.seekg(iPos, iFrom);
 }
 void CFileIO::seek(unsigned int iPos)
+{
 	_seek(iPos, std::ios::cur);
 }
 void CFileIO::seekEnd(unsigned int iPos)
 {
 	_seek(iPos, std::ios::end);
 }
 void CFileIO::seekStart(unsigned int iPos)
 {
 	_seek(iPos, std::ios::beg);
+}
 std::fstream &CFileIO::stream()
+{
 	return m_fId;
 }
 bool CFileIO::isOpened() const
 {
 	if ( m_fId.is_open() )
 		return true;
 	return false;
 }
 void CFileIO::close()
+{
 	if ( this->isOpened() ) m_fId.close();
 	this->_readFileSize();
 }
 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
+{
 	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();
+	size_t size = static_cast<size_t>(fromFile.tellg());
 	fromFile.seekg(0, std::ios::beg);
 	char data[500000];
 	while ( size > 0 )
+	{
 	// 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();
+	size_t size = static_cast<size_t>(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::AppendData ( const char *d, size_t size )
+{
 	std::ofstream File(m_sFilename, _append());
 	if ( !File.is_open() ) return false;
 	// move to the end of the file
 	//File.seekg(0, std::ios::end);
 	char *pos = (char *)d;
 	while ( size > 0 ) {
 		size_t read = 500000;
 		if ( read > size ) read = size;
 		size -= read;
 		try {
 			File.write(pos, read);
+		}
 	if ( m_sFilename.empty() ) return NullString;
 	return m_sFilename.token(".", -1);
+}
 Utils::String CFileIO::extension ()
 {
 	if ( m_sFilename.empty() ) return Utils::String::Null();
 	return m_sFilename.token(".", -1);
 }
 CyString CFileIO::ChangeFileExtension ( CyString ext )
+{
 	if ( m_sFilename.empty() )
 		return NullString;
 	return m_sFilename.tokens(".", 1, -2) + "." + ext.ToString();
+}
 bool CFileIO::Remove(const Utils::String &rem)
 {
 	//if ( !Exists() ) return false;
 	return (std::remove(rem) == 0) ? true : false;
 }
 bool CFileIO::remove()
+{
 	if ( this->isOpened() ) this->close();
 	if ( !this->exists() ) return false;
 	if ( std::remove(m_sFilename.c_str()) == 0 ) return true;
 	return false;
+}
 bool CFileIO::WriteFileUTF(std::vector<CyString> *lines)
 {
 	if ( !lines || m_sFilename.empty() )
 		return false;
 	// we need to create the directory
-	if ( !m_sDirIO.Exists() )
+	if ( !m_sDirIO.exists() )
+	{
+		if ( !m_sDirIO.Create() )
+			return false;
+	}
+#ifdef _WIN32
+	TCHAR buf[5000];
+	wsprintf(buf, L"%hs", m_sFilename.c_str());
+	FILE *id = _wfopen(buf, L"wt+,ccs=UTF-8");
+	if ( !id )
+		return false;
+	// write the rest
+	for ( int i = 0; i < (int)lines->size(); i++ )
+	{
+		CyString l = lines->at(i);
+		if ( l.IsIn('\n') )
+		{
+			int max;
+			CyString *strs = l.SplitToken("\n", &max);
+			if ( strs && max )
+			{
+				for ( int i = 0; i < max; i++ )
+				{
+					CyString line = strs[i];
+					line += "\n";
+					int size = wsprintf(buf, L"%hs", line.c_str());
+					fwrite(buf, sizeof(TCHAR), wcslen(buf), id);
+				}
+				CLEANSPLIT(strs, max);
+			}
+		}
+		else
+		{
+			l += "\n";
+			int size = wsprintf(buf, L"%hs", l.c_str());
+			fwrite(buf, sizeof(TCHAR), wcslen(buf), id);
+		}
+	}
+	fclose(id);
+	return true;
+#else
+    //TODO: write utf8 file writing function
+    return false;
+#endif
+}
+bool CFileIO::writeFileUTF(std::vector<Utils::String> *lines)
+{
+	if (!lines || m_sFilename.empty())
+		return false;
+	// we need to create the directory
+	if (!m_sDirIO.exists())
+	{
-		if ( !m_sDirIO.Create() )
+		if (!m_sDirIO.Create())
 			return false;
+	}
 #ifdef _WIN32
 	TCHAR buf[5000];
 	wsprintf(buf, L"%hs", m_sFilename.c_str());
 	FILE *id = _wfopen(buf, L"wt+,ccs=UTF-8");
-	if ( !id )
+	if (!id)
 		return false;
 	// write the rest
-	for ( int i = 0; i < (int)lines->size(); i++ )
+	for(auto itr = lines->begin(); itr != lines->end(); itr++)
+	{
-		CyString l = lines->at(i);
+		Utils::String l = (*itr);
-		if ( l.IsIn('\n') )
+		if (l.isin('\n'))
+		{
 			int max;
-			CyString *strs = l.SplitToken("\n", &max);
+			Utils::String *strs = l.tokenise("\n", &max);
-			if ( strs && max )
+			if (strs && max)
+			{
-				for ( int i = 0; i <; max; i++ )
+				for (int i = 0; i <; max; i++)
+				{
-					CyString line = strs[i];
+					Utils::String line = strs[i];
 					line += "\n";
 					int size = wsprintf(buf, L"%hs", line.c_str());
 					fwrite(buf, sizeof(TCHAR), wcslen(buf), id);
+				}
 	fclose(id);
 	return true;
 #else
-    //TODO: write utf8 file writing function
+	//TODO: write utf8 file writing function
-    return false;
+	return false;
 #endif
+}
 bool CFileIO::WriteFile(std::vector<CyString> *lines)
 {
 	if ( !lines || m_sFilename.empty() )
 		return false;
 	// we need to create the directory
-	if ( !m_sDirIO.Exists() )
+	if ( !m_sDirIO.exists() )
+	{
 		if ( !m_sDirIO.Create() )
 			return false;
+	}
 	return true;
+}
 bool CFileIO::WriteFile(CyStringList *lines)
 {
 	if ( !lines || m_sFilename.empty() )
 		return false;
 	// we need to create the directory
-	if ( !m_sDirIO.Exists() )
+	if ( !m_sDirIO.exists() )
+	{
 		if ( !m_sDirIO.Create() )
 			return false;
+	}
 	std::ofstream out(m_sFilename.c_str());
 	if ( !out )
 		return false;
 	/*
 	if ( utf )
 	{
 		unsigned char smarker[4];
 		smarker[0] = 0xEF;
 		smarker[1] = 0xBB;
 		smarker[2] = 0xBF;
 		smarker[3] = 0x00;
 		out << smarker;
+	}
 */
 	for ( int i = 0; i < (int)lines->Count(); i++ )
 	{
 		CyString l = lines->StringAt(i);
 		out << l.c_str() << std::endl;
+	}
+	out.close();
+	return true;
+}
+bool CFileIO::writeFile(std::vector<Utils::String> *lines)
+{
+	if (!lines || m_sFilename.empty())
+		return false;
+	// we need to create the directory
+	if (!m_sDirIO.exists())
+	{
+		if (!m_sDirIO.Create())
+			return false;
+	}
+	std::ofstream out(m_sFilename.c_str());
+	if (!out)
+		return false;
+	for (auto itr = lines->begin(); itr != lines->end(); itr++)
+		out << (*itr).c_str() << std::endl;
+	out.close();
+	return true;
+}
+bool CFileIO::writeFile(Utils::CStringList *lines)
+{
+	if (!lines || m_sFilename.empty())
+		return false;
+	// we need to create the directory
+	if (!m_sDirIO.exists())
+	{
+		if (!m_sDirIO.Create())
+			return false;
+	}
+	std::ofstream out(m_sFilename.c_str());
+	if (!out)
+		return false;
+	for(auto itr = lines->begin(); itr != lines->end(); itr++)
+		out << (*itr)->str.c_str() << std::endl;
 	out.close();
 	return true;
+}
 	return 0;
+}
 size_t CFileIO::position()
+{
-	return m_fId.tellg();
+	return static_cast<size_t>(m_fId.tellg());
+}
 /**
  * Copys the contents of a file to another
+ *

Subversion Repositories spk

(root)//libspk/src/File_IO.cpp – Rev 120 → 121