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

update_walk: move code to update_song_file()

Browse Source
This commit is contained in:
Max Kellermann 2012-02-12 16:50:24 +01:00
parent 1735284a2a
commit 2ba3401238
1 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/update_walk.c
View File

@ -566,6 +566,69 @@ directory_child_access(const struct directory *directory,
#endif #endif
} }
static void
update_song_file(struct directory *directory,
const char *name, const struct stat *st,
const struct decoder_plugin *plugin)
{
db_lock();
struct song *song = directory_get_song(directory, name);
db_unlock();
if (!directory_child_access(directory, name, R_OK)) {
g_warning("no read permissions on %s/%s",
directory_get_path(directory), name);
if (song != NULL) {
db_lock();
delete_song(directory, song);
db_unlock();
}
return;
}
if (!(song != NULL && st->st_mtime == song->mtime &&
!walk_discard) &&
plugin->container_scan != NULL &&
update_container_file(directory, name, st, plugin)) {
if (song != NULL) {
db_lock();
delete_song(directory, song);
db_unlock();
}
return;
}
if (song == NULL) {
g_debug("reading %s/%s",
directory_get_path(directory), name);
song = song_file_load(name, directory);
if (song == NULL) {
g_debug("ignoring unrecognized file %s/%s",
directory_get_path(directory), name);
return;
}
directory_add_song(directory, song);
modified = true;
g_message("added %s/%s",
directory_get_path(directory), name);
} else if (st->st_mtime != song->mtime || walk_discard) {
g_message("updating %s/%s",
directory_get_path(directory), name);
if (!song_file_update(song)) {
g_debug("deleting unrecognized file %s/%s",
directory_get_path(directory), name);
db_lock();
delete_song(directory, song);
db_unlock();
}
modified = true;
}
}
static void static void
update_regular_file(struct directory *directory, update_regular_file(struct directory *directory,
const char *name, const struct stat *st) const char *name, const struct stat *st)
@ -580,65 +643,7 @@ update_regular_file(struct directory *directory,
if ((plugin = decoder_plugin_from_suffix(suffix, false)) != NULL) if ((plugin = decoder_plugin_from_suffix(suffix, false)) != NULL)
{ {
db_lock(); update_song_file(directory, name, st, plugin);
struct song *song = directory_get_song(directory, name);
db_unlock();
if (!directory_child_access(directory, name, R_OK)) {
g_warning("no read permissions on %s/%s",
directory_get_path(directory), name);
if (song != NULL) {
db_lock();
delete_song(directory, song);
db_unlock();
}
return;
}
if (!(song != NULL && st->st_mtime == song->mtime &&
!walk_discard) &&
plugin->container_scan != NULL)
{
if (update_container_file(directory, name, st, plugin))
{
if (song != NULL) {
db_lock();
delete_song(directory, song);
db_unlock();
}
return;
}
}
if (song == NULL) {
g_debug("reading %s/%s",
directory_get_path(directory), name);
song = song_file_load(name, directory);
if (song == NULL) {
g_debug("ignoring unrecognized file %s/%s",
directory_get_path(directory), name);
return;
}
directory_add_song(directory, song);
modified = true;
g_message("added %s/%s",
directory_get_path(directory), name);
} else if (st->st_mtime != song->mtime || walk_discard) {
g_message("updating %s/%s",
directory_get_path(directory), name);
if (!song_file_update(song)) {
g_debug("deleting unrecognized file %s/%s",
directory_get_path(directory), name);
db_lock();
delete_song(directory, song);
db_unlock();
}
modified = true;
}
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
} else if ((archive = archive_plugin_from_suffix(suffix))) { } else if ((archive = archive_plugin_from_suffix(suffix))) {
update_archive_file(directory, name, st, archive); update_archive_file(directory, name, st, archive);