Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-06 20:45:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

add Exists; improve unique name generation

Browse source
This commit is contained in:
ehouse 2005-01-19 15:12:34 +00:00
parent 352231b854
commit 997e030885
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
xwords4/symbian/src/symgmmgr.cpp
View file

@ -76,8 +76,8 @@ CXWGamesMgr::BuildListL()
if ( err == KErrNone ) { if ( err == KErrNone ) {
CleanupStack::PushL( file_list ); CleanupStack::PushL( file_list );
iGameCount = file_list->Count(); TInt gameCount = file_list->Count();
iNamesList = new (ELeave)CDesC16ArrayFlat( iGameCount ); iNamesList = new (ELeave)CDesC16ArrayFlat( gameCount );
TInt i; TInt i;
for ( i = 0; i < file_list->Count(); i++ ) { for ( i = 0; i < file_list->Count(); i++ ) {
@ -105,12 +105,41 @@ CXWGamesMgr::GetNames() const
return iNamesList; return iNamesList;
} // GetNames } // GetNames
TBool
CXWGamesMgr::Exists( TGameName* aName )
{
RFs fs = iCoeEnv->FsSession();
TFileName nameD;
GameNameToPath( &nameD, aName );
TUint attValue;
TInt err = fs.Att( nameD, attValue );
XP_LOGF( "fs.Att(%S) => %d", aName, err );
return err == KErrNone;
}
void
CXWGamesMgr::GameNameToPath( TFileName* aPath, const TDesC16* aName )
{
aPath->Copy( iDir );
aPath->Append( *aName );
aPath->Append( kGameTypeExt );
}
void void
CXWGamesMgr::MakeDefaultName( TGameName* aName ) CXWGamesMgr::MakeDefaultName( TGameName* aName )
{ {
aName->Delete( 0, 256 ); /* return a unique new name */
aName->Append( _L("game") ); for ( ; ; ) {
aName->AppendNum( ++iGameCount ); aName->Delete( 0, 256 );
aName->Append( _L("game") );
aName->AppendNum( ++iGameCount );
if ( !Exists( aName ) ) {
break;
}
}
} // MakeDefaultName } // MakeDefaultName
void void
@ -120,9 +149,8 @@ CXWGamesMgr::StoreGameL( const TGameName* aName, /* does not have extension */
RFs fs = iCoeEnv->FsSession(); RFs fs = iCoeEnv->FsSession();
// write the stream to a file // write the stream to a file
TFileName nameD( iDir ); TFileName nameD;
nameD.Append( *aName ); GameNameToPath( &nameD, aName );
nameD.Append( kGameTypeExt );
RFile file; RFile file;
TInt err = file.Replace( fs, nameD, EFileWrite ); TInt err = file.Replace( fs, nameD, EFileWrite );
XP_ASSERT( err == KErrNone ); XP_ASSERT( err == KErrNone );
@ -147,12 +175,15 @@ CXWGamesMgr::LoadGameL( const TGameName* aName, XWStreamCtxt* aStream )
{ {
RFs fs = iCoeEnv->FsSession(); RFs fs = iCoeEnv->FsSession();
TFileName nameD( iDir ); TFileName nameD;
nameD.Append( *aName ); GameNameToPath( &nameD, aName );
nameD.Append( kGameTypeExt );
RFile file; RFile file;
User::LeaveIfError( file.Open( fs, nameD, EFileRead ) ); TInt err = file.Open( fs, nameD, EFileRead );
if ( err != KErrNone ) {
XP_LOGF( "file.Open() => %d", err );
}
User::LeaveIfError( err );
CleanupClosePushL(file); CleanupClosePushL(file);
for ( ; ; ) { for ( ; ; ) {
@ -162,7 +193,7 @@ CXWGamesMgr::LoadGameL( const TGameName* aName, XWStreamCtxt* aStream )
if ( nRead <= 0 ) { if ( nRead <= 0 ) {
break; break;
} }
stream_putBytes( aStream, (void*)buf.Ptr(), nRead ); stream_putBytes( aStream, (void*)buf.Ptr(), SC(XP_U16, nRead) );
} }
CleanupStack::PopAndDestroy( &file ); CleanupStack::PopAndDestroy( &file );
@ -177,10 +208,8 @@ CXWGamesMgr::DeleteSelected( TInt aIndex )
TBool TBool
CXWGamesMgr::DeleteFileFor( TPtrC16* aName ) CXWGamesMgr::DeleteFileFor( TPtrC16* aName )
{ {
TFileName nameD( iDir ); TFileName nameD;
nameD.Append( *aName ); GameNameToPath( &nameD, aName );
nameD.Append( kGameTypeExt );
RFs fs = iCoeEnv->FsSession(); RFs fs = iCoeEnv->FsSession();
TInt err = fs.Delete( nameD ); TInt err = fs.Delete( nameD );