2008-10-08 10:48:48 +02:00
|
|
|
/* the Music Player Daemon (MPD)
|
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
|
|
|
* Copyright (C) 2008 Max Kellermann <max@duempel.org>
|
|
|
|
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "update.h"
|
2008-10-08 11:07:35 +02:00
|
|
|
#include "database.h"
|
2008-10-08 10:49:05 +02:00
|
|
|
#include "directory.h"
|
2008-10-08 10:49:11 +02:00
|
|
|
#include "song.h"
|
2008-10-08 10:48:48 +02:00
|
|
|
#include "log.h"
|
|
|
|
#include "ls.h"
|
|
|
|
#include "path.h"
|
|
|
|
#include "playlist.h"
|
|
|
|
#include "utils.h"
|
|
|
|
#include "main_notify.h"
|
|
|
|
#include "condition.h"
|
|
|
|
#include "update.h"
|
|
|
|
|
2008-10-09 19:11:54 +02:00
|
|
|
enum update_return {
|
|
|
|
UPDATE_RETURN_ERROR = -1,
|
|
|
|
UPDATE_RETURN_NOUPDATE = 0,
|
|
|
|
UPDATE_RETURN_UPDATED = 1
|
|
|
|
};
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
enum update_progress {
|
|
|
|
UPDATE_PROGRESS_IDLE = 0,
|
|
|
|
UPDATE_PROGRESS_RUNNING = 1,
|
|
|
|
UPDATE_PROGRESS_DONE = 2
|
|
|
|
} progress;
|
|
|
|
|
|
|
|
/* make this dynamic?, or maybe this is big enough... */
|
|
|
|
static char *update_paths[32];
|
|
|
|
static size_t update_paths_nr;
|
|
|
|
|
|
|
|
static pthread_t update_thr;
|
|
|
|
|
|
|
|
static const int update_task_id_max = 1 << 15;
|
|
|
|
|
|
|
|
static int update_task_id;
|
|
|
|
|
2008-10-08 10:49:11 +02:00
|
|
|
static struct song *delete;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
|
|
|
static struct condition delete_cond;
|
|
|
|
|
|
|
|
int isUpdatingDB(void)
|
|
|
|
{
|
|
|
|
return (progress != UPDATE_PROGRESS_IDLE) ? update_task_id : 0;
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:49:05 +02:00
|
|
|
static void
|
|
|
|
directory_set_stat(struct directory *dir, const struct stat *st)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
dir->inode = st->st_ino;
|
|
|
|
dir->device = st->st_dev;
|
|
|
|
dir->stat = 1;
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:49:05 +02:00
|
|
|
static void
|
2008-10-08 10:49:11 +02:00
|
|
|
delete_song(struct directory *dir, struct song *del)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
/* first, prevent traversers in main task from getting this */
|
|
|
|
songvec_delete(&dir->songs, del);
|
|
|
|
|
|
|
|
/* now take it out of the playlist (in the main_task) */
|
|
|
|
cond_enter(&delete_cond);
|
|
|
|
assert(!delete);
|
|
|
|
delete = del;
|
|
|
|
wakeup_main_task();
|
|
|
|
do { cond_wait(&delete_cond); } while (delete);
|
|
|
|
cond_leave(&delete_cond);
|
|
|
|
|
|
|
|
/* finally, all possible references gone, free it */
|
2008-10-08 11:05:34 +02:00
|
|
|
song_free(del);
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
2008-10-09 15:41:02 +02:00
|
|
|
static int
|
|
|
|
delete_each_song(struct song *song, mpd_unused void *data)
|
|
|
|
{
|
|
|
|
struct directory *directory = data;
|
|
|
|
assert(song->parent == directory);
|
|
|
|
delete_song(directory, song);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Recursively remove all sub directories and songs from a directory,
|
|
|
|
* leaving an empty directory.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
clear_directory(struct directory *directory)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = directory->children.nr; --i >= 0;)
|
|
|
|
clear_directory(directory->children.base[i]);
|
|
|
|
dirvec_clear(&directory->children);
|
|
|
|
|
|
|
|
songvec_for_each(&directory->songs, delete_each_song, directory);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Recursively free a directory and all its contents.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
delete_directory(struct directory *directory)
|
|
|
|
{
|
|
|
|
assert(directory->parent != NULL);
|
|
|
|
|
|
|
|
clear_directory(directory);
|
|
|
|
|
|
|
|
dirvec_delete(&directory->parent->children, directory);
|
|
|
|
directory_free(directory);
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
struct delete_data {
|
|
|
|
char *tmp;
|
2008-10-08 10:49:05 +02:00
|
|
|
struct directory *dir;
|
2008-10-08 10:48:48 +02:00
|
|
|
enum update_return ret;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* passed to songvec_for_each */
|
2008-10-08 10:49:11 +02:00
|
|
|
static int
|
|
|
|
delete_song_if_removed(struct song *song, void *_data)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
struct delete_data *data = _data;
|
|
|
|
|
2008-10-08 11:05:34 +02:00
|
|
|
data->tmp = song_get_url(song, data->tmp);
|
2008-10-08 10:48:48 +02:00
|
|
|
assert(data->tmp);
|
|
|
|
|
|
|
|
if (!isFile(data->tmp, NULL)) {
|
|
|
|
delete_song(data->dir, song);
|
|
|
|
data->ret = UPDATE_RETURN_UPDATED;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-09 19:13:02 +02:00
|
|
|
static enum update_return
|
|
|
|
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);
|
|
|
|
|
|
|
|
if (song != NULL)
|
|
|
|
delete_song(song->parent, song);
|
|
|
|
|
|
|
|
return directory == NULL && song == NULL
|
|
|
|
? UPDATE_RETURN_NOUPDATE
|
|
|
|
: UPDATE_RETURN_UPDATED;
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
static enum update_return
|
2008-10-08 10:49:05 +02:00
|
|
|
removeDeletedFromDirectory(char *path_max_tmp, struct directory *directory)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
enum update_return ret = UPDATE_RETURN_NOUPDATE;
|
|
|
|
int i;
|
|
|
|
struct dirvec *dv = &directory->children;
|
|
|
|
struct delete_data data;
|
|
|
|
|
|
|
|
for (i = dv->nr; --i >= 0; ) {
|
|
|
|
if (isDir(dv->base[i]->path))
|
|
|
|
continue;
|
|
|
|
LOG("removing directory: %s\n", dv->base[i]->path);
|
|
|
|
dirvec_delete(dv, dv->base[i]);
|
|
|
|
ret = UPDATE_RETURN_UPDATED;
|
|
|
|
}
|
|
|
|
|
|
|
|
data.dir = directory;
|
|
|
|
data.tmp = path_max_tmp;
|
|
|
|
data.ret = ret;
|
|
|
|
songvec_for_each(&directory->songs, delete_song_if_removed, &data);
|
|
|
|
|
|
|
|
return data.ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *opendir_path(char *path_max_tmp, const char *dirname)
|
|
|
|
{
|
|
|
|
if (*dirname != '\0')
|
|
|
|
return rmp2amp_r(path_max_tmp,
|
|
|
|
utf8_to_fs_charset(path_max_tmp, dirname));
|
|
|
|
return musicDir;
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:49:05 +02:00
|
|
|
static int
|
|
|
|
statDirectory(struct directory *dir)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
2008-10-08 11:07:58 +02:00
|
|
|
if (myStat(directory_get_path(dir), &st) < 0)
|
2008-10-08 10:48:48 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
directory_set_stat(dir, &st);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-08 10:49:05 +02:00
|
|
|
static int
|
|
|
|
inodeFoundInParent(struct directory *parent, ino_t inode, dev_t device)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
while (parent) {
|
|
|
|
if (!parent->stat && statDirectory(parent) < 0)
|
|
|
|
return -1;
|
|
|
|
if (parent->inode == inode && parent->device == device) {
|
|
|
|
DEBUG("recursive directory found\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
parent = parent->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-09 19:11:54 +02:00
|
|
|
static enum update_return
|
2008-10-09 19:13:03 +02:00
|
|
|
updateDirectory(struct directory *directory, const struct stat *st);
|
2008-10-09 19:11:54 +02:00
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
static enum update_return
|
2008-10-09 19:13:03 +02:00
|
|
|
updateInDirectory(struct directory *directory,
|
|
|
|
const char *name, const struct stat *st)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
2008-10-09 19:13:03 +02:00
|
|
|
if (S_ISREG(st->st_mode) && hasMusicSuffix(name, 0)) {
|
2008-10-08 10:48:48 +02:00
|
|
|
const char *shortname = mpd_basename(name);
|
2008-10-09 19:16:21 +02:00
|
|
|
struct song *song = songvec_find(&directory->songs, shortname);
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 19:16:21 +02:00
|
|
|
if (song == NULL) {
|
2008-10-09 15:37:21 +02:00
|
|
|
song = song_file_load(shortname, directory);
|
|
|
|
if (song == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
songvec_add(&directory->songs, song);
|
|
|
|
LOG("added %s\n", name);
|
2008-10-08 10:48:48 +02:00
|
|
|
return UPDATE_RETURN_UPDATED;
|
2008-10-09 19:13:03 +02:00
|
|
|
} else if (st->st_mtime != song->mtime) {
|
2008-10-08 10:48:48 +02:00
|
|
|
LOG("updating %s\n", name);
|
2008-10-08 11:06:26 +02:00
|
|
|
if (!song_file_update(song))
|
2008-10-08 10:48:48 +02:00
|
|
|
delete_song(directory, song);
|
|
|
|
return UPDATE_RETURN_UPDATED;
|
|
|
|
}
|
2008-10-09 19:13:03 +02:00
|
|
|
} else if (S_ISDIR(st->st_mode)) {
|
2008-10-09 19:15:56 +02:00
|
|
|
struct directory *subdir;
|
2008-10-09 19:17:25 +02:00
|
|
|
enum update_return ret;
|
2008-10-09 19:15:56 +02:00
|
|
|
|
|
|
|
if (inodeFoundInParent(directory, st->st_ino, st->st_dev))
|
|
|
|
return UPDATE_RETURN_ERROR;
|
|
|
|
|
|
|
|
subdir = directory_get_child(directory, name);
|
2008-10-09 19:17:25 +02:00
|
|
|
if (subdir == NULL)
|
|
|
|
subdir = directory_new_child(directory, name);
|
2008-10-09 15:47:59 +02:00
|
|
|
|
2008-10-09 19:17:25 +02:00
|
|
|
assert(directory == subdir->parent);
|
2008-10-09 15:47:59 +02:00
|
|
|
|
2008-10-09 19:17:25 +02:00
|
|
|
ret = updateDirectory(subdir, st);
|
|
|
|
if (ret == UPDATE_RETURN_ERROR || directory_is_empty(subdir))
|
|
|
|
delete_directory(subdir);
|
2008-10-09 15:47:59 +02:00
|
|
|
|
2008-10-09 19:17:25 +02:00
|
|
|
return ret;
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
2008-10-09 15:37:21 +02:00
|
|
|
DEBUG("update: %s is not a directory or music\n", name);
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
return UPDATE_RETURN_NOUPDATE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we don't look at hidden files nor files with newlines in them */
|
|
|
|
static int skip_path(const char *path)
|
|
|
|
{
|
|
|
|
return (path[0] == '.' || strchr(path, '\n')) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
2008-10-09 19:11:54 +02:00
|
|
|
static enum update_return
|
2008-10-09 19:13:03 +02:00
|
|
|
updateDirectory(struct directory *directory, const struct stat *st)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
|
|
|
DIR *dir;
|
2008-10-08 11:07:58 +02:00
|
|
|
const char *dirname = directory_get_path(directory);
|
2008-10-08 10:48:48 +02:00
|
|
|
struct dirent *ent;
|
|
|
|
char path_max_tmp[MPD_PATH_MAX];
|
2008-10-09 19:13:03 +02:00
|
|
|
enum update_return ret = UPDATE_RETURN_NOUPDATE, ret2;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 19:13:03 +02:00
|
|
|
assert(S_ISDIR(st->st_mode));
|
|
|
|
|
|
|
|
directory_set_stat(directory, st);
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
dir = opendir(opendir_path(path_max_tmp, dirname));
|
|
|
|
if (!dir)
|
|
|
|
return UPDATE_RETURN_ERROR;
|
|
|
|
|
2008-10-09 19:17:26 +02:00
|
|
|
if (removeDeletedFromDirectory(path_max_tmp, directory) > 0)
|
2008-10-08 10:48:48 +02:00
|
|
|
ret = UPDATE_RETURN_UPDATED;
|
|
|
|
|
|
|
|
while ((ent = readdir(dir))) {
|
|
|
|
char *utf8;
|
2008-10-09 19:13:03 +02:00
|
|
|
struct stat st2;
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
if (skip_path(ent->d_name))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
utf8 = fs_charset_to_utf8(path_max_tmp, ent->d_name);
|
|
|
|
if (!utf8)
|
|
|
|
continue;
|
|
|
|
|
2008-10-08 11:55:52 +02:00
|
|
|
if (!isRootDirectory(directory->path))
|
2008-10-08 10:48:48 +02:00
|
|
|
utf8 = pfx_dir(path_max_tmp, utf8, strlen(utf8),
|
|
|
|
dirname, strlen(dirname));
|
2008-10-09 19:13:03 +02:00
|
|
|
|
|
|
|
if (myStat(path_max_tmp, &st2) == 0)
|
|
|
|
ret2 = updateInDirectory(directory, path_max_tmp,
|
|
|
|
&st2);
|
|
|
|
else
|
|
|
|
ret2 = delete_path(path_max_tmp);
|
|
|
|
if (ret == UPDATE_RETURN_NOUPDATE)
|
|
|
|
ret = ret2;
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
closedir(dir);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-10-09 15:47:22 +02:00
|
|
|
static struct directory *
|
|
|
|
directory_make_child_checked(struct directory *parent, const char *path)
|
|
|
|
{
|
|
|
|
struct directory *directory;
|
|
|
|
struct stat st;
|
|
|
|
struct song *conflicting;
|
|
|
|
|
|
|
|
directory = directory_get_child(parent, path);
|
|
|
|
if (directory != NULL)
|
|
|
|
return directory;
|
|
|
|
|
|
|
|
if (myStat(path, &st) < 0 ||
|
|
|
|
inodeFoundInParent(parent, st.st_ino, st.st_dev))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* if we're adding directory paths, make sure to delete filenames
|
|
|
|
with potentially the same name */
|
|
|
|
conflicting = songvec_find(&parent->songs, mpd_basename(path));
|
|
|
|
if (conflicting)
|
|
|
|
delete_song(parent, conflicting);
|
|
|
|
|
2008-10-09 19:14:04 +02:00
|
|
|
directory = directory_new_child(parent, path);
|
|
|
|
directory_set_stat(directory, &st);
|
|
|
|
return directory;
|
2008-10-09 15:47:22 +02:00
|
|
|
}
|
|
|
|
|
2008-10-08 10:49:05 +02:00
|
|
|
static struct directory *
|
2008-10-09 15:48:39 +02:00
|
|
|
addParentPathToDB(const char *utf8path)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
2008-10-09 15:48:07 +02:00
|
|
|
struct directory *directory = db_get_root();
|
|
|
|
char *duplicated = xstrdup(utf8path);
|
|
|
|
char *slash = duplicated;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 15:48:39 +02:00
|
|
|
while ((slash = strchr(slash, '/')) != NULL) {
|
|
|
|
*slash = 0;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 15:48:07 +02:00
|
|
|
directory = directory_make_child_checked(directory,
|
|
|
|
duplicated);
|
|
|
|
if (directory == NULL || slash == NULL)
|
|
|
|
break;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 15:48:07 +02:00
|
|
|
*slash++ = '/';
|
|
|
|
}
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 15:48:07 +02:00
|
|
|
free(duplicated);
|
|
|
|
return directory;
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
2008-10-09 16:22:56 +02:00
|
|
|
static enum update_return updatePath(const char *path)
|
2008-10-08 10:48:48 +02:00
|
|
|
{
|
2008-10-09 19:13:02 +02:00
|
|
|
struct stat st;
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 19:13:02 +02:00
|
|
|
if (myStat(path, &st) < 0)
|
|
|
|
return delete_path(path);
|
2008-10-08 10:48:48 +02:00
|
|
|
|
2008-10-09 19:13:03 +02:00
|
|
|
return updateInDirectory(addParentPathToDB(path), path, &st);
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void * update_task(void *_path)
|
|
|
|
{
|
|
|
|
enum update_return ret = UPDATE_RETURN_NOUPDATE;
|
|
|
|
|
2008-10-09 19:11:49 +02:00
|
|
|
if (_path != NULL && !isRootDirectory(_path)) {
|
2008-10-08 10:48:48 +02:00
|
|
|
ret = updatePath((char *)_path);
|
|
|
|
free(_path);
|
|
|
|
} else {
|
2008-10-09 19:13:03 +02:00
|
|
|
struct directory *directory = db_get_root();
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (myStat(directory_get_path(directory), &st) == 0)
|
|
|
|
ret = updateDirectory(directory, &st);
|
|
|
|
else
|
|
|
|
ret = UPDATE_RETURN_ERROR;
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
|
2008-10-08 11:07:55 +02:00
|
|
|
if (ret == UPDATE_RETURN_UPDATED && db_save() < 0)
|
2008-10-08 10:48:48 +02:00
|
|
|
ret = UPDATE_RETURN_ERROR;
|
|
|
|
progress = UPDATE_PROGRESS_DONE;
|
|
|
|
wakeup_main_task();
|
|
|
|
return (void *)ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void spawn_update_task(char *path)
|
|
|
|
{
|
|
|
|
pthread_attr_t attr;
|
|
|
|
|
|
|
|
assert(pthread_equal(pthread_self(), main_task));
|
|
|
|
|
|
|
|
progress = UPDATE_PROGRESS_RUNNING;
|
|
|
|
pthread_attr_init(&attr);
|
|
|
|
if (pthread_create(&update_thr, &attr, update_task, path))
|
|
|
|
FATAL("Failed to spawn update task: %s\n", strerror(errno));
|
|
|
|
if (++update_task_id > update_task_id_max)
|
|
|
|
update_task_id = 1;
|
|
|
|
DEBUG("spawned thread for update job id %i\n", update_task_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
int directory_update_init(char *path)
|
|
|
|
{
|
|
|
|
assert(pthread_equal(pthread_self(), main_task));
|
|
|
|
|
|
|
|
if (progress != UPDATE_PROGRESS_IDLE) {
|
|
|
|
int next_task_id;
|
|
|
|
|
|
|
|
if (!path)
|
|
|
|
return -1;
|
|
|
|
if (update_paths_nr == ARRAY_SIZE(update_paths))
|
|
|
|
return -1;
|
|
|
|
assert(update_paths_nr < ARRAY_SIZE(update_paths));
|
|
|
|
update_paths[update_paths_nr++] = path;
|
|
|
|
next_task_id = update_task_id + update_paths_nr;
|
|
|
|
|
|
|
|
return next_task_id > update_task_id_max ? 1 : next_task_id;
|
|
|
|
}
|
|
|
|
spawn_update_task(path);
|
|
|
|
return update_task_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
void reap_update_task(void)
|
|
|
|
{
|
2008-10-09 19:17:33 +02:00
|
|
|
void *thread_return;
|
2008-10-08 10:48:48 +02:00
|
|
|
enum update_return ret;
|
|
|
|
|
|
|
|
assert(pthread_equal(pthread_self(), main_task));
|
|
|
|
|
2008-10-09 19:17:38 +02:00
|
|
|
if (progress == UPDATE_PROGRESS_IDLE)
|
|
|
|
return;
|
|
|
|
|
2008-10-08 10:48:48 +02:00
|
|
|
cond_enter(&delete_cond);
|
|
|
|
if (delete) {
|
|
|
|
char tmp[MPD_PATH_MAX];
|
2008-10-08 11:05:34 +02:00
|
|
|
LOG("removing: %s\n", song_get_url(delete, tmp));
|
2008-10-08 10:48:48 +02:00
|
|
|
deleteASongFromPlaylist(delete);
|
|
|
|
delete = NULL;
|
2008-10-08 11:36:38 +02:00
|
|
|
cond_signal_sync(&delete_cond);
|
2008-10-08 10:48:48 +02:00
|
|
|
}
|
|
|
|
cond_leave(&delete_cond);
|
|
|
|
|
|
|
|
if (progress != UPDATE_PROGRESS_DONE)
|
|
|
|
return;
|
2008-10-09 19:17:33 +02:00
|
|
|
if (pthread_join(update_thr, &thread_return))
|
2008-10-08 10:48:48 +02:00
|
|
|
FATAL("error joining update thread: %s\n", strerror(errno));
|
2008-10-09 19:17:33 +02:00
|
|
|
ret = (enum update_return)(size_t)thread_return;
|
2008-10-08 10:48:48 +02:00
|
|
|
if (ret == UPDATE_RETURN_UPDATED)
|
|
|
|
playlistVersionChange();
|
|
|
|
|
|
|
|
if (update_paths_nr) {
|
|
|
|
char *path = update_paths[0];
|
|
|
|
memmove(&update_paths[0], &update_paths[1],
|
|
|
|
--update_paths_nr * sizeof(char *));
|
|
|
|
spawn_update_task(path);
|
|
|
|
} else {
|
|
|
|
progress = UPDATE_PROGRESS_IDLE;
|
|
|
|
}
|
|
|
|
}
|