aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-06-13 22:14:16 +0200
committerMax Kellermann <max@duempel.org>2012-06-13 22:14:16 +0200
commitede70ee3a4c6897f843f118c065da81737e2b74e (patch)
treeedbb9d7caeefd2709e6203c992f377f4d4761cbf
parent66ed427a571a9e224eed94790664b0612574bef9 (diff)
downloadmpd-ede70ee3a4c6897f843f118c065da81737e2b74e.tar.gz
mpd-ede70ee3a4c6897f843f118c065da81737e2b74e.tar.xz
mpd-ede70ee3a4c6897f843f118c065da81737e2b74e.zip
update_walk: move code to update_song.c
-rw-r--r--Makefile.am1
-rw-r--r--src/update_song.c114
-rw-r--r--src/update_song.h35
-rw-r--r--src/update_walk.c86
4 files changed, 152 insertions, 84 deletions
diff --git a/Makefile.am b/Makefile.am
index b43937d49..4429a786b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -269,6 +269,7 @@ src_mpd_SOURCES = \
src/update_io.c src/update_io.h \
src/update_db.c src/update_db.h \
src/update_walk.c src/update_walk.h \
+ src/update_song.c src/update_song.h \
src/update_container.c src/update_container.h \
src/update_internal.h \
src/update_remove.c \
diff --git a/src/update_song.c b/src/update_song.c
new file mode 100644
index 000000000..5f06985a1
--- /dev/null
+++ b/src/update_song.c
@@ -0,0 +1,114 @@
+/*
+ * 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_song.h"
+#include "update_internal.h"
+#include "update_io.h"
+#include "update_db.h"
+#include "update_container.h"
+#include "db_lock.h"
+#include "directory.h"
+#include "song.h"
+#include "glib_compat.h"
+#include "decoder_list.h"
+#include "decoder_plugin.h"
+
+#include <glib.h>
+
+#include <unistd.h>
+
+static void
+update_song_file2(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) &&
+ 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;
+ }
+
+ db_lock();
+ directory_add_song(directory, song);
+ db_unlock();
+
+ 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;
+ }
+}
+
+bool
+update_song_file(struct directory *directory,
+ const char *name, const char *suffix,
+ const struct stat *st)
+{
+ const struct decoder_plugin *plugin =
+ decoder_plugin_from_suffix(suffix, false);
+ if (plugin == NULL)
+ return false;
+
+ update_song_file2(directory, name, st, plugin);
+ return true;
+}
diff --git a/src/update_song.h b/src/update_song.h
new file mode 100644
index 000000000..cff63f576
--- /dev/null
+++ b/src/update_song.h
@@ -0,0 +1,35 @@
+/*
+ * 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_SONG_H
+#define MPD_UPDATE_SONG_H
+
+#include "check.h"
+
+#include <stdbool.h>
+#include <sys/stat.h>
+
+struct directory;
+
+bool
+update_song_file(struct directory *directory,
+ const char *name, const char *suffix,
+ const struct stat *st);
+
+#endif
diff --git a/src/update_walk.c b/src/update_walk.c
index 061a446f3..23c5d3e43 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -19,10 +19,9 @@
#include "config.h" /* must be first for large file support */
#include "update_walk.h"
-#include "update_internal.h"
#include "update_io.h"
#include "update_db.h"
-#include "update_container.h"
+#include "update_song.h"
#include "update_archive.h"
#include "database.h"
#include "db_lock.h"
@@ -33,8 +32,6 @@
#include "uri.h"
#include "mapper.h"
#include "path.h"
-#include "decoder_list.h"
-#include "decoder_plugin.h"
#include "playlist_list.h"
#include "glib_compat.h"
#include "conf.h"
@@ -207,85 +204,6 @@ find_inode_ancestor(struct directory *parent, ino_t inode, dev_t device)
return 0;
}
-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) &&
- 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;
- }
-
- db_lock();
- directory_add_song(directory, song);
- db_unlock();
-
- 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 bool
-update_song_file2(struct directory *directory,
- const char *name, const char *suffix,
- const struct stat *st)
-{
- const struct decoder_plugin *plugin =
- decoder_plugin_from_suffix(suffix, false);
- if (plugin == NULL)
- return false;
-
- update_song_file(directory, name, st, plugin);
- return true;
-}
-
static bool
update_playlist_file2(struct directory *directory,
const char *name, const char *suffix,
@@ -310,7 +228,7 @@ update_regular_file(struct directory *directory,
if (suffix == NULL)
return false;
- return update_song_file2(directory, name, suffix, st) ||
+ return update_song_file(directory, name, suffix, st) ||
update_archive_file(directory, name, suffix, st) ||
update_playlist_file2(directory, name, suffix, st);
}