fly/flightgear
1
0
Fork 0
Code Activity

Simplify NavDataCache::NavDataCachePrivate::findDatFiles()

Browse source 
- Use a range-based for loop instead of an iterator.

- Don't bother checking if the previously-visited directory was the
  same: the potential saving that the previous code was hoping should be
  null because FGGlobals::append_fg_scenery() doesn't add a path to
  FGGlobals::fg_scenery if it's already there---this assumes that all
  paths added to FGGlobals::fg_scenery go through
  FGGlobals::append_fg_scenery(), of course.

This should have no effect on FG's behavior.
This commit is contained in:
Florent Rougon 2020-09-30 11:09:44 +02:00
parent 329d3cdd13
commit b1b12a924f
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Navaids/NavDataCache.cxx
View file

@ -1045,27 +1045,18 @@ void NavDataCache::NavDataCachePrivate::findDatFiles(
NavDataCache::DatFileType datFileType)
{
NavDataCache::DatFilesGroupInfo result;
SGPath visitedPath; // to avoid duplicates and time wasting
const string datFilesSubDir = "NavData/" +
NavDataCache::datTypeStr[datFileType];
const PathList& sceneryPaths = globals->get_fg_scenery();
result.datFileType = datFileType;
result.totalSize = 0;
for (PathList::const_iterator dirsIt = sceneryPaths.begin();
dirsIt != sceneryPaths.end(); dirsIt++) {
if (dirsIt->isNull() || *dirsIt == visitedPath) {
continue; // duplicate or empty path
} else if (! dirsIt->isDir()) {
SG_LOG(SG_NAVCACHE, SG_WARN, *dirsIt <<
for (const auto& path: globals->get_fg_scenery()) {
if (! path.isDir()) {
SG_LOG(SG_NAVCACHE, SG_WARN, path <<
": given as a scenery path, but is not a directory");
visitedPath = *dirsIt; // to avoid duplicate log messages
continue;
}
visitedPath = *dirsIt;
SGPath datFilesDir = visitedPath;
datFilesDir.append(datFilesSubDir);
const SGPath datFilesDir =
path / "NavData" / NavDataCache::datTypeStr[datFileType];
if (datFilesDir.isDir()) {
// Deterministic because the return value of simgear::Dir::children() is
@ -1073,7 +1064,7 @@ void NavDataCache::NavDataCachePrivate::findDatFiles(
const PathList files = simgear::Dir(datFilesDir).children(
simgear::Dir::TYPE_FILE | simgear::Dir::NO_DOT_OR_DOTDOT);
for (auto f : files) {
for (const auto& f : files) {
const std::string name = f.file();
if (simgear::strutils::ends_with(name, ".dat") ||
simgear::strutils::ends_with(name, ".dat.gz")) {
@ -1082,7 +1073,7 @@ void NavDataCache::NavDataCachePrivate::findDatFiles(
}
}
}
} // of loop over 'sceneryPaths'
} // of loop over the list of scenery paths
// Add the default file (e.g., $FG_ROOT/Airports/apt.dat.gz), at least for
// now