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

simplify RageFileObjZipStored

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-11 01:18:27 +00:00
parent 47994102b3
commit 7bb2cec302
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverZip.cpp
+17 -16
View File
@@ -96,22 +96,22 @@ public:
class RageFileObjZipStored: public RageFileObj class RageFileObjZipStored: public RageFileObj
{ {
private: private:
const FileInfo &info;
RageFile zip; RageFile zip;
int FilePos; int m_iFilePos;
int m_iOffset, m_iFileSize;
public: public:
RageFileObjZipStored( const RageFile &f, const FileInfo &info ); RageFileObjZipStored( const RageFile &f, int iOffset, int iFileSize );
int ReadInternal( void *pBuffer, size_t iBytes ); int ReadInternal( void *pBuffer, size_t iBytes );
int WriteInternal( const void *pBuffer, size_t iBytes ) { SetError( "Not implemented" ); return -1; } int WriteInternal( const void *pBuffer, size_t iBytes ) { SetError( "Not implemented" ); return -1; }
int SeekInternal( int iOffset ); int SeekInternal( int iOffset );
int GetFileSize() const { return info.uncompr_size; } int GetFileSize() const { return m_iFileSize; }
RageBasicFile *Copy() const RageBasicFile *Copy() const
{ {
RageFileObjZipStored *pRet = new RageFileObjZipStored( zip, info ); RageFileObjZipStored *pRet = new RageFileObjZipStored( zip, m_iOffset, m_iFileSize );
pRet->FilePos = FilePos; pRet->m_iFilePos = m_iFilePos;
return pRet; return pRet;
} }
}; };
@@ -434,7 +434,7 @@ RageBasicFile *RageFileDriverZip::Open( const CString &path, int mode, int &err
switch( info->compression_method ) switch( info->compression_method )
{ {
case STORED: case STORED:
return new RageFileObjZipStored( zip, *info ); return new RageFileObjZipStored( zip, info->data_offset, info->uncompr_size );
case DEFLATED: case DEFLATED:
return new RageFileObjZipDeflated( zip, *info ); return new RageFileObjZipDeflated( zip, *info );
default: default:
@@ -605,16 +605,17 @@ int RageFileObjZipDeflated::SeekInternal( int iPos )
return UFilePos; return UFilePos;
} }
RageFileObjZipStored::RageFileObjZipStored( const RageFile &f, const FileInfo &info_ ): RageFileObjZipStored::RageFileObjZipStored( const RageFile &f, int iOffset, int iFileSize ):
info(info_),
zip( f ) zip( f )
{ {
FilePos = 0; m_iOffset = iOffset;
m_iFileSize = iFileSize;
m_iFilePos = 0;
} }
int RageFileObjZipStored::ReadInternal( void *buf, size_t bytes ) int RageFileObjZipStored::ReadInternal( void *buf, size_t bytes )
{ {
const int bytes_left = info.compr_size-this->FilePos; const int bytes_left = m_iFileSize-(this->m_iFilePos-m_iOffset);
const int got = zip.Read( buf, min( (int) bytes, bytes_left ) ); const int got = zip.Read( buf, min( (int) bytes, bytes_left ) );
if( got == -1 ) if( got == -1 )
{ {
@@ -622,7 +623,7 @@ int RageFileObjZipStored::ReadInternal( void *buf, size_t bytes )
return -1; return -1;
} }
FilePos += got; m_iFilePos += got;
return got; return got;
} }
@@ -631,17 +632,17 @@ int RageFileObjZipStored::ReadInternal( void *buf, size_t bytes )
int RageFileObjZipStored::SeekInternal( int offset ) int RageFileObjZipStored::SeekInternal( int offset )
{ {
ASSERT( offset >= 0 ); ASSERT( offset >= 0 );
offset = min( (unsigned) offset, info.compr_size ); offset = min( offset, m_iFileSize );
int ret = zip.Seek( info.data_offset + offset ); int ret = zip.Seek( m_iOffset + offset );
if( ret == -1 ) if( ret == -1 )
{ {
SetError( zip.GetError() ); SetError( zip.GetError() );
return -1; return -1;
} }
ret -= info.data_offset; ret -= m_iOffset;
ASSERT( ret >= 0 ); ASSERT( ret >= 0 );
FilePos = ret; m_iFilePos = ret;
return ret; return ret;
} }