libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Run the detectors on one directory at a time, rather than one file at a time.

Browse Source 
svn-id: r18685
This commit is contained in:
Marcus Comstedt 2005-08-14 15:51:41 +00:00
parent a1e4dd1390
commit 72ed016ea2
1 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
backends/dc/selector.cpp
View File

@ -147,37 +147,13 @@ struct Dir
static Game the_game; static Game the_game;
static bool checkName(const char *base, char *text = 0) static void detectGames(FSList &files, DetectedGameList &candidates)
{ {
GameDetector g;
GameSettings gs = g.findGame(base);
if (gs.name) {
if(text != NULL)
strcpy(text, gs.description);
return true;
}
return false;
}
static bool isGame(const FilesystemNode &entry, char *base)
{
FSList files;
files.push_back(entry);
DetectedGameList candidates;
const PluginList &plugins = PluginManager::instance().getPlugins(); const PluginList &plugins = PluginManager::instance().getPlugins();
PluginList::const_iterator iter = plugins.begin(); PluginList::const_iterator iter = plugins.begin();
for (iter = plugins.begin(); iter != plugins.end(); ++iter) { for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
candidates.push_back((*iter)->detectGames(files)); candidates.push_back((*iter)->detectGames(files));
} }
if (candidates.isEmpty())
return false;
if (candidates.size() > 1)
return false;
strcpy(base, candidates[0].name);
return true;
} }
static bool isIcon(const FilesystemNode &entry) static bool isIcon(const FilesystemNode &entry)
@ -231,38 +207,45 @@ static int findGames(Game *games, int max)
strncpy(dirs[curr_dir].name, dirs[curr_dir].node.path().c_str(), 252); strncpy(dirs[curr_dir].name, dirs[curr_dir].node.path().c_str(), 252);
dirs[curr_dir].name[251] = '\0'; dirs[curr_dir].name[251] = '\0';
dirs[curr_dir].deficon[0] = '\0'; dirs[curr_dir].deficon[0] = '\0';
FSList fslist = dirs[curr_dir++].node.listDir(FilesystemNode::kListAll); FSList files, fslist = dirs[curr_dir++].node.listDir(FilesystemNode::kListAll);
for (FSList::const_iterator entry = fslist.begin(); entry != fslist.end(); for (FSList::const_iterator entry = fslist.begin(); entry != fslist.end();
++entry) { ++entry) {
if (entry->isDirectory()) { if (entry->isDirectory()) {
if(num_dirs < MAX_DIR && strcasecmp(entry->displayName().c_str(), if(num_dirs < MAX_DIR && strcasecmp(entry->displayName().c_str(),
"install")) { "install")) {
dirs[num_dirs].node = *entry; dirs[num_dirs].node = *entry;
num_dirs++; num_dirs++;
} }
} else } else
if(isIcon(*entry)) if(isIcon(*entry))
strcpy(dirs[curr_dir-1].deficon, entry->displayName().c_str()); strcpy(dirs[curr_dir-1].deficon, entry->displayName().c_str());
else if(curr_game < max && else
isGame(*entry, games[curr_game].filename_base)) { files.push_back(*entry);
strcpy(games[curr_game].dir, dirs[curr_dir-1].name); }
if(uniqueGame(games[curr_game].filename_base,
games[curr_game].dir, games, curr_game)) { DetectedGameList candidates;
detectGames(files, candidates);
if(!checkName(games[curr_game].filename_base,
games[curr_game].text)) for(DetectedGameList::const_iterator ge = candidates.begin();
strcpy(games[curr_game].text, games[curr_game].filename_base); ge != candidates.end(); ++ge)
if(curr_game < max) {
strcpy(games[curr_game].filename_base, ge->name);
strcpy(games[curr_game].dir, dirs[curr_dir-1].name);
if(uniqueGame(games[curr_game].filename_base,
games[curr_game].dir, games, curr_game)) {
strcpy(games[curr_game].text, ge->description);
#if 0 #if 0
printf("Registered game <%s> in <%s> <%s> because of <%s> <%s>\n", printf("Registered game <%s> in <%s> <%s> because of <%s> <*>\n",
games[curr_game].text, games[curr_game].dir, games[curr_game].text, games[curr_game].dir,
games[curr_game].filename_base, games[curr_game].filename_base,
dirs[curr_dir-1].name, entry->displayName().c_str()); dirs[curr_dir-1].name);
#endif #endif
curr_game++; curr_game++;
} }
}
} }
} }
for(int i=0; i<curr_game; i++) for(int i=0; i<curr_game; i++)
if(!loadIcon(games[i], dirs, num_dirs)) if(!loadIcon(games[i], dirs, num_dirs))
makeDefIcon(games[i].icon); makeDefIcon(games[i].icon);