From 4f5be111744bbfe92ce1bb5b193e260c80edb701 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 15 Dec 2003 05:36:27 +0000
Subject: [PATCH] optimize

---
 stepmania/src/RageUtil_FileDB.cpp | 44 ++++++++++++++++++-------------
 stepmania/src/RageUtil_FileDB.h   |  8 +++++-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/RageUtil_FileDB.cpp b/stepmania/src/RageUtil_FileDB.cpp
index 789d09e289..ddca43e20f 100644
--- a/stepmania/src/RageUtil_FileDB.cpp
+++ b/stepmania/src/RageUtil_FileDB.cpp
@@ -136,35 +136,41 @@ bool FilenameDB::ResolvePath(CString &path)
 	if(path == "") return true;
 
 	/* Split path into components. */
-	vector<CString> p;
-	split(path, "/", p, true);
-
-	/* If we have "/foo", then add a blank entry to the beginning to line things up. */
-	if( path.Left(1) == "/" )
-		p.insert( p.begin(), "" );
+	int begin = 0, size = -1;
 
 	/* Resolve each component. */
 	CString ret = "";
-	for(unsigned i = 0; i < p.size(); ++i)
+	FileSet *fs = NULL;
+	File *prev_file = NULL;
+	static const CString slash("/");
+	while( 1 )
 	{
-		if( i != 0 )
-			ret += "/";
+		split( path, slash, begin, size, true );
+		if( begin == (int) path.size() )
+			break;
 
-		vector<CString> lst;
-		FileSet &fs = GetFileSet( ret );
-		fs.GetFilesEqualTo(p[i], lst, false);
+		if( fs == NULL )
+			fs = &GetFileSet( ret );
+
+		CString p = path.substr( begin, size );
+		set<File>::iterator it = fs->files.find( File(p) );
 
 		/* If there were no matches, the path isn't found. */
-		if(lst.empty()) return false;
+		if( it == fs->files.end() )
+			return false;
 
-		if( lst.size() > 1 && LOG )
-			LOG->Warn("Ambiguous filenames '%s' and '%s'",
-				lst[0].c_str(), lst[1].c_str());
+		if( prev_file )
+			prev_file->dirp = fs;
+		prev_file = &*it;
 
-		ret += lst[0];
+		if( ret.size() != 0 )
+			ret += "/";
+		ret += it->name;
+
+		fs = it->dirp;
 	}
-
-	if(path.Right(1) == "/")
+	
+	if( path.size() && path[path.size()-1] == '/' )
 		path = ret + "/";
 	else
 		path = ret;
diff --git a/stepmania/src/RageUtil_FileDB.h b/stepmania/src/RageUtil_FileDB.h
index 4e192181f5..b4664b5202 100644
--- a/stepmania/src/RageUtil_FileDB.h
+++ b/stepmania/src/RageUtil_FileDB.h
@@ -7,6 +7,7 @@
 
 enum FileType { TTYPE_FILE, TTYPE_DIR, TTYPE_NONE };
 
+struct FileSet;
 struct File
 {
 	CString name;
@@ -27,7 +28,12 @@ struct File
 
 	/* Private data, for RageFileDrivers. */
 	void *priv;
-	File() { dir=false; size=-1; hash=-1; priv=NULL;}
+
+	/* If this is non-NULL, and dir is true, this is a pointer to the FileSet containing
+	 * the directory contents.  (This is a cache; it isn't always set.) */
+	FileSet *dirp;
+
+	File() { dir=false; dirp=NULL; size=-1; hash=-1; priv=NULL;}
 	File( const CString &fn )
 	{
 		SetName( fn );