Skip to content

M
mpd
Commit 94a5a5a9 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

update: always look up parent directory in updatePath()

By always creating the parent directory, we can use delete_name_in() without further lookups. The parents which may non exist will be pruned later. An update request for a non-existing or empty directory should be quite unusual, so this doesn't add any measurable overhead.
parent a5234373
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 20 deletions
src/update.c
View file @ 94a5a5a9
......@@ -162,23 +162,6 @@ delete_song_if_removed(struct song *song, void *_data)
}
static void
delete_path(const char *path)
{
struct directory *directory = db_get_directory(path);
struct song *song = db_get_song(path);
if (directory != NULL) {
delete_directory(directory);
modified = true;
}
if (song != NULL) {
delete_song(song->parent, song);
modified = true;
}
}
static void
removeDeletedFromDirectory(char *path_max_tmp, struct directory *directory)
{
int i;
......@@ -405,13 +388,20 @@ addParentPathToDB(const char *utf8path)
static void
updatePath(const char *path)
{
struct directory *parent;
const char *name;
struct stat st;
parent = addParentPathToDB(path);
if (parent == NULL)
return;
name = mpd_basename(path);
if (myStat(path, &st) == 0)
updateInDirectory(addParentPathToDB(path),
mpd_basename(path), &st);
updateInDirectory(parent, name, &st);
else
delete_path(path);
delete_name_in(parent, name);
}
static void * update_task(void *_path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment