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

update root searching

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-12 22:27:21 +00:00
parent 492cd1da67
commit beea7e9627
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileManager.cpp
+25 -8
View File
@@ -5,14 +5,18 @@
#include "RageUtil.h" #include "RageUtil.h"
#include "RageUtil_FileDB.h" #include "RageUtil_FileDB.h"
#include "RageLog.h" #include "RageLog.h"
#include <errno.h> #include <errno.h>
#if defined(LINUX)
#include <sys/stat.h>
#endif
RageFileManager *FILEMAN = NULL; RageFileManager *FILEMAN = NULL;
/* Mountpoints as directories cause a problem. If "Themes/default" is a mountpoint, and // Mountpoints as directories cause a problem. If "Themes/default" is a mountpoint, and
* doesn't exist anywhere else, then GetDirListing("Themes/*") must return "default". The // doesn't exist anywhere else, then GetDirListing("Themes/*") must return "default". The
* driver containing "Themes/default" won't do this; its world view begins at "BGAnimations" // driver containing "Themes/default" won't do this; its world view begins at "BGAnimations"
* (inside "Themes/default"). We need a dummy driver that handles mountpoints. */ // (inside "Themes/default"). We need a dummy driver that handles mountpoints. */
class RageFileDriverMountpoints: public RageFileDriver class RageFileDriverMountpoints: public RageFileDriver
{ {
public: public:
@@ -62,6 +66,11 @@ RageFileManager::RageFileManager()
#if defined(XBOX) #if defined(XBOX)
RageFileManager::Mount( "dir", SYS_BASE_PATH, "" ); RageFileManager::Mount( "dir", SYS_BASE_PATH, "" );
#elif defined(LINUX) #elif defined(LINUX)
/* Absolute paths. This is rarely used, eg. by Alsa9Buf::GetSoundCardDebugInfo().
* All paths that start with a slash (eg. "/proc") should use this, so put it
* first. */
RageFileManager::Mount( "dir", "/", "/" );
/* We can almost do this, to have machine profiles be system-global to eg. share /* We can almost do this, to have machine profiles be system-global to eg. share
* scores. It would need to handle permissions properly. */ * scores. It would need to handle permissions properly. */
/* RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "Data/Profiles" ); */ /* RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "Data/Profiles" ); */
@@ -81,11 +90,19 @@ RageFileManager::RageFileManager()
/* Next, search ~/StepMania. This is where users can put music, themes, etc. */ /* Next, search ~/StepMania. This is where users can put music, themes, etc. */
/* RageFileManager::Mount( "dir", Home + PRODUCT_NAME, "" ); */ /* RageFileManager::Mount( "dir", Home + PRODUCT_NAME, "" ); */
/* Paths relative to the CWD: */ /* Search for a directory with "Songs" in it. Be careful: the CWD is likely to
RageFileManager::Mount( "dir", ".", "" ); * be ~, and it's possible that some users will have a ~/Songs/ directory that
* has nothing to do with us, so check the initial directory last. */
CString Root = "";
struct stat st;
if( Root == "" && !stat( DirOfExecutable + "/Songs", &st ) && st.st_mode&S_IFDIR )
Root = DirOfExecutable;
if( Root == "" && !stat( InitialWorkingDirectory + "/Songs", &st ) && st.st_mode&S_IFDIR )
Root = InitialWorkingDirectory;
if( Root == "" )
RageException::Throw( "Couldn't find \"Songs\"" );
/* Absolute paths. This is rarely used, eg. by Alsa9Buf::GetSoundCardDebugInfo(). */ RageFileManager::Mount( "dir", Root, "" );
RageFileManager::Mount( "dir", "/", "/" );
#elif defined(_WINDOWS) #elif defined(_WINDOWS)
/* XXX: Test to see if we can write to the program directory tree. If we can't, /* XXX: Test to see if we can write to the program directory tree. If we can't,
* add a search path under "Documents and Settings" for writing scores, etc. Otherwise, * add a search path under "Documents and Settings" for writing scores, etc. Otherwise,