From 66ed427a571a9e224eed94790664b0612574bef9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 13 Jun 2012 22:07:15 +0200 Subject: update_walk: move code to update_container.c --- src/update_container.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ src/update_container.h | 37 +++++++++++++++ src/update_walk.c | 92 +----------------------------------- 3 files changed, 162 insertions(+), 91 deletions(-) create mode 100644 src/update_container.c create mode 100644 src/update_container.h (limited to 'src') diff --git a/src/update_container.c b/src/update_container.c new file mode 100644 index 000000000..9fe4bb0a9 --- /dev/null +++ b/src/update_container.c @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2003-2012 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" /* must be first for large file support */ +#include "update_container.h" +#include "update_internal.h" +#include "update_db.h" +#include "db_lock.h" +#include "directory.h" +#include "song.h" +#include "mapper.h" +#include "glib_compat.h" +#include "decoder_plugin.h" +#include "tag.h" +#include "tag_handler.h" + +#include + +/** + * Create the specified directory object if it does not exist already + * or if the #stat object indicates that it has been modified since + * the last update. Returns NULL when it exists already and is + * unmodified. + * + * The caller must lock the database. + */ +static struct directory * +make_directory_if_modified(struct directory *parent, const char *name, + const struct stat *st) +{ + struct directory *directory = directory_get_child(parent, name); + + // directory exists already + if (directory != NULL) { + if (directory->mtime == st->st_mtime && !walk_discard) { + /* not modified */ + db_unlock(); + return NULL; + } + + delete_directory(directory); + modified = true; + } + + directory = directory_make_child(parent, name); + directory->mtime = st->st_mtime; + return directory; +} + +bool +update_container_file(struct directory *directory, + const char *name, + const struct stat *st, + const struct decoder_plugin *plugin) +{ + if (plugin->container_scan == NULL) + return false; + + db_lock(); + struct directory *contdir = + make_directory_if_modified(directory, name, st); + if (contdir == NULL) { + /* not modified */ + db_unlock(); + return true; + } + + contdir->device = DEVICE_CONTAINER; + db_unlock(); + + char *const pathname = map_directory_child_fs(directory, name); + + char *vtrack; + unsigned int tnum = 0; + while ((vtrack = plugin->container_scan(pathname, ++tnum)) != NULL) { + struct song *song = song_file_new(vtrack, contdir); + + // shouldn't be necessary but it's there.. + song->mtime = st->st_mtime; + + char *child_path_fs = map_directory_child_fs(contdir, vtrack); + + song->tag = tag_new(); + decoder_plugin_scan_file(plugin, child_path_fs, + &add_tag_handler, song->tag); + g_free(child_path_fs); + + db_lock(); + directory_add_song(contdir, song); + db_unlock(); + + modified = true; + + g_message("added %s/%s", + directory_get_path(directory), vtrack); + g_free(vtrack); + } + + g_free(pathname); + + if (tnum == 1) { + db_lock(); + delete_directory(contdir); + db_unlock(); + return false; + } else + return true; +} diff --git a/src/update_container.h b/src/update_container.h new file mode 100644 index 000000000..7f42c80ca --- /dev/null +++ b/src/update_container.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2003-2012 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_UPDATE_CONTAINER_H +#define MPD_UPDATE_CONTAINER_H + +#include "check.h" + +#include +#include + +struct directory; +struct decoder_plugin; + +bool +update_container_file(struct directory *directory, + const char *name, + const struct stat *st, + const struct decoder_plugin *plugin); + +#endif diff --git a/src/update_walk.c b/src/update_walk.c index 73f4c1cae..061a446f3 100644 --- a/src/update_walk.c +++ b/src/update_walk.c @@ -22,6 +22,7 @@ #include "update_internal.h" #include "update_io.h" #include "update_db.h" +#include "update_container.h" #include "update_archive.h" #include "database.h" #include "db_lock.h" @@ -37,8 +38,6 @@ #include "playlist_list.h" #include "glib_compat.h" #include "conf.h" -#include "tag.h" -#include "tag_handler.h" #include @@ -208,94 +207,6 @@ find_inode_ancestor(struct directory *parent, ino_t inode, dev_t device) return 0; } -/** - * Create the specified directory object if it does not exist already - * or if the #stat object indicates that it has been modified since - * the last update. Returns NULL when it exists already and is - * unmodified. - * - * The caller must lock the database. - */ -static struct directory * -make_directory_if_modified(struct directory *parent, const char *name, - const struct stat *st) -{ - struct directory *directory = directory_get_child(parent, name); - - // directory exists already - if (directory != NULL) { - if (directory->mtime == st->st_mtime && !walk_discard) { - /* not modified */ - db_unlock(); - return NULL; - } - - delete_directory(directory); - modified = true; - } - - directory = directory_make_child(parent, name); - directory->mtime = st->st_mtime; - return directory; -} - -static bool -update_container_file(struct directory *directory, - const char *name, - const struct stat *st, - const struct decoder_plugin *plugin) -{ - db_lock(); - struct directory *contdir = - make_directory_if_modified(directory, name, st); - if (contdir == NULL) { - /* not modified */ - db_unlock(); - return true; - } - - contdir->device = DEVICE_CONTAINER; - db_unlock(); - - char *const pathname = map_directory_child_fs(directory, name); - - char *vtrack; - unsigned int tnum = 0; - while ((vtrack = plugin->container_scan(pathname, ++tnum)) != NULL) { - struct song *song = song_file_new(vtrack, contdir); - - // shouldn't be necessary but it's there.. - song->mtime = st->st_mtime; - - char *child_path_fs = map_directory_child_fs(contdir, vtrack); - - song->tag = tag_new(); - decoder_plugin_scan_file(plugin, child_path_fs, - &add_tag_handler, song->tag); - g_free(child_path_fs); - - db_lock(); - directory_add_song(contdir, song); - db_unlock(); - - modified = true; - - g_message("added %s/%s", - directory_get_path(directory), vtrack); - g_free(vtrack); - } - - g_free(pathname); - - if (tnum == 1) { - db_lock(); - delete_directory(contdir); - db_unlock(); - return false; - } else - return true; -} - static void update_song_file(struct directory *directory, const char *name, const struct stat *st, @@ -319,7 +230,6 @@ update_song_file(struct directory *directory, 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(); -- cgit v1.2.3