oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

update: merged exploreDirectory() into updateDirectory()

Browse Source 
exploreDirectory() duplicates some code in updateDirectory().  Merge
both functions, and use directory_is_empty() to determine whether
update or explore mode should be used.
This commit is contained in:
Max Kellermann 2008-10-08 10:48:55 +02:00
parent e79aacf1db
commit 3c1142cbcb
3 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/directory.c
View File

@ -489,7 +489,7 @@ int traverseAllIn(const char *name,
void directory_init(void) void directory_init(void)
{ {
music_root = newDirectory(NULL, NULL); music_root = newDirectory(NULL, NULL);
exploreDirectory(music_root); updateDirectory(music_root);
stats.numberOfSongs = countSongsIn(NULL); stats.numberOfSongs = countSongsIn(NULL);
stats.dbPlayTime = sumSongTimesIn(NULL); stats.dbPlayTime = sumSongTimesIn(NULL);
} }

60
src/update.c
View File

@ -169,7 +169,7 @@ addSubDirectoryToDirectory(Directory * directory,
subDirectory = newDirectory(name, directory); subDirectory = newDirectory(name, directory);
directory_set_stat(subDirectory, st); directory_set_stat(subDirectory, st);
if (exploreDirectory(subDirectory) != UPDATE_RETURN_UPDATED) { if (updateDirectory(subDirectory) != UPDATE_RETURN_UPDATED) {
freeDirectory(subDirectory); freeDirectory(subDirectory);
return UPDATE_RETURN_NOUPDATE; return UPDATE_RETURN_NOUPDATE;
} }
@ -208,8 +208,6 @@ addToDirectory(Directory * directory, const char *name)
return UPDATE_RETURN_ERROR; return UPDATE_RETURN_ERROR;
} }
static enum update_return updateDirectory(Directory * directory);
static enum update_return static enum update_return
updateInDirectory(Directory * directory, const char *name) updateInDirectory(Directory * directory, const char *name)
{ {
@ -252,48 +250,9 @@ static int skip_path(const char *path)
} }
enum update_return enum update_return
exploreDirectory(Directory * directory) updateDirectory(Directory * directory)
{
DIR *dir;
const char *dirname = getDirectoryPath(directory);
struct dirent *ent;
char path_max_tmp[MPD_PATH_MAX];
enum update_return ret = UPDATE_RETURN_NOUPDATE;
DEBUG("explore: attempting to opendir: %s\n", dirname);
dir = opendir(opendir_path(path_max_tmp, dirname));
if (!dir)
return UPDATE_RETURN_ERROR;
DEBUG("explore: %s\n", dirname);
while ((ent = readdir(dir))) {
char *utf8;
if (skip_path(ent->d_name))
continue;
utf8 = fs_charset_to_utf8(path_max_tmp, ent->d_name);
if (!utf8)
continue;
DEBUG("explore: found: %s (%s)\n", ent->d_name, utf8);
if (directory->path)
utf8 = pfx_dir(path_max_tmp, utf8, strlen(utf8),
dirname, strlen(dirname));
if (addToDirectory(directory, path_max_tmp) ==
UPDATE_RETURN_UPDATED)
ret = UPDATE_RETURN_UPDATED;
}
closedir(dir);
return ret;
}
static enum update_return updateDirectory(Directory * directory)
{ {
bool was_empty = directory_is_empty(directory);
DIR *dir; DIR *dir;
const char *dirname = getDirectoryPath(directory); const char *dirname = getDirectoryPath(directory);
struct dirent *ent; struct dirent *ent;
@ -311,7 +270,8 @@ static enum update_return updateDirectory(Directory * directory)
if (!dir) if (!dir)
return UPDATE_RETURN_ERROR; return UPDATE_RETURN_ERROR;
if (removeDeletedFromDirectory(path_max_tmp, directory) > 0) if (!was_empty &&
removeDeletedFromDirectory(path_max_tmp, directory) > 0)
ret = UPDATE_RETURN_UPDATED; ret = UPDATE_RETURN_UPDATED;
while ((ent = readdir(dir))) { while ((ent = readdir(dir))) {
@ -326,8 +286,14 @@ static enum update_return updateDirectory(Directory * directory)
if (directory->path) if (directory->path)
utf8 = pfx_dir(path_max_tmp, utf8, strlen(utf8), utf8 = pfx_dir(path_max_tmp, utf8, strlen(utf8),
dirname, strlen(dirname)); dirname, strlen(dirname));
if (updateInDirectory(directory, path_max_tmp) > 0) if (was_empty) {
ret = UPDATE_RETURN_UPDATED; if (addToDirectory(directory, path_max_tmp) ==
UPDATE_RETURN_UPDATED)
ret = UPDATE_RETURN_UPDATED;
} else {
if (updateInDirectory(directory, path_max_tmp) > 0)
ret = UPDATE_RETURN_UPDATED;
}
} }
closedir(dir); closedir(dir);

2
src/update.h
View File

@ -31,7 +31,7 @@ enum update_return {
int isUpdatingDB(void); int isUpdatingDB(void);
enum update_return enum update_return
exploreDirectory(Directory * directory); updateDirectory(Directory * directory);
/* /*
* returns the non-negative update job ID on success, * returns the non-negative update job ID on success,