actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

split up FileCopy, use RageFileBasic

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-21 06:51:55 +00:00
parent 1cef761253
commit 350085e096
2 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+34 -12
View File
@@ -1421,7 +1421,7 @@ CString ToString( bool value )
// //
// Helper function for reading/writing scores // Helper function for reading/writing scores
// //
bool FileRead(RageFile& f, CString& sOut) bool FileRead(RageFileBasic& f, CString& sOut)
{ {
if (f.AtEOF()) if (f.AtEOF())
return false; return false;
@@ -1430,7 +1430,7 @@ bool FileRead(RageFile& f, CString& sOut)
return true; return true;
} }
bool FileRead(RageFile& f, int& iOut) bool FileRead(RageFileBasic& f, int& iOut)
{ {
CString s; CString s;
if (!FileRead(f, s)) if (!FileRead(f, s))
@@ -1439,7 +1439,7 @@ bool FileRead(RageFile& f, int& iOut)
return true; return true;
} }
bool FileRead(RageFile& f, unsigned& uOut) bool FileRead(RageFileBasic& f, unsigned& uOut)
{ {
CString s; CString s;
if (!FileRead(f, s)) if (!FileRead(f, s))
@@ -1448,7 +1448,7 @@ bool FileRead(RageFile& f, unsigned& uOut)
return true; return true;
} }
bool FileRead(RageFile& f, float& fOut) bool FileRead(RageFileBasic& f, float& fOut)
{ {
CString s; CString s;
if (!FileRead(f, s)) if (!FileRead(f, s))
@@ -1457,22 +1457,22 @@ bool FileRead(RageFile& f, float& fOut)
return true; return true;
} }
void FileWrite(RageFile& f, const CString& sWrite) void FileWrite(RageFileBasic& f, const CString& sWrite)
{ {
f.PutLine( sWrite ); f.PutLine( sWrite );
} }
void FileWrite(RageFile& f, int iWrite) void FileWrite(RageFileBasic& f, int iWrite)
{ {
f.PutLine( ssprintf("%d", iWrite) ); f.PutLine( ssprintf("%d", iWrite) );
} }
void FileWrite(RageFile& f, size_t uWrite) void FileWrite(RageFileBasic& f, size_t uWrite)
{ {
f.PutLine( ssprintf("%i", (int)uWrite) ); f.PutLine( ssprintf("%i", (int)uWrite) );
} }
void FileWrite(RageFile& f, float fWrite) void FileWrite(RageFileBasic& f, float fWrite)
{ {
f.PutLine( ssprintf("%f", fWrite) ); f.PutLine( ssprintf("%f", fWrite) );
} }
@@ -1493,13 +1493,27 @@ bool FileCopy( CString sSrcFile, CString sDstFile )
if( !out.Open(sDstFile, RageFile::WRITE) ) if( !out.Open(sDstFile, RageFile::WRITE) )
return false; return false;
CString sError;
if( !FileCopy(in, out, sError) )
{
LOG->Warn( "FileCopy(%s,%s): %s",
sSrcFile.c_str(), sDstFile.c_str(), sError.c_str() );
return false;
}
return true;
}
bool FileCopy( RageFileBasic &in, RageFileBasic &out, CString &sError, bool *bReadError )
{
while(1) while(1)
{ {
CString data; CString data;
if( in.Read(data, 1024*32) == -1 ) if( in.Read(data, 1024*32) == -1 )
{ {
LOG->Warn( "FileCopy(%s,%s): read error: %s", sError = ssprintf( "read error: %s", in.GetError().c_str() );
sSrcFile.c_str(), sDstFile.c_str(), in.GetError().c_str() ); if( bReadError != NULL )
*bReadError = true;
return false; return false;
} }
if( data.empty() ) if( data.empty() )
@@ -1507,13 +1521,21 @@ bool FileCopy( CString sSrcFile, CString sDstFile )
int i = out.Write(data); int i = out.Write(data);
if( i == -1 ) if( i == -1 )
{ {
LOG->Warn( "FileCopy(%s,%s): write error: %s", sError = ssprintf( "write error: %s", out.GetError().c_str() );
sSrcFile.c_str(), sDstFile.c_str(), out.GetError().c_str() ); if( bReadError != NULL )
*bReadError = false;
return false; return false;
} }
} }
if( out.Flush() == -1 ) if( out.Flush() == -1 )
{
sError = ssprintf( "write error: %s", out.GetError().c_str() );
if( bReadError != NULL )
*bReadError = false;
return false; return false;
}
return true; return true;
} }
stepmania/src/RageUtil.h
+10 -9
View File
@@ -413,17 +413,18 @@ inline CString ToString( const CString &value ) { return value; }
// //
// Helper function for reading/writing scores // Helper function for reading/writing scores
// //
class RageFile; class RageFileBasic;
bool FileRead(RageFile& f, CString& sOut); bool FileRead(RageFileBasic& f, CString& sOut);
bool FileRead(RageFile& f, int& iOut); bool FileRead(RageFileBasic& f, int& iOut);
bool FileRead(RageFile& f, unsigned& uOut); bool FileRead(RageFileBasic& f, unsigned& uOut);
bool FileRead(RageFile& f, float& fOut); bool FileRead(RageFileBasic& f, float& fOut);
void FileWrite(RageFile& f, const CString& sWrite); void FileWrite(RageFileBasic& f, const CString& sWrite);
void FileWrite(RageFile& f, int iWrite); void FileWrite(RageFileBasic& f, int iWrite);
void FileWrite(RageFile& f, size_t uWrite); void FileWrite(RageFileBasic& f, size_t uWrite);
void FileWrite(RageFile& f, float fWrite); void FileWrite(RageFileBasic& f, float fWrite);
bool FileCopy( CString sSrcFile, CString sDstFile ); bool FileCopy( CString sSrcFile, CString sDstFile );
bool FileCopy( RageFileBasic &in, RageFileBasic &out, CString &sError, bool *bReadError = NULL );
#endif #endif