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

+}
 bool CFileIO::open(const Utils::String &sFilename, bool bBinary)
+{
 	m_bBinary = bBinary;
-	m_sFilename = sFilename.asFilename();
+	_sFilename = sFilename.asFilename();
 	// check if there are any directories, and split the file and directory parts
-	if ( m_sFilename.isin('/') ) {
+	if ( _sFilename.isin('/') ) {
-		m_sDirIO.SetDir(m_sFilename.tokens("/", 1, -2));
+		_sDirIO.setDir(_sFilename.tokens("/", 1, -2));
-		m_sFile = m_sFilename.token("/", -1);
+		_sFile = _sFilename.token("/", -1);
+	}
 	else
-		m_sFile = m_sFilename;
+		_sFile = _sFilename;
-	m_sFile.removeFirstSpace();
+	_sFile.removeFirstSpace();
-	m_sFile.removeChar(13);
+	_sFile.removeChar(13);
+	_updateFilename();
 	this->_readFileSize();
 	return true;
+}
 		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);
+		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::read(size_t) unable to read data from file, %s/%d", _sFilename.c_str(), iAmount);
 		delete data;
 		return NULL;
+	}
 	return data;
 		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::readAll() unable to malloc data, %d (%s)", m_lSize + 1, e.what());
 		return NULL;
+	}
 	if ( !read(data, m_lSize, true) ) {
-		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::readAll() unable to read data from file, %s/%d", m_sFilename.c_str(), m_lSize);
+		CLog::logf(CLog::Log_IO, 2, "ERROR: CFileIO::readAll() unable to read data from file, %s/%d", _sFilename.c_str(), m_lSize);
 		delete data;
 		return NULL;
+	}
 	if ( pSize ) (*pSize) = m_lSize;
 	if ( iSize > m_lSize ) iSize = m_lSize;
 	try {
 		m_fId.read((char *)buf, iSize);
+	}
 	catch (std::exception &e) {
-		CLog::logf(CLog::Log_IO, 3, "ERROR: CFileIO::read() unable to read from file: %s (%s)", m_sFilename.c_str(), e.what());
+		CLog::logf(CLog::Log_IO, 3, "ERROR: CFileIO::read() unable to read from file: %s (%s)", _sFilename.c_str(), e.what());
 		return false;
+	}
 	if ( bEndChar ) buf[iSize] = '\0';
 bool CFileIO::WritePartFile ( size_t *offsets, size_t numOffset )
+{
 	if ( NoFile() )	return false;
-	std::fstream File(m_sFilename, _in());
+	std::fstream File(_sFilename, _in());
 	if ( !File.is_open() ) return false;
 	// first find file size
 	File.seekg(0, std::ios::end);
 	size_t fullsize = static_cast<size_t>(File.tellg()), size = fullsize;
 			File.read(data, size);
 			writeFile.write(data, size);
 			delete data;
+		}
 		catch(std::exception &e) {
-			CLog::logf(CLog::Log_IO, 2, "CFileIO::WritePartFilea() unable to read data from file: %s (%s)", m_sFilename.c_str(), e.what());
+			CLog::logf(CLog::Log_IO, 2, "CFileIO::WritePartFilea() unable to read data from file: %s (%s)", _sFilename.c_str(), e.what());
 			return false;
+		}
 		size_t datasize = offsets[off++];
 		File.seekg(datasize, std::ios::beg);
 			try {
 				File.read(data, amountLeft);
 				writeFile.write(data, amountLeft);
+			}
 			catch(std::exception &e) {
-				CLog::logf(CLog::Log_IO, 2, "CFileIO::WritePartFilea() unable to read data from file: %s (%s)", m_sFilename.c_str(), e.what());
+				CLog::logf(CLog::Log_IO, 2, "CFileIO::WritePartFilea() unable to read data from file: %s (%s)", _sFilename.c_str(), e.what());
 				return false;
+			}
 			remainingSize -= amountLeft;
 			amountLeft = 1000000;
 	File.close();
 	writeFile.close();
 	// now copy to original file
-	std::remove(m_sFilename);
+	std::remove(_sFilename);
-	std::rename(CPackages::tempDirectory() + "/temp.tmp", m_sFilename);
+	std::rename(CPackages::tempDirectory() + "/temp.tmp", _sFilename);
 	return true;
+}
 void CFileIO::setDir(const Utils::String &dir)
+{
-	if ( m_sFile.empty() )	m_sDirIO.SetDir(dir);
+	if ( _sFile.empty() )	_sDirIO.setDir(dir);
-	else					open(dir + "/" + m_sFile, m_bBinary);
+	else					open(dir + "/" + _sFile, m_bBinary);
-}
-void CFileIO::SetDir ( CyString dir )
-{
-	setDir(dir.ToString());
+}
 void CFileIO::_readFileSize ()
+{
 	m_lSize = 0;
-	std::fstream file(m_sFilename, (m_bBinary) ? (std::ios::in | std::ios::binary) : (std::ios::in));
+	std::fstream file(_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 = static_cast<size_t>(file.tellg());
 	file.close();
 bool CFileIO::WipeFile()
+{
 	if ( NoFile() )	return false;
 	std::ofstream file;
-	file.open(m_sFilename, std::ios::out | std::ios::trunc);
+	file.open(_sFilename, std::ios::out | std::ios::trunc);
 	bool bDone = file.is_open();
 	file.close();
 	return bDone;
+}
 	File.close();
 	this->close();
 	File.setAutoDelete(false);
 	// now copy to original file
-	if ( std::remove(m_sFilename.c_str()) == 0 ) {
+	if ( std::remove(_sFilename.c_str()) == 0 ) {
-		std::rename(CPackages::tempDirectory() + "/temp.tmp", m_sFilename.c_str());
+		std::rename(CPackages::tempDirectory() + "/temp.tmp", _sFilename.c_str());
 		size_t oldSize = m_lSize;
 		size_t checkFileSize = m_lSize - datasize;
 		this->_readFileSize();
 		if ( checkFileSize != m_lSize ) {
 			CLog::log(CLog::Log_IO, 3, Utils::String("WARNING: CFileIO::TruncateFile, file size mismatch, ") + (long)checkFileSize + " => " + (long)m_lSize);
 	if ( NoFile() ) return NULL;
 	if ( !m_lSize )	this->_readFileSize();
 	if ( !m_lSize ) return NULL;
-	std::fstream file(m_sFilename, _in());
+	std::fstream file(_sFilename, _in());
 	if ( !file.is_open() ) return NULL;
 	char *data;
 	try {
 		data = new char[m_lSize + 1];
 bool CFileIO::WriteData ( const char *data, size_t size )
+{
 	if ( NoFile() )
 		return false;
-	std::fstream File(m_sFilename, _out());
+	std::fstream File(_sFilename, _out());
 	if ( !File.is_open() ) return false;
 	bool ret = true;
 	try {
 		File.write(data, size);
+	}
 	catch (std::exception &e) {
-		CLog::logf(CLog::Log_IO, 2, "CFileIO::ReadToData() unable to read data from file: %s (%s)", m_sFilename.c_str(), e.what());
+		CLog::logf(CLog::Log_IO, 2, "CFileIO::ReadToData() unable to read data from file: %s (%s)", _sFilename.c_str(), e.what());
 		ret = false;
+	}
 	File.close();
 	return this->exists();
+}
 bool CFileIO::exists () const
+{
 	if ( this->isOpened() ) return true;
-	std::fstream File(m_sFilename, _in());
+	std::fstream File(_sFilename, _in());
 	bool bRet = File.good();
 	File.close();
 	return bRet;
+}
 	return _start(_append(), false);
+}
 bool CFileIO::_start(int iFlags, bool bSeekP)
+{
-	if ( !m_sFilename.empty() ) {
+	if ( !_sFilename.empty() ) {
 		if ( this->isOpened() ) this->close();
-		m_fId.open(m_sFilename, iFlags);
+		m_fId.open(_sFilename, iFlags);
+	}
 	m_bSeekP = bSeekP;
 	return m_fId.is_open();
 }
 std::vector<Utils::String> *CFileIO::readLines()
 {
-	if ( m_sFilename.empty() ) return 0;
+	if ( _sFilename.empty() ) return 0;
 	std::vector<Utils::String> *file = new std::vector<Utils::String>;
 	Utils::String line;
 	file->clear();
-	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
+	std::ifstream infile (_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>;
-	Utils::String line;
-	file->clear();
-	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
-	while (getline(infile, line, '\n'))
-	{
-		CyString l = line;
-		l.RemoveChar((char)0);
-		file->push_back(l);
-	}
-	infile.close();
-	return file;
-}
 CyStringList *CFileIO::ReadLinesStr()
+{
-	if ( m_sFilename.empty() ) return 0;
+	if ( _sFilename.empty() ) return 0;
 	CyStringList *file = new CyStringList;
 	Utils::String line;
-	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
+	std::ifstream infile (_sFilename.c_str(), std::ios_base::in);
 	while (getline(infile, line, '\n')) {
 		file->PushBack(CyString(line.removeChar((char)0)));
+	}
 	infile.close();
 	return file;
+}
 Utils::CStringList *CFileIO::readLinesStr()
+{
-	if ( m_sFilename.empty() ) return 0;
+	if ( _sFilename.empty() ) return 0;
 	Utils::CStringList *file = new Utils::CStringList();
 	Utils::String line;
-	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
+	std::ifstream infile (_sFilename.c_str(), std::ios_base::in);
 	while (getline(infile, line, '\n'))	{
 		file->pushBack(line.removeChar((char)0));
+	}
 	infile.close();
 	if ( !this->isOpened() ) return false;
 	try {
 		m_fId.write((char *)buf, iSize);
+	}
 	catch (std::exception &e) {
-		CLog::logf(CLog::Log_IO, 2, "CFileIO::write() unable to write to file: %s (%s)", m_sFilename.c_str(), e.what());
+		CLog::logf(CLog::Log_IO, 2, "CFileIO::write() unable to write to file: %s (%s)", _sFilename.c_str(), e.what());
 		return false;
+	}
 	m_lSize += iSize;
 	return !m_fId.bad();
+}
 		int iLen = strlen(buffer);
 		m_fId.write((char *)buffer, iLen);
 		m_lSize += iLen;
+	}
 	catch (std::exception &e) {
-		CLog::logf(CLog::Log_IO, 2, "CFileIO::write() unable to write to file: %s (%s)", m_sFilename.c_str(), e.what());
+		CLog::logf(CLog::Log_IO, 2, "CFileIO::write() unable to write to file: %s (%s)", _sFilename.c_str(), e.what());
 		return false;
+	}
 	return !m_fId.bad();
+}
 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 = 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::AppendFile ( CyString filename )
-{
-	std::fstream fromFile(filename.ToString().c_str(), _in());
-	if ( !fromFile.is_open() ) return false;
-	std::fstream toFile(m_sFilename, _append());
+	std::fstream toFile(_sFilename, _append());
 	if ( !toFile.is_open() ) {
 		fromFile.close();
 		return false;
+	}
+}
 bool CFileIO::AppendData ( const char *d, size_t size )
+{
-	std::ofstream File(m_sFilename, _append());
+	std::ofstream File(_sFilename, _append());
 	if ( !File.is_open() ) return false;
 	// move to the end of the file
 	//File.seekg(0, std::ios::end);
 		try {
 			File.write(pos, read);
+		}
 		catch(std::exception &e) {
-			CLog::logf(CLog::Log_IO, 2, "CFileIO::AppendData() unable to write data to file: %s (%s)", m_sFilename.c_str(), e.what());
+			CLog::logf(CLog::Log_IO, 2, "CFileIO::AppendData() unable to write data to file: %s (%s)", _sFilename.c_str(), e.what());
 			File.close();
 			return false;
+		}
 		pos += read;
+	}
 	return str;
+}
 Utils::String CFileIO::baseName() const
+{
-	return m_sFile.tokens(".", 1, -2);
+	return _sFile.tokens(".", 1, -2);
-}
-CyString CFileIO::GetFileExtension ()
-{
-	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) const
-{
-	return changeFileExtension(ext.ToString());
+}
+Utils::String CFileIO::extension () const
+{
+	if ( _sFilename.empty() ) return Utils::String::Null();
+	return _sFilename.token(".", -1);
+}
 Utils::String CFileIO::changeFileExtension(const Utils::String &ext) const
+{
-	if ( m_sFilename.empty() )
+	if ( _sFilename.empty() )
 		return Utils::String::Null();
-	return m_sFilename.tokens(".", 1, -2) + "." + ext;
+	return _sFilename.tokens(".", 1, -2) + "." + ext;
+}
 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;
+	if ( std::remove(_sFilename.c_str()) == 0 ) return true;
 	return false;
 }
-bool CFileIO::WriteFileUTF(std::vector<CyString> *lines)
+bool CFileIO::writeFileUTF(std::vector<Utils::String> *lines)
+{
-	if ( !lines || m_sFilename.empty() )
+	if (!lines || _sFilename.empty())
 		return false;
 	// we need to create the directory
-	if ( !m_sDirIO.exists() )
+	if (!_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 (!_sDirIO.create())
 			return false;
+	}
 #ifdef _WIN32
 	TCHAR buf[5000];
-	wsprintf(buf, L"%hs", m_sFilename.c_str());
+	wsprintf(buf, L"%hs", _sFilename.c_str());
 	FILE *id = _wfopen(buf, L"wt+,ccs=UTF-8");
 	if (!id)
 		return false;
 	// write the rest
 	//TODO: write utf8 file writing function
 	return false;
 #endif
+}
-bool CFileIO::WriteFile(std::vector<CyString> *lines)
+bool CFileIO::WriteFile(CyStringList *lines)
+{
-	if ( !lines || m_sFilename.empty() )
+	if ( !lines || _sFilename.empty() )
 		return false;
 	// we need to create the directory
-	if ( !m_sDirIO.exists() )
+	if ( !_sDirIO.exists() )
 	{
-		if ( !m_sDirIO.Create() )
+		if ( !_sDirIO.create() )
 			return false;
 	}
-	std::ofstream out(m_sFilename.c_str());
-	if ( !out )
-		return false;
-	for ( int i = 0; i < (int)lines->size(); i++ )
-	{
-		CyString l = lines->at(i);
-		out << l.c_str() << std::endl;
-	}
-	out.close();
-	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.Create() )
-			return false;
-	}
-	std::ofstream out(m_sFilename.c_str());
+	std::ofstream out(_sFilename.c_str());
 	if ( !out )
 		return false;
 	/*
 	if ( utf )
 		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())
+	if (!lines || _sFilename.empty())
 		return false;
 	// we need to create the directory
-	if (!m_sDirIO.exists())
+	if (!_sDirIO.exists())
+	{
-		if (!m_sDirIO.Create())
+		if (!_sDirIO.create())
 			return false;
+	}
-	std::ofstream out(m_sFilename.c_str());
+	std::ofstream out(_sFilename.c_str());
 	if (!out)
 		return false;
 	for (auto itr = lines->begin(); itr != lines->end(); itr++)
 		out << (*itr).c_str() << std::endl;
 	return true;
+}
 bool CFileIO::writeFile(Utils::CStringList *lines)
+{
-	if (!lines || m_sFilename.empty())
+	if (!lines || _sFilename.empty())
 		return false;
 	// we need to create the directory
-	if (!m_sDirIO.exists())
+	if (!_sDirIO.exists())
+	{
-		if (!m_sDirIO.Create())
+		if (!_sDirIO.create())
 			return false;
+	}
-	std::ofstream out(m_sFilename.c_str());
+	std::ofstream out(_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;
+}
 bool CFileIO::Rename(const Utils::String &toFile)
 {
-	if ( rename(m_sFilename.c_str(), toFile.c_str()) == 0 )
+	if ( rename(_sFilename.c_str(), toFile.c_str()) == 0 )
 		return true;
 	return false;
+}
-CyString CFileIO::GetWindowsFilename()
+Utils::String CFileIO::getWindowsFilename() const
+{
-	CyString returnString = m_sFilename;
+	Utils::String returnString = _sFilename;
-	returnString = returnString.FindReplace("/", "\\");
+	returnString = returnString.findReplace("/", "\\");
 	return returnString;
+}
-void CFileIO::SetCreationTime(time_t time)
+void CFileIO::setCreationTime(time_t time)
+{
 #ifdef _WIN32
 	// Note that LONGLONG is a 64-bit value
     LONGLONG ll;
 	FILETIME ft;
     ll = Int32x32To64(time, 10000000) + 116444736000000000;
     ft.dwLowDateTime = (DWORD)ll;
     ft.dwHighDateTime = ll >> 32;
+	Utils::String windowsFilename = getWindowsFilename();
 	WCHAR    str[MAX_PATH];
-	MultiByteToWideChar(CP_ACP, NULL, GetWindowsFilename().c_str(), -1, str, GetWindowsFilename().Length() + 1);
+	MultiByteToWideChar(CP_ACP, NULL, windowsFilename.c_str(), -1, str, windowsFilename.length() + 1);
 	HANDLE filename = CreateFile(str, FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	// Set the file time on the file
 	SetFileTime(filename,(LPFILETIME) NULL,(LPFILETIME) NULL,&ft);
 	// Close our handle.
 	CloseHandle(filename);
 #endif
 }
-time_t CFileIO::GetCreationTime()
+time_t CFileIO::creationTime() const
 {
 	return modifiedTime();
+}
-time_t CFileIO::modifiedTime()
+time_t CFileIO::modifiedTime() const
+{
 #ifdef _WIN32
 	WCHAR    str[MAX_PATH];
+	Utils::String windowsFilename = getWindowsFilename();
-	MultiByteToWideChar(CP_ACP, NULL, GetWindowsFilename().c_str(), -1, str, GetWindowsFilename().Length() + 1);
+	MultiByteToWideChar(CP_ACP, NULL, windowsFilename.c_str(), windowsFilename.length() + 1, str, MAX_PATH);
 	WIN32_FILE_ATTRIBUTE_DATA wfad;
 	GetFileAttributesEx(str, GetFileExInfoStandard, &wfad);
 	LARGE_INTEGER date, adjust;
+ *
  * Reads and writes the files in block
  */
 bool CFileIO::copy(const Utils::String &toFile, bool keepTime)
+{
-	time_t time = GetCreationTime();
+	time_t time = creationTime();
 	CFileIO File(toFile);
 	if ( File.write(*this, m_lSize) ) {
 		this->close();
 		File.close();
-		if ( keepTime )	File.SetCreationTime(time);
+		if ( keepTime )	File.setCreationTime(time);
 		return true;
+	}
 /*
 	std::fstream f(GetWindowsFilename().c_str(), std::fstream::in | std::fstream::binary);
 	f << std::noskipws;
+}
 size_t CFileIO::fileSize() const
+{
 	return m_lSize;
+}
+void CFileIO::_updateFilename()
+{
+	if (_sFilename.empty()) _sExt = Utils::String::Null();
+	_sExt = _sFilename.token(".", -1);
+}

Subversion Repositories spk

(root)/libspk/src/File_IO.cpp – Rev 158 → 160