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

Fix CacheFile

Browse Source
This commit is contained in:
sukibaby
2024-08-06 16:03:40 -07:00
committed by teejusb
parent d53d1b113b
commit bfde995b60
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageFileDriverDirectHelpers.cpp
+7 -10
View File
@@ -167,10 +167,11 @@ void DirectFilenameDB::CacheFile( const RString &sPath )
return; return;
} }
while( !pFileSet->m_bFilled ) while( !pFileSet->m_bFilled )
{
m_Mutex.Wait(); m_Mutex.Wait();
}
#if defined(_WIN32) #if defined(_WIN32)
// There is almost surely a better way to do this
WIN32_FIND_DATA fd; WIN32_FIND_DATA fd;
HANDLE hFind = DoFindFirstFile( root+sPath, &fd ); HANDLE hFind = DoFindFirstFile( root+sPath, &fd );
if( hFind == INVALID_HANDLE_VALUE ) if( hFind == INVALID_HANDLE_VALUE )
@@ -180,8 +181,8 @@ void DirectFilenameDB::CacheFile( const RString &sPath )
} }
File f( fd.cFileName ); File f( fd.cFileName );
f.dir = !!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); f.dir = !!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
f.size = fd.nFileSizeLow; f.size = static_cast<int64_t>(fd.nFileSizeHigh) << 32 | fd.nFileSizeLow;
f.hash = fd.ftLastWriteTime.dwLowDateTime; f.hash = static_cast<int64_t>(fd.ftLastWriteTime.dwHighDateTime) << 32 | fd.ftLastWriteTime.dwLowDateTime;
pFileSet->files.insert( f ); pFileSet->files.insert( f );
FindClose( hFind ); FindClose( hFind );
@@ -191,16 +192,12 @@ void DirectFilenameDB::CacheFile( const RString &sPath )
struct stat st; struct stat st;
if( DoStat(root+sPath, &st) == -1 ) if( DoStat(root+sPath, &st) == -1 )
{ {
int iError = errno; WARN(ssprintf("File '%s' is gone! (%s)", sPath.c_str(), strerror(errno)));
// If it's a broken symlink, ignore it. Otherwise, warn.
// Huh?
WARN( ssprintf("File '%s' is gone! (%s)",
sPath.c_str(), strerror(iError)) );
} }
else else
{ {
f.dir = (st.st_mode & S_IFDIR); f.dir = S_ISDIR(st.st_mode);
f.size = (int)st.st_size; f.size = static_cast<int>(st.st_size);
f.hash = st.st_mtime; f.hash = st.st_mtime;
} }