OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Deprecate plFileUtils and parts of pnUtPath

Browse Source
This commit is contained in:
Michael Hansen
2013-01-20 13:47:14 -08:00
parent 970ad3e729
commit 6e564476b7
114 changed files with 982 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp
View File

@ -53,44 +53,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
const uint32_t plAgePage::kInvalidSeqSuffix = (uint32_t)-1;
plAgePage::plAgePage( const char *name, uint32_t seqSuffix, uint8_t flags )
plAgePage::plAgePage( const plString &name, uint32_t seqSuffix, uint8_t flags )
{
fName = name != nil ? hsStrcpy( name ) : nil;
fName = name;
fSeqSuffix = seqSuffix;
fFlags = flags;
}
plAgePage::plAgePage( char *stringFrom ) : fName(nil)
plAgePage::plAgePage( const plString &stringFrom )
{
SetFromString( stringFrom );
}
plAgePage::plAgePage()
{
fName = nil;
fName = "";
fFlags = 0;
fSeqSuffix = 0;
}
plAgePage::plAgePage( const plAgePage &src ) : fName(nil)
plAgePage::plAgePage( const plAgePage &src )
{
fName = src.fName != nil ? hsStrcpy( src.fName ) : nil;
fName = src.fName;
fSeqSuffix = src.fSeqSuffix;
fFlags = src.fFlags;
}
plAgePage::~plAgePage()
{
delete [] fName;
}
plAgePage &plAgePage::operator=( const plAgePage &src )
{
delete [] fName;
fName = src.fName != nil ? hsStrcpy( src.fName ) : nil;
fName = src.fName;
fSeqSuffix = src.fSeqSuffix;
fFlags = src.fFlags;
return *this;
}
@ -103,54 +97,31 @@ void plAgePage::SetFlags(uint8_t f, bool on)
}
// now preservs original string
bool plAgePage::SetFromString( const char *stringIn )
bool plAgePage::SetFromString( const plString &stringIn )
{
char *c, seps[] = ", \n";
std::string string = stringIn;
// Parse. Format is going to be "pageName[,seqSuffix[,flags]]"
c = strtok( (char*)string.c_str(), seps );
if( c == nil )
std::vector<plString> toks = stringIn.Tokenize(", \n");
if (toks.size() == 0)
return false;
delete [] fName;
fName = hsStrcpy( c );
fName = toks[0];
fSeqSuffix = kInvalidSeqSuffix;
fFlags = 0;
// Look for seqSuffix
c = strtok( nil, seps );
if( c != nil )
{
fSeqSuffix = atoi( c );
// Look for flags
c = strtok( nil, seps );
if( c != nil )
{
fFlags = atoi( c );
}
else
fFlags = 0;
}
else
{
fSeqSuffix = kInvalidSeqSuffix;
fFlags = 0;
}
if (toks.size() > 1)
fSeqSuffix = toks[1].ToUInt();
if (toks.size() > 2)
fFlags = toks[2].ToUInt();
return true;
}
char *plAgePage::GetAsString( void ) const
plString plAgePage::GetAsString( void ) const
{
static char str[ 256 ];
if (fFlags)
return plString::Format("%s,%d,%d", fName.c_str(), fSeqSuffix, fFlags);
// Format is "pageName[,seqSuffix[,flags]]"
if( fFlags != 0 )
sprintf( str, "%s,%d,%d", fName, fSeqSuffix, fFlags );
else
sprintf( str, "%s,%d", fName, fSeqSuffix );
return str;
return plString::Format("%s,%d", fName.c_str(), fSeqSuffix);
}
@ -179,10 +150,9 @@ plAgeDescription::~plAgeDescription()
void plAgeDescription::IDeInit()
{
ClearPageList();
delete [] fName;
}
plAgeDescription::plAgeDescription( const char *fileNameToReadFrom ) : plInitSectionTokenReader()
plAgeDescription::plAgeDescription( const plFileName &fileNameToReadFrom ) : plInitSectionTokenReader()
{
ReadFromFile(fileNameToReadFrom);
}
@ -190,7 +160,7 @@ plAgeDescription::plAgeDescription( const char *fileNameToReadFrom ) : plInitSec
//
// Reads from a file, returns false if failed.
//
bool plAgeDescription::ReadFromFile( const char *fileNameToReadFrom )
bool plAgeDescription::ReadFromFile( const plFileName &fileNameToReadFrom )
{
IInit();
@ -206,38 +176,20 @@ bool plAgeDescription::ReadFromFile( const char *fileNameToReadFrom )
return true;
}
void plAgeDescription::SetAgeNameFromPath( const char *path )
void plAgeDescription::SetAgeNameFromPath( const plFileName &path )
{
delete [] fName;
if( path == nil )
if (!path.IsValid())
{
fName = nil;
fName = "";
return;
}
// Construct our name from the path
const char *pathSep1 = strrchr( path, '\\' );
const char *pathSep2 = strrchr( path, '/' );
if( pathSep2 > pathSep1 )
pathSep1 = pathSep2;
if( pathSep1 == nil )
pathSep1 = (char *)path;
else
pathSep1++; // Get past the actual character we found
char temp[ 512 ];
strcpy( temp, pathSep1 );
char *end = strrchr( temp, '.' );
if( end != nil )
*end = 0;
fName = hsStrcpy( temp );
fName = path.GetFileNameNoExt();
}
void plAgeDescription::IInit( void )
void plAgeDescription::IInit( void )
{
fName = nil;
fName = "";
fDayLength = 24.0f;
fMaxCapacity = -1;
fLingerTime = 180; // seconds
@ -248,14 +200,12 @@ void plAgeDescription::IInit( void )
fPageIterator = -1;
}
struct SzDelete { void operator()(char * str) { delete [] str;} };
void plAgeDescription::ClearPageList()
{
fPages.Reset();
}
void plAgeDescription::AppendPage( const char *name, int seqSuffix, uint8_t flags )
void plAgeDescription::AppendPage( const plString &name, int seqSuffix, uint8_t flags )
{
fPages.Append( plAgePage( name, ( seqSuffix == -1 ) ? fPages.GetCount() : (uint32_t)seqSuffix, flags ) );
}
@ -280,35 +230,30 @@ plAgePage *plAgeDescription::GetNextPage( void )
return ret;
}
void plAgeDescription::RemovePage( const char *page )
void plAgeDescription::RemovePage( const plString &page )
{
int i;
for( i = 0; i < fPages.GetCount(); i++ )
for (int i = 0; i < fPages.GetCount(); i++)
{
if( strcmp( page, fPages[ i ].GetName() ) == 0 )
if (page == fPages[i].GetName())
{
fPages.Remove( i );
fPages.Remove(i);
return;
}
}
}
plAgePage *plAgeDescription::FindPage( const char *name ) const
plAgePage *plAgeDescription::FindPage( const plString &name ) const
{
int i;
for( i = 0; i < fPages.GetCount(); i++ )
for (int i = 0; i < fPages.GetCount(); i++)
{
if( strcmp( name, fPages[ i ].GetName() ) == 0 )
return &fPages[ i ];
if (name == fPages[i].GetName())
return &fPages[i];
}
return nil;
}
plLocation plAgeDescription::CalcPageLocation( const char *page ) const
plLocation plAgeDescription::CalcPageLocation( const plString &page ) const
{
plAgePage *ap = FindPage( page );
if( ap != nil )
@ -334,10 +279,10 @@ plLocation plAgeDescription::CalcPageLocation( const char *page ) const
else
{
plLocation ret = plLocation::MakeNormal( combined );
if (page && !stricmp(page, "builtin"))
if (!page.CompareI("builtin"))
ret.SetFlags(plLocation::kBuiltIn);
return ret;
}
}
}
// Just make a blank (invalid) one
@ -380,7 +325,7 @@ void plAgeDescription::Write(hsStream* stream) const
int i;
for( i = 0; i < fPages.GetCount(); i++ )
{
sprintf(buf, "Page=%s\n", fPages[ i ].GetAsString() );
sprintf(buf, "Page=%s\n", fPages[ i ].GetAsString().c_str() );
stream->WriteString(buf);
}
}
@ -537,7 +482,7 @@ void plAgeDescription::AppendCommonPages( void )
void plAgeDescription::CopyFrom(const plAgeDescription& other)
{
IDeInit();
fName = hsStrcpy(other.GetAgeName());
fName = other.GetAgeName();
int i;
for(i=0;i<other.fPages.GetCount(); i++)
fPages.Append( other.fPages[ i ] );

45
Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h
View File

@ -57,9 +57,9 @@ class hsStream;
class plAgePage
{
protected:
char *fName;
uint32_t fSeqSuffix;
uint8_t fFlags;
plString fName;
uint32_t fSeqSuffix;
uint8_t fFlags;
public:
@ -73,21 +73,20 @@ class plAgePage
kIsVolatile = 0x08,
};
plAgePage( const char *name, uint32_t seqSuffix, uint8_t flags );
plAgePage( char *stringFrom );
plAgePage( const plString &name, uint32_t seqSuffix, uint8_t flags );
plAgePage( const plString &stringFrom );
plAgePage( const plAgePage &src );
plAgePage();
~plAgePage();
const char *GetName( void ) const { return fName; }
uint32_t GetSeqSuffix( void ) const { return fSeqSuffix; }
uint8_t GetFlags( void ) const { return fFlags; }
plString GetName( void ) const { return fName; }
uint32_t GetSeqSuffix( void ) const { return fSeqSuffix; }
uint8_t GetFlags( void ) const { return fFlags; }
void SetSeqSuffix( uint32_t s ) { fSeqSuffix = s; }
void SetFlags(uint8_t f, bool on=true);
bool SetFromString( const char *string );
char *GetAsString( void ) const;
bool SetFromString( const plString &string );
plString GetAsString( void ) const;
plAgePage &operator=( const plAgePage &src );
};
@ -98,16 +97,16 @@ class plAgeDescription : public plInitSectionTokenReader
{
private:
char *fName;
plString fName;
int32_t fPageIterator;
int32_t fPageIterator;
hsTArray<plAgePage> fPages;
plUnifiedTime fStart;
float fDayLength;
short fMaxCapacity;
short fLingerTime; // seconds game instance should linger after last player leaves. -1 means never exit.
short fLingerTime; // seconds game instance should linger after last player leaves. -1 means never exit.
int32_t fSeqPrefix;
uint32_t fReleaseVersion; // 0 for pre-release, 1+ for actual released ages
@ -124,7 +123,7 @@ public:
static char kAgeDescPath[];
plAgeDescription();
plAgeDescription( const char *fileNameToReadFrom );
plAgeDescription( const plFileName &fileNameToReadFrom );
plAgeDescription( const plAgeDescription &src )
{
IInit();
@ -132,28 +131,28 @@ public:
}
~plAgeDescription();
bool ReadFromFile( const char *fileNameToReadFrom ) ;
bool ReadFromFile( const plFileName &fileNameToReadFrom );
void Read(hsStream* stream);
void Write(hsStream* stream) const;
// Overload for plInitSectionTokenReader
virtual const char *GetSectionName( void ) const;
const char *GetAgeName( void ) const { return fName; }
void SetAgeNameFromPath( const char *path );
void SetAgeName(const char* ageName) { delete [] fName; fName=hsStrcpy(ageName); }
plString GetAgeName( void ) const { return fName; }
void SetAgeNameFromPath( const plFileName &path );
void SetAgeName(const plString& ageName) { fName = ageName; }
// Page list
void ClearPageList();
void RemovePage( const char *page );
void AppendPage( const char *name, int seqSuffix = -1, uint8_t flags = 0 );
void RemovePage( const plString &page );
void AppendPage( const plString &name, int seqSuffix = -1, uint8_t flags = 0 );
void SeekFirstPage( void );
plAgePage *GetNextPage( void );
int GetNumPages() const { return fPages.GetCount(); }
plAgePage *FindPage( const char *name ) const;
plAgePage *FindPage( const plString &name ) const;
bool FindLocation(const plLocation& loc) const;
plLocation CalcPageLocation( const char *page ) const;
plLocation CalcPageLocation( const plString &page ) const;
// Getters
short GetStartMonth() const { return fStart.GetMonth(); }

14
Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp
View File

@ -52,23 +52,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plFile/hsFiles.h"
#include "plFile/plFileUtils.h"
#include "plFile/plInitFileReader.h"
#include "hsStringTokenizer.h"
//// plManifestFile ///////////////////////////////////////////////////////
plManifestFile::plManifestFile(const char* name, const char* serverPath, const plMD5Checksum& check, uint32_t size, uint32_t zippedSize, uint32_t flags, bool md5Now) :
plManifestFile::plManifestFile(const plFileName& name, const plFileName& serverPath,
const plMD5Checksum& check, uint32_t size, uint32_t zippedSize,
uint32_t flags, bool md5Now) :
fName(name),
fServerPath(serverPath),
fChecksum(check),
fSize(size),
fZippedSize(zippedSize),
fFlags(flags),
fMd5Checked(md5Now)
{
fName = name;
fServerPath = serverPath;
if (md5Now)
{
DoMd5Check();
@ -81,9 +81,9 @@ plManifestFile::~plManifestFile()
void plManifestFile::DoMd5Check()
{
if (plFileUtils::FileExists(fName.c_str()))
if (plFileInfo(fName).Exists())
{
plMD5Checksum localFile(fName.c_str());
plMD5Checksum localFile(fName);
fIsLocalUpToDate = (localFile == fChecksum);
fLocalExists = true;
}

17
Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h
View File

@ -63,12 +63,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class plManifestFile
{
protected:
std::string fName;
std::string fServerPath;
plFileName fName;
plFileName fServerPath;
plMD5Checksum fChecksum;
uint32_t fSize;
uint32_t fZippedSize;
uint32_t fFlags;
uint32_t fSize;
uint32_t fZippedSize;
uint32_t fFlags;
bool fMd5Checked;
bool fIsLocalUpToDate;
@ -86,11 +86,12 @@ public:
kFlagZipped = 1<<3,
};
plManifestFile(const char* name, const char* serverPath, const plMD5Checksum& check, uint32_t size, uint32_t zippedSize, uint32_t flags, bool md5Now = true);
plManifestFile(const plFileName& name, const plFileName& serverPath, const plMD5Checksum& check,
uint32_t size, uint32_t zippedSize, uint32_t flags, bool md5Now = true);
virtual ~plManifestFile();
const char* GetName() const { return fName.c_str(); }
const char* GetServerPath() const { return fServerPath.c_str(); }
const plFileName &GetName() const { return fName; }
const plFileName &GetServerPath() const { return fServerPath; }
const plMD5Checksum& GetChecksum() const { return fChecksum; }
uint32_t GetDiskSize() const { return fSize; }
uint32_t GetDownloadSize() const { return hsCheckBits(fFlags, kFlagZipped) ? fZippedSize : fSize; }