2009-04-19 09:10:19 -04:00
|
|
|
/*
|
2010-01-05 13:34:00 -05:00
|
|
|
* Copyright (C) 2009-2010 Julien BLACHE <jb@jblache.org>
|
2009-04-19 09:10:19 -04:00
|
|
|
*
|
|
|
|
* Bits and pieces from mt-daapd:
|
|
|
|
* Copyright (C) 2003 Ron Pedde (ron@pedde.com)
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <string.h>
|
2009-06-07 14:49:13 -04:00
|
|
|
#include <time.h>
|
2009-04-19 09:10:19 -04:00
|
|
|
#include <errno.h>
|
2010-01-09 07:42:23 -05:00
|
|
|
#include <sys/param.h>
|
2009-04-19 09:10:19 -04:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <dirent.h>
|
|
|
|
#include <pthread.h>
|
|
|
|
|
2010-01-09 07:48:52 -05:00
|
|
|
#if defined(__linux__)
|
|
|
|
# include <sys/inotify.h>
|
2010-01-10 11:49:01 -05:00
|
|
|
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2010-01-09 07:48:52 -05:00
|
|
|
# include <sys/time.h>
|
|
|
|
# include <sys/event.h>
|
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
|
|
|
|
# define USE_EVENTFD
|
|
|
|
# include <sys/eventfd.h>
|
|
|
|
#endif
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
#include <event.h>
|
|
|
|
|
2009-05-08 11:46:32 -04:00
|
|
|
#include "logger.h"
|
2009-06-07 12:58:02 -04:00
|
|
|
#include "db.h"
|
2009-04-19 09:10:19 -04:00
|
|
|
#include "filescanner.h"
|
|
|
|
#include "conffile.h"
|
2010-01-09 07:44:10 -05:00
|
|
|
#include "misc.h"
|
2010-01-16 05:29:16 -05:00
|
|
|
#include "remote_pairing.h"
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
#define F_SCAN_BULK (1 << 0)
|
2009-06-11 13:11:03 -04:00
|
|
|
#define F_SCAN_RESCAN (1 << 1)
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
struct deferred_pl {
|
|
|
|
char *path;
|
|
|
|
struct deferred_pl *next;
|
|
|
|
};
|
|
|
|
|
2009-06-03 08:06:46 -04:00
|
|
|
struct stacked_dir {
|
|
|
|
char *path;
|
|
|
|
struct stacked_dir *next;
|
|
|
|
};
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
static int exit_efd;
|
|
|
|
#else
|
2009-04-19 09:10:19 -04:00
|
|
|
static int exit_pipe[2];
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
static int scan_exit;
|
|
|
|
static int inofd;
|
|
|
|
static struct event_base *evbase_scan;
|
|
|
|
static struct event inoev;
|
|
|
|
static struct event exitev;
|
|
|
|
static pthread_t tid_scan;
|
|
|
|
static struct deferred_pl *playlists;
|
2009-06-03 08:06:46 -04:00
|
|
|
static struct stacked_dir *dirstack;
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
|
2009-06-03 08:06:46 -04:00
|
|
|
static int
|
2010-01-12 12:45:31 -05:00
|
|
|
push_dir(struct stacked_dir **s, char *path)
|
2009-06-03 08:06:46 -04:00
|
|
|
{
|
|
|
|
struct stacked_dir *d;
|
|
|
|
|
|
|
|
d = (struct stacked_dir *)malloc(sizeof(struct stacked_dir));
|
|
|
|
if (!d)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not stack directory %s; out of memory\n", path);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
d->path = strdup(path);
|
|
|
|
if (!d->path)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not stack directory %s; out of memory for path\n", path);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-01-12 12:45:31 -05:00
|
|
|
d->next = *s;
|
|
|
|
*s = d;
|
2009-06-03 08:06:46 -04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
2010-01-12 12:45:31 -05:00
|
|
|
pop_dir(struct stacked_dir **s)
|
2009-06-03 08:06:46 -04:00
|
|
|
{
|
|
|
|
struct stacked_dir *d;
|
|
|
|
char *ret;
|
|
|
|
|
2010-01-12 12:45:31 -05:00
|
|
|
if (!*s)
|
2009-06-03 08:06:46 -04:00
|
|
|
return NULL;
|
|
|
|
|
2010-01-12 12:45:31 -05:00
|
|
|
d = *s;
|
|
|
|
*s = d->next;
|
2009-06-03 08:06:46 -04:00
|
|
|
ret = d->path;
|
|
|
|
|
|
|
|
free(d);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
static void
|
|
|
|
fixup_tags(struct media_file_info *mfi)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char *tag;
|
|
|
|
char *sep = " - ";
|
|
|
|
|
|
|
|
if (mfi->genre && (strlen(mfi->genre) == 0))
|
|
|
|
{
|
|
|
|
free(mfi->genre);
|
|
|
|
mfi->genre = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mfi->artist && (strlen(mfi->artist) == 0))
|
|
|
|
{
|
|
|
|
free(mfi->artist);
|
|
|
|
mfi->artist = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mfi->title && (strlen(mfi->title) == 0))
|
|
|
|
{
|
|
|
|
free(mfi->title);
|
|
|
|
mfi->title = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mfi->artist)
|
|
|
|
{
|
|
|
|
if (mfi->orchestra && mfi->conductor)
|
|
|
|
{
|
|
|
|
len = strlen(mfi->orchestra) + strlen(sep) + strlen(mfi ->conductor);
|
|
|
|
tag = (char *)malloc(len + 1);
|
|
|
|
if (tag)
|
|
|
|
{
|
|
|
|
sprintf(tag,"%s%s%s", mfi->orchestra, sep, mfi->conductor);
|
|
|
|
mfi->artist = tag;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (mfi->orchestra)
|
|
|
|
{
|
|
|
|
mfi->artist = strdup(mfi->orchestra);
|
|
|
|
}
|
|
|
|
else if (mfi->conductor)
|
|
|
|
{
|
|
|
|
mfi->artist = strdup(mfi->conductor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-20 07:48:14 -04:00
|
|
|
/* Handle TV shows, try to present prettier metadata */
|
|
|
|
if (mfi->tv_series_name && strlen(mfi->tv_series_name) != 0)
|
|
|
|
{
|
|
|
|
mfi->media_kind = 64; /* tv show */
|
|
|
|
|
|
|
|
/* Default to artist = series_name */
|
|
|
|
if (mfi->artist && strlen(mfi->artist) == 0)
|
|
|
|
{
|
|
|
|
free(mfi->artist);
|
|
|
|
mfi->artist = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mfi->artist)
|
|
|
|
mfi->artist = strdup(mfi->tv_series_name);
|
|
|
|
|
|
|
|
/* Default to album = "<series_name>, Season <season_num>" */
|
|
|
|
if (mfi->album && strlen(mfi->album) == 0)
|
|
|
|
{
|
|
|
|
free(mfi->album);
|
|
|
|
mfi->album = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mfi->album)
|
|
|
|
{
|
|
|
|
len = snprintf(NULL, 0, "%s, Season %d", mfi->tv_series_name, mfi->tv_season_num);
|
|
|
|
|
|
|
|
mfi->album = (char *)malloc(len + 1);
|
|
|
|
if (mfi->album)
|
|
|
|
sprintf(mfi->album, "%s, Season %d", mfi->tv_series_name, mfi->tv_season_num);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
/* Check the 4 top-tags are filled */
|
|
|
|
if (!mfi->artist)
|
|
|
|
mfi->artist = strdup("Unknown artist");
|
|
|
|
if (!mfi->album)
|
|
|
|
mfi->album = strdup("Unknown album");
|
|
|
|
if (!mfi->genre)
|
|
|
|
mfi->genre = strdup("Unknown genre");
|
|
|
|
if (!mfi->title)
|
|
|
|
mfi->title = strdup(mfi->fname);
|
2010-01-04 11:56:20 -05:00
|
|
|
|
|
|
|
/* If we don't have an album_artist, set it to artist */
|
|
|
|
if (!mfi->album_artist)
|
2010-08-30 06:49:35 -04:00
|
|
|
{
|
|
|
|
if (mfi->compilation)
|
|
|
|
mfi->album_artist = strdup("");
|
|
|
|
else
|
|
|
|
mfi->album_artist = strdup(mfi->artist);
|
|
|
|
}
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
process_media_file(char *file, time_t mtime, off_t size, int compilation)
|
|
|
|
{
|
2009-06-11 14:44:22 -04:00
|
|
|
struct media_file_info mfi;
|
2009-04-19 09:10:19 -04:00
|
|
|
char *filename;
|
|
|
|
char *ext;
|
2009-06-11 14:44:22 -04:00
|
|
|
time_t stamp;
|
2009-04-19 09:10:19 -04:00
|
|
|
int ret;
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
stamp = db_file_stamp_bypath(file);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
if (stamp >= mtime)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-11 14:44:22 -04:00
|
|
|
db_file_ping(file);
|
2009-04-19 09:10:19 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
memset(&mfi, 0, sizeof(struct media_file_info));
|
2009-06-07 12:58:02 -04:00
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
if (stamp)
|
|
|
|
mfi.id = db_file_id_bypath(file);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
filename = strrchr(file, '/');
|
|
|
|
if (!filename)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not determine filename for %s\n", file);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
mfi.fname = strdup(filename + 1);
|
|
|
|
if (!mfi.fname)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Out of memory for fname\n");
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
mfi.path = strdup(file);
|
|
|
|
if (!mfi.path)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Out of memory for path\n");
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
free(mfi.fname);
|
2009-04-19 09:10:19 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
mfi.time_modified = mtime;
|
|
|
|
mfi.file_size = size;
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2009-04-20 11:34:39 -04:00
|
|
|
ret = -1;
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
/* Special cases */
|
|
|
|
ext = strrchr(file, '.');
|
|
|
|
if (ext)
|
|
|
|
{
|
|
|
|
if ((strcmp(ext, ".pls") == 0)
|
|
|
|
|| (strcmp(ext, ".url") == 0))
|
|
|
|
{
|
2011-03-18 16:19:51 -04:00
|
|
|
mfi.data_kind = 1; /* url/stream */
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
ret = scan_url_file(file, &mfi);
|
2011-03-18 16:19:51 -04:00
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
2011-02-06 11:36:35 -05:00
|
|
|
else if ((strcmp(ext, ".png") == 0)
|
|
|
|
|| (strcmp(ext, ".jpg") == 0))
|
|
|
|
{
|
|
|
|
/* Artwork - don't scan */
|
|
|
|
goto out;
|
|
|
|
}
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* General case */
|
2009-04-20 11:34:39 -04:00
|
|
|
if (ret < 0)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-11 14:44:22 -04:00
|
|
|
ret = scan_metadata_ffmpeg(file, &mfi);
|
|
|
|
mfi.data_kind = 0; /* real file */
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
2009-04-20 11:34:39 -04:00
|
|
|
if (ret < 0)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2010-03-22 03:57:19 -04:00
|
|
|
DPRINTF(E_INFO, L_SCAN, "Could not extract metadata for %s\n", file);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2011-02-06 11:36:35 -05:00
|
|
|
goto out;
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
mfi.compilation = compilation;
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-01-13 13:42:18 -05:00
|
|
|
if (!mfi.item_kind)
|
|
|
|
mfi.item_kind = 2; /* music */
|
|
|
|
if (!mfi.media_kind)
|
|
|
|
mfi.media_kind = 1; /* music */
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
fixup_tags(&mfi);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-06-21 11:50:09 -04:00
|
|
|
unicode_fixup_mfi(&mfi);
|
|
|
|
|
2009-06-11 14:44:22 -04:00
|
|
|
if (mfi.id == 0)
|
|
|
|
db_file_add(&mfi);
|
2009-06-07 12:58:02 -04:00
|
|
|
else
|
2009-06-11 14:44:22 -04:00
|
|
|
db_file_update(&mfi);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2011-02-06 11:36:35 -05:00
|
|
|
out:
|
2009-06-11 14:44:22 -04:00
|
|
|
free_mfi(&mfi, 1);
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
process_playlist(char *file)
|
|
|
|
{
|
|
|
|
char *ext;
|
|
|
|
|
|
|
|
ext = strrchr(file, '.');
|
|
|
|
if (ext)
|
|
|
|
{
|
|
|
|
if (strcmp(ext, ".m3u") == 0)
|
2009-11-22 05:17:33 -05:00
|
|
|
scan_m3u_playlist(file);
|
|
|
|
#ifdef ITUNES
|
|
|
|
else if (strcmp(ext, ".xml") == 0)
|
|
|
|
scan_itunes_itml(file);
|
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
|
|
|
defer_playlist(char *path)
|
|
|
|
{
|
|
|
|
struct deferred_pl *pl;
|
|
|
|
|
|
|
|
pl = (struct deferred_pl *)malloc(sizeof(struct deferred_pl));
|
|
|
|
if (!pl)
|
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Out of memory for deferred playlist\n");
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(pl, 0, sizeof(struct deferred_pl));
|
|
|
|
|
|
|
|
pl->path = strdup(path);
|
|
|
|
if (!pl->path)
|
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Out of memory for deferred playlist\n");
|
|
|
|
|
|
|
|
free(pl);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pl->next = playlists;
|
|
|
|
playlists = pl;
|
|
|
|
|
2009-05-08 11:52:56 -04:00
|
|
|
DPRINTF(E_INFO, L_SCAN, "Deferred playlist %s\n", path);
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
2009-06-09 06:12:00 -04:00
|
|
|
/* Thread: scan (bulk only) */
|
2009-04-19 09:10:19 -04:00
|
|
|
static void
|
|
|
|
process_deferred_playlists(void)
|
|
|
|
{
|
|
|
|
struct deferred_pl *pl;
|
|
|
|
|
|
|
|
while ((pl = playlists))
|
|
|
|
{
|
|
|
|
playlists = pl->next;
|
|
|
|
|
|
|
|
process_playlist(pl->path);
|
|
|
|
|
|
|
|
free(pl->path);
|
|
|
|
free(pl);
|
2009-06-09 06:12:00 -04:00
|
|
|
|
|
|
|
/* Run the event loop */
|
|
|
|
event_base_loop(evbase_scan, EVLOOP_ONCE | EVLOOP_NONBLOCK);
|
|
|
|
|
|
|
|
if (scan_exit)
|
|
|
|
return;
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
2009-06-10 12:11:29 -04:00
|
|
|
process_file(char *file, time_t mtime, off_t size, int compilation, int flags)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
char *ext;
|
|
|
|
|
|
|
|
ext = strrchr(file, '.');
|
|
|
|
if (ext)
|
|
|
|
{
|
2009-11-22 05:17:33 -05:00
|
|
|
if ((strcmp(ext, ".m3u") == 0)
|
|
|
|
#ifdef ITUNES
|
|
|
|
|| (strcmp(ext, ".xml") == 0)
|
|
|
|
#endif
|
|
|
|
)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
if (flags & F_SCAN_BULK)
|
2009-04-19 09:10:19 -04:00
|
|
|
defer_playlist(file);
|
|
|
|
else
|
|
|
|
process_playlist(file);
|
|
|
|
|
2010-01-16 05:29:16 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (strcmp(ext, ".remote") == 0)
|
|
|
|
{
|
|
|
|
remote_pairing_read_pin(file);
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Not any kind of special file, so let's see if it's a media file */
|
|
|
|
process_media_file(file, mtime, size, compilation);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static int
|
2010-03-19 14:06:47 -04:00
|
|
|
check_compilation(char *path)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
cfg_t *lib;
|
2009-04-19 09:10:19 -04:00
|
|
|
int ndirs;
|
|
|
|
int i;
|
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
lib = cfg_getsec(cfg, "library");
|
2009-04-19 09:10:19 -04:00
|
|
|
ndirs = cfg_size(lib, "compilations");
|
|
|
|
|
|
|
|
for (i = 0; i < ndirs; i++)
|
|
|
|
{
|
|
|
|
if (strstr(path, cfg_getnstr(lib, "compilations", i)))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directory(char *path, int flags)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-09 06:12:00 -04:00
|
|
|
struct stacked_dir *bulkstack;
|
2009-06-10 12:11:29 -04:00
|
|
|
cfg_t *lib;
|
2009-04-19 09:10:19 -04:00
|
|
|
DIR *dirp;
|
|
|
|
struct dirent buf;
|
|
|
|
struct dirent *de;
|
|
|
|
char entry[PATH_MAX];
|
|
|
|
char *deref;
|
|
|
|
struct stat sb;
|
2009-06-10 12:11:29 -04:00
|
|
|
struct watch_info wi;
|
2010-01-12 12:45:44 -05:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
|
|
struct kevent kev;
|
2010-01-09 07:48:52 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
int compilation;
|
|
|
|
int ret;
|
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
lib = cfg_getsec(cfg, "library");
|
2009-06-10 12:11:29 -04:00
|
|
|
|
|
|
|
if (flags & F_SCAN_BULK)
|
2009-06-09 06:12:00 -04:00
|
|
|
{
|
|
|
|
/* Save our directory stack so it won't get handled inside
|
|
|
|
* the event loop - not its business, we're in bulk mode here.
|
|
|
|
*/
|
|
|
|
bulkstack = dirstack;
|
|
|
|
dirstack = NULL;
|
|
|
|
|
|
|
|
/* Run the event loop */
|
|
|
|
event_base_loop(evbase_scan, EVLOOP_ONCE | EVLOOP_NONBLOCK);
|
|
|
|
|
|
|
|
/* Restore our directory stack */
|
|
|
|
dirstack = bulkstack;
|
|
|
|
|
|
|
|
if (scan_exit)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_DBG, L_SCAN, "Processing directory %s (flags = 0x%x)\n", path, flags);
|
2009-06-03 08:06:46 -04:00
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
dirp = opendir(path);
|
|
|
|
if (!dirp)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not open directory %s: %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for a compilation directory */
|
2010-03-19 14:06:47 -04:00
|
|
|
compilation = check_compilation(path);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
ret = readdir_r(dirp, &buf, &de);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "readdir_r error in %s: %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (de == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (buf.d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ret = snprintf(entry, sizeof(entry), "%s/%s", path, buf.d_name);
|
|
|
|
if ((ret < 0) || (ret >= sizeof(entry)))
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s/%s, PATH_MAX exceeded\n", path, buf.d_name);
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = lstat(entry, &sb);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s, lstat() failed: %s\n", entry, strerror(errno));
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISLNK(sb.st_mode))
|
|
|
|
{
|
2010-01-09 07:44:10 -05:00
|
|
|
deref = m_realpath(entry);
|
2009-04-19 09:10:19 -04:00
|
|
|
if (!deref)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s, could not dereference symlink: %s\n", entry, strerror(errno));
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = stat(deref, &sb);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s, stat() failed: %s\n", deref, strerror(errno));
|
|
|
|
|
|
|
|
free(deref);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = snprintf(entry, sizeof(entry), "%s", deref);
|
|
|
|
free(deref);
|
|
|
|
if ((ret < 0) || (ret >= sizeof(entry)))
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s, PATH_MAX exceeded\n", deref);
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISREG(sb.st_mode))
|
2009-06-10 12:11:29 -04:00
|
|
|
process_file(entry, sb.st_mtime, sb.st_size, compilation, flags);
|
2009-04-19 09:10:19 -04:00
|
|
|
else if (S_ISDIR(sb.st_mode))
|
2010-01-12 12:45:31 -05:00
|
|
|
push_dir(&dirstack, entry);
|
2009-04-19 09:10:19 -04:00
|
|
|
else
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s, not a directory, symlink nor regular file\n", entry);
|
|
|
|
}
|
|
|
|
|
|
|
|
closedir(dirp);
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
memset(&wi, 0, sizeof(struct watch_info));
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
#if defined(__linux__)
|
2009-04-19 09:10:19 -04:00
|
|
|
/* Add inotify watch */
|
2009-06-11 10:45:09 -04:00
|
|
|
wi.wd = inotify_add_watch(inofd, path, IN_CREATE | IN_DELETE | IN_MODIFY | IN_CLOSE_WRITE | IN_MOVE | IN_DELETE | IN_MOVE_SELF);
|
2009-06-10 12:11:29 -04:00
|
|
|
if (wi.wd < 0)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Could not create inotify watch for %s: %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-11 13:11:03 -04:00
|
|
|
if (!(flags & F_SCAN_RESCAN))
|
2010-01-12 12:50:04 -05:00
|
|
|
{
|
|
|
|
wi.cookie = 0;
|
|
|
|
wi.path = path;
|
|
|
|
|
|
|
|
db_watch_add(&wi);
|
|
|
|
}
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-10 11:49:01 -05:00
|
|
|
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2010-01-12 12:45:44 -05:00
|
|
|
memset(&kev, 0, sizeof(struct kevent));
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
wi.wd = open(path, O_RDONLY | O_NONBLOCK);
|
|
|
|
if (wi.wd < 0)
|
2010-01-09 07:48:52 -05:00
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Could not open directory %s for watching: %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add kevent */
|
2010-01-12 12:45:44 -05:00
|
|
|
EV_SET(&kev, wi.wd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_DELETE | NOTE_WRITE | NOTE_RENAME, 0, NULL);
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
ret = kevent(inofd, &kev, 1, NULL, 0, NULL);
|
2010-01-09 07:48:52 -05:00
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_WARN, L_SCAN, "Could not add kevent for %s: %s\n", path, strerror(errno));
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
close(wi.wd);
|
2010-01-09 07:48:52 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
wi.cookie = 0;
|
|
|
|
wi.path = path;
|
|
|
|
|
|
|
|
db_watch_add(&wi);
|
2010-01-09 07:48:52 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
2009-06-03 08:06:46 -04:00
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directories(char *root, int flags)
|
2009-06-03 08:06:46 -04:00
|
|
|
{
|
|
|
|
char *path;
|
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directory(root, flags);
|
2009-06-03 08:06:46 -04:00
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
if (scan_exit)
|
2009-06-09 06:12:00 -04:00
|
|
|
return;
|
|
|
|
|
2010-01-12 12:45:31 -05:00
|
|
|
while ((path = pop_dir(&dirstack)))
|
2009-06-03 08:06:46 -04:00
|
|
|
{
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directory(path, flags);
|
2009-06-03 08:06:46 -04:00
|
|
|
|
|
|
|
free(path);
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
if (scan_exit)
|
2009-06-09 06:12:00 -04:00
|
|
|
return;
|
2009-06-03 08:06:46 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
|
|
|
bulk_scan(void)
|
|
|
|
{
|
|
|
|
cfg_t *lib;
|
|
|
|
int ndirs;
|
|
|
|
char *path;
|
2010-01-24 04:54:52 -05:00
|
|
|
char *deref;
|
2009-06-07 14:49:13 -04:00
|
|
|
time_t start;
|
2009-04-19 09:10:19 -04:00
|
|
|
int i;
|
|
|
|
|
2009-06-07 14:49:13 -04:00
|
|
|
start = time(NULL);
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
playlists = NULL;
|
2009-06-03 08:06:46 -04:00
|
|
|
dirstack = NULL;
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
lib = cfg_getsec(cfg, "library");
|
|
|
|
|
|
|
|
ndirs = cfg_size(lib, "directories");
|
|
|
|
for (i = 0; i < ndirs; i++)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2010-03-19 14:06:47 -04:00
|
|
|
path = cfg_getnstr(lib, "directories", i);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
deref = m_realpath(path);
|
|
|
|
if (!deref)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2010-03-19 14:06:47 -04:00
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping library directory %s, could not dereference: %s\n", path, strerror(errno));
|
2010-01-24 04:54:52 -05:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
continue;
|
|
|
|
}
|
2010-01-24 04:54:52 -05:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directories(deref, F_SCAN_BULK);
|
2010-01-24 04:54:52 -05:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
free(deref);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
if (scan_exit)
|
|
|
|
return;
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (playlists)
|
|
|
|
process_deferred_playlists();
|
2009-06-03 08:06:46 -04:00
|
|
|
|
2009-06-09 06:12:00 -04:00
|
|
|
if (scan_exit)
|
|
|
|
return;
|
|
|
|
|
2009-06-03 08:06:46 -04:00
|
|
|
if (dirstack)
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n");
|
2009-06-07 14:49:13 -04:00
|
|
|
|
|
|
|
DPRINTF(E_DBG, L_SCAN, "Purging old database content\n");
|
|
|
|
db_purge_cruft(start);
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void *
|
|
|
|
filescanner(void *arg)
|
|
|
|
{
|
2009-06-07 12:58:02 -04:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = db_perthread_init();
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Error: DB init failed\n");
|
|
|
|
|
|
|
|
pthread_exit(NULL);
|
|
|
|
}
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
ret = db_watch_clear();
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Error: could not clear old watches from DB\n");
|
|
|
|
|
|
|
|
pthread_exit(NULL);
|
|
|
|
}
|
|
|
|
|
2010-03-06 12:56:30 -05:00
|
|
|
ret = db_groups_clear();
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Error: could not clear old groups from DB\n");
|
|
|
|
|
|
|
|
pthread_exit(NULL);
|
|
|
|
}
|
|
|
|
|
2010-03-06 11:39:35 -05:00
|
|
|
/* Recompute all songalbumids, in case the SQLite DB got transferred
|
|
|
|
* to a different host; the hash is not portable.
|
2010-03-06 12:56:30 -05:00
|
|
|
* It will also rebuild the groups we just cleared.
|
2010-03-06 11:39:35 -05:00
|
|
|
*/
|
|
|
|
db_files_update_songalbumid();
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
bulk_scan();
|
|
|
|
|
|
|
|
if (!scan_exit)
|
|
|
|
{
|
|
|
|
/* Enable inotify */
|
|
|
|
event_add(&inoev, NULL);
|
|
|
|
|
|
|
|
event_base_dispatch(evbase_scan);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!scan_exit)
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Scan event loop terminated ahead of time!\n");
|
|
|
|
|
2009-06-07 12:58:02 -04:00
|
|
|
db_perthread_deinit();
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
pthread_exit(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-09 07:48:52 -05:00
|
|
|
#if defined(__linux__)
|
2009-04-19 09:10:19 -04:00
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
2009-06-10 12:11:29 -04:00
|
|
|
process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-11 10:45:09 -04:00
|
|
|
struct watch_enum we;
|
|
|
|
uint32_t rm_wd;
|
2009-06-11 13:11:03 -04:00
|
|
|
int flags = 0;
|
2009-06-11 10:45:09 -04:00
|
|
|
int ret;
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_DBG, L_SCAN, "Directory event: 0x%x, cookie 0x%x, wd %d\n", ie->mask, ie->cookie, wi->wd);
|
2009-06-09 08:33:59 -04:00
|
|
|
|
2009-06-11 10:45:09 -04:00
|
|
|
if (ie->mask & IN_UNMOUNT)
|
|
|
|
{
|
|
|
|
db_file_disable_bymatch(path, "", 0);
|
|
|
|
db_pl_disable_bymatch(path, "", 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ie->mask & IN_MOVE_SELF)
|
|
|
|
{
|
|
|
|
/* A directory we know about, that got moved from a place
|
|
|
|
* we know about to a place we know nothing about
|
|
|
|
*/
|
|
|
|
if (wi->cookie)
|
|
|
|
{
|
|
|
|
memset(&we, 0, sizeof(struct watch_enum));
|
|
|
|
|
|
|
|
we.cookie = wi->cookie;
|
|
|
|
|
|
|
|
ret = db_watch_enum_start(&we);
|
|
|
|
if (ret < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (((ret = db_watch_enum_fetchwd(&we, &rm_wd)) == 0) && (rm_wd))
|
|
|
|
{
|
|
|
|
inotify_rm_watch(inofd, rm_wd);
|
|
|
|
}
|
|
|
|
|
|
|
|
db_watch_enum_end(&we);
|
|
|
|
|
|
|
|
db_watch_delete_bycookie(wi->cookie);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* If the directory exists, it has been moved and we've
|
|
|
|
* kept track of it successfully, so we're done
|
|
|
|
*/
|
|
|
|
ret = access(path, F_OK);
|
|
|
|
if (ret == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Most probably a top-level dir is getting moved,
|
|
|
|
* and we can't tell where it's going
|
|
|
|
*/
|
|
|
|
|
|
|
|
inotify_rm_watch(inofd, ie->wd);
|
2009-06-11 10:47:15 -04:00
|
|
|
db_watch_delete_bywd(ie->wd);
|
2009-06-11 10:45:09 -04:00
|
|
|
|
|
|
|
memset(&we, 0, sizeof(struct watch_enum));
|
|
|
|
|
|
|
|
we.match = path;
|
|
|
|
|
|
|
|
ret = db_watch_enum_start(&we);
|
|
|
|
if (ret < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (((ret = db_watch_enum_fetchwd(&we, &rm_wd)) == 0) && (rm_wd))
|
|
|
|
{
|
|
|
|
inotify_rm_watch(inofd, rm_wd);
|
|
|
|
}
|
|
|
|
|
|
|
|
db_watch_enum_end(&we);
|
|
|
|
|
|
|
|
db_watch_delete_bymatch(path);
|
|
|
|
|
|
|
|
db_file_disable_bymatch(path, "", 0);
|
|
|
|
db_pl_disable_bymatch(path, "", 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ie->mask & IN_MOVED_FROM)
|
|
|
|
{
|
|
|
|
db_watch_mark_bypath(path, path, ie->cookie);
|
|
|
|
db_watch_mark_bymatch(path, path, ie->cookie);
|
|
|
|
db_file_disable_bymatch(path, path, ie->cookie);
|
|
|
|
db_pl_disable_bymatch(path, path, ie->cookie);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ie->mask & IN_MOVED_TO)
|
|
|
|
{
|
|
|
|
if (db_watch_cookie_known(ie->cookie))
|
|
|
|
{
|
|
|
|
db_watch_move_bycookie(ie->cookie, path);
|
|
|
|
db_file_enable_bycookie(ie->cookie, path);
|
|
|
|
db_pl_enable_bycookie(ie->cookie, path);
|
2009-06-11 13:11:03 -04:00
|
|
|
|
|
|
|
/* We'll rescan the directory tree to update playlists */
|
|
|
|
flags |= F_SCAN_RESCAN;
|
2009-06-11 10:45:09 -04:00
|
|
|
}
|
2009-06-11 13:11:03 -04:00
|
|
|
|
|
|
|
ie->mask |= IN_CREATE;
|
2009-06-11 10:45:09 -04:00
|
|
|
}
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
if (ie->mask & IN_CREATE)
|
|
|
|
{
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directories(path, flags);
|
2009-06-03 08:06:46 -04:00
|
|
|
|
|
|
|
if (dirstack)
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n");
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
2009-06-10 12:11:29 -04:00
|
|
|
process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
struct stat sb;
|
|
|
|
char *deref = NULL;
|
|
|
|
char *file = path;
|
|
|
|
int compilation;
|
|
|
|
int ret;
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_DBG, L_SCAN, "File event: 0x%x, cookie 0x%x, wd %d\n", ie->mask, ie->cookie, wi->wd);
|
2009-06-09 08:33:59 -04:00
|
|
|
|
2009-06-10 16:18:23 -04:00
|
|
|
if (ie->mask & IN_DELETE)
|
|
|
|
{
|
|
|
|
db_file_delete_bypath(path);
|
|
|
|
db_pl_delete_bypath(path);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ie->mask & IN_MOVED_FROM)
|
|
|
|
{
|
|
|
|
db_file_disable_bypath(path, wi->path, ie->cookie);
|
|
|
|
db_pl_disable_bypath(path, wi->path, ie->cookie);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ie->mask & IN_MOVED_TO)
|
|
|
|
{
|
|
|
|
ret = db_file_enable_bycookie(ie->cookie, wi->path);
|
|
|
|
|
|
|
|
if (ret <= 0)
|
2009-06-11 13:04:21 -04:00
|
|
|
{
|
|
|
|
/* It's not a known media file, so it's either a new file
|
|
|
|
* or a playlist, known or not.
|
|
|
|
* We want to scan the new file and we want to rescan the
|
|
|
|
* playlist to update playlist items (relative items).
|
|
|
|
*/
|
|
|
|
ie->mask |= IN_CREATE;
|
|
|
|
db_pl_enable_bycookie(ie->cookie, wi->path);
|
|
|
|
}
|
2009-06-10 16:18:23 -04:00
|
|
|
}
|
|
|
|
|
2009-06-11 07:45:02 -04:00
|
|
|
if (ie->mask & (IN_MODIFY | IN_CREATE | IN_CLOSE_WRITE))
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
|
|
|
ret = lstat(path, &sb);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not lstat() '%s': %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISLNK(sb.st_mode))
|
|
|
|
{
|
2010-01-09 07:44:10 -05:00
|
|
|
deref = m_realpath(path);
|
2009-04-19 09:10:19 -04:00
|
|
|
if (!deref)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not dereference symlink '%s': %s\n", path, strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
file = deref;
|
|
|
|
|
|
|
|
ret = stat(deref, &sb);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not stat() '%s': %s\n", file, strerror(errno));
|
|
|
|
|
2009-06-11 07:51:19 -04:00
|
|
|
free(deref);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISDIR(sb.st_mode))
|
|
|
|
{
|
|
|
|
process_inotify_dir(wi, deref, ie);
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
free(deref);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-19 14:06:47 -04:00
|
|
|
compilation = check_compilation(path);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
process_file(file, sb.st_mtime, sb.st_size, compilation, 0);
|
2009-06-10 16:18:23 -04:00
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
if (deref)
|
|
|
|
free(deref);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
|
|
|
inotify_cb(int fd, short event, void *arg)
|
|
|
|
{
|
|
|
|
struct inotify_event *buf;
|
|
|
|
struct inotify_event *ie;
|
2009-06-10 12:11:29 -04:00
|
|
|
struct watch_info wi;
|
2009-04-19 09:10:19 -04:00
|
|
|
char path[PATH_MAX];
|
|
|
|
int qsize;
|
2009-06-09 07:34:53 -04:00
|
|
|
int namelen;
|
2009-04-19 09:10:19 -04:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Determine the size of the inotify queue */
|
|
|
|
ret = ioctl(fd, FIONREAD, &qsize);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not determine inotify queue size: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf = (struct inotify_event *)malloc(qsize);
|
|
|
|
if (!buf)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "Could not allocate %d bytes for inotify events\n", qsize);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = read(fd, buf, qsize);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "inotify read failed: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
free(buf);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ioctl(FIONREAD) returns the number of bytes, now we need the number of elements */
|
|
|
|
qsize /= sizeof(struct inotify_event);
|
|
|
|
|
|
|
|
/* Loop through all the events we got */
|
|
|
|
for (ie = buf; (ie - buf) < qsize; ie += (1 + (ie->len / sizeof(struct inotify_event))))
|
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
memset(&wi, 0, sizeof(struct watch_info));
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
/* ie[0] contains the inotify event information
|
|
|
|
* the memory space for ie[1+] contains the name of the file
|
|
|
|
* see the inotify documentation
|
|
|
|
*/
|
2009-06-10 12:11:29 -04:00
|
|
|
wi.wd = ie->wd;
|
|
|
|
ret = db_watch_get_bywd(&wi);
|
|
|
|
if (ret < 0)
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-09 08:33:59 -04:00
|
|
|
if (!(ie->mask & IN_IGNORED))
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "No matching watch found, ignoring event (0x%x)\n", ie->mask);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-09 08:33:59 -04:00
|
|
|
if (ie->mask & IN_IGNORED)
|
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_DBG, L_SCAN, "%s deleted or backing filesystem unmounted!\n", wi.path);
|
2009-06-09 08:33:59 -04:00
|
|
|
|
2009-06-11 10:47:15 -04:00
|
|
|
db_watch_delete_bywd(ie->wd);
|
2009-06-10 12:11:29 -04:00
|
|
|
free(wi.path);
|
2009-06-09 08:33:59 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-09 07:34:53 -04:00
|
|
|
path[0] = '\0';
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
ret = snprintf(path, PATH_MAX, "%s", wi.path);
|
2009-06-09 07:34:53 -04:00
|
|
|
if ((ret < 0) || (ret >= PATH_MAX))
|
2009-04-19 09:10:19 -04:00
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping event under %s, PATH_MAX exceeded\n", wi.path);
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
free(wi.path);
|
2009-04-19 09:10:19 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-09 07:34:53 -04:00
|
|
|
if (ie->len > 0)
|
|
|
|
{
|
|
|
|
namelen = PATH_MAX - ret;
|
|
|
|
ret = snprintf(path + ret, namelen, "/%s", ie->name);
|
|
|
|
if ((ret < 0) || (ret >= namelen))
|
|
|
|
{
|
2009-06-10 12:11:29 -04:00
|
|
|
DPRINTF(E_LOG, L_SCAN, "Skipping %s/%s, PATH_MAX exceeded\n", wi.path, ie->name);
|
2009-06-09 07:34:53 -04:00
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
free(wi.path);
|
2009-06-09 07:34:53 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ie->len == 0 catches events on the subject of the watch itself.
|
|
|
|
* As we only watch directories, this catches directories.
|
|
|
|
* General watch events like IN_UNMOUNT and IN_IGNORED do not come
|
|
|
|
* with the IN_ISDIR flag set.
|
|
|
|
*/
|
|
|
|
if ((ie->mask & IN_ISDIR) || (ie->len == 0))
|
2009-06-10 12:11:29 -04:00
|
|
|
process_inotify_dir(&wi, path, ie);
|
2009-04-19 09:10:19 -04:00
|
|
|
else
|
2009-06-10 12:11:29 -04:00
|
|
|
process_inotify_file(&wi, path, ie);
|
|
|
|
|
|
|
|
free(wi.path);
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
free(buf);
|
|
|
|
|
|
|
|
event_add(&inoev, NULL);
|
|
|
|
}
|
2010-01-09 07:48:52 -05:00
|
|
|
#endif /* __linux__ */
|
|
|
|
|
|
|
|
|
2010-01-10 11:49:01 -05:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2010-01-09 07:48:52 -05:00
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
|
|
|
kqueue_cb(int fd, short event, void *arg)
|
|
|
|
{
|
|
|
|
struct kevent kev;
|
|
|
|
struct timespec ts;
|
2010-01-12 12:45:44 -05:00
|
|
|
struct watch_info wi;
|
|
|
|
struct watch_enum we;
|
|
|
|
struct stacked_dir *rescan;
|
|
|
|
struct stacked_dir *d;
|
|
|
|
struct stacked_dir *dprev;
|
|
|
|
char *path;
|
|
|
|
uint32_t wd;
|
|
|
|
int d_len;
|
|
|
|
int w_len;
|
|
|
|
int need_rescan;
|
|
|
|
int ret;
|
2010-01-09 07:48:52 -05:00
|
|
|
|
|
|
|
ts.tv_sec = 0;
|
|
|
|
ts.tv_nsec = 0;
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
we.cookie = 0;
|
|
|
|
|
|
|
|
rescan = NULL;
|
|
|
|
|
|
|
|
DPRINTF(E_DBG, L_SCAN, "Library changed!\n");
|
|
|
|
|
2010-01-09 07:48:52 -05:00
|
|
|
/* We can only monitor directories with kqueue; to monitor files, we'd need
|
|
|
|
* to have an open fd on every file in the library, which is totally insane.
|
|
|
|
* Unfortunately, that means we only know when directories get renamed,
|
|
|
|
* deleted or changed. We don't get directory/file names when directories/files
|
2010-01-12 12:45:44 -05:00
|
|
|
* are created/deleted/renamed in the directory, so we have to rescan.
|
2010-01-09 07:48:52 -05:00
|
|
|
*/
|
|
|
|
while (kevent(fd, NULL, 0, &kev, 1, &ts) > 0)
|
|
|
|
{
|
2010-01-12 12:45:44 -05:00
|
|
|
/* This should not happen, and if it does, we'll end up in
|
|
|
|
* an infinite loop.
|
|
|
|
*/
|
|
|
|
if (kev.filter != EVFILT_VNODE)
|
|
|
|
continue;
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
wi.wd = kev.ident;
|
|
|
|
|
|
|
|
ret = db_watch_get_bywd(&wi);
|
|
|
|
if (ret < 0)
|
2010-01-09 07:48:52 -05:00
|
|
|
{
|
2010-01-12 12:45:44 -05:00
|
|
|
DPRINTF(E_LOG, L_SCAN, "Found no matching watch for kevent, killing this event\n");
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
close(kev.ident);
|
2010-01-09 07:48:52 -05:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
/* Whatever the type of event that happened, disable matching watches and
|
|
|
|
* files before we trigger an eventual rescan.
|
|
|
|
*/
|
|
|
|
we.match = wi.path;
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
ret = db_watch_enum_start(&we);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
free(wi.path);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((db_watch_enum_fetchwd(&we, &wd) == 0) && (wd))
|
2010-01-09 07:48:52 -05:00
|
|
|
{
|
2010-01-12 12:45:44 -05:00
|
|
|
close(wd);
|
2010-01-09 07:48:52 -05:00
|
|
|
}
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
db_watch_enum_end(&we);
|
|
|
|
|
|
|
|
db_watch_delete_bymatch(wi.path);
|
|
|
|
|
|
|
|
close(wi.wd);
|
|
|
|
db_watch_delete_bywd(wi.wd);
|
|
|
|
|
|
|
|
/* Disable files */
|
|
|
|
db_file_disable_bymatch(wi.path, "", 0);
|
|
|
|
db_pl_disable_bymatch(wi.path, "", 0);
|
|
|
|
|
|
|
|
if (kev.flags & EV_ERROR)
|
2010-01-09 07:48:52 -05:00
|
|
|
{
|
2010-01-12 12:45:44 -05:00
|
|
|
DPRINTF(E_LOG, L_SCAN, "kevent reports EV_ERROR (%s): %s\n", wi.path, strerror(kev.data));
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
ret = access(wi.path, F_OK);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
free(wi.path);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The directory still exists, so try to add it back to the library */
|
|
|
|
kev.fflags |= NOTE_WRITE;
|
2010-01-09 07:48:52 -05:00
|
|
|
}
|
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
/* No further action on NOTE_DELETE & NOTE_RENAME; NOTE_WRITE on the
|
|
|
|
* parent directory will trigger a rescan in both cases and the
|
|
|
|
* renamed directory will be picked up then.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (kev.fflags & NOTE_WRITE)
|
2010-01-09 07:48:52 -05:00
|
|
|
{
|
2010-01-12 12:45:44 -05:00
|
|
|
DPRINTF(E_DBG, L_SCAN, "Got NOTE_WRITE (%s)\n", wi.path);
|
|
|
|
|
|
|
|
need_rescan = 1;
|
|
|
|
w_len = strlen(wi.path);
|
|
|
|
|
|
|
|
/* Abusing stacked_dir a little bit here */
|
|
|
|
dprev = NULL;
|
|
|
|
d = rescan;
|
|
|
|
while (d)
|
|
|
|
{
|
|
|
|
d_len = strlen(d->path);
|
|
|
|
|
|
|
|
if (d_len > w_len)
|
|
|
|
{
|
|
|
|
/* Stacked dir child of watch dir? */
|
|
|
|
if ((d->path[w_len] == '/') && (strncmp(d->path, wi.path, w_len) == 0))
|
|
|
|
{
|
|
|
|
DPRINTF(E_DBG, L_SCAN, "Watched directory is a parent\n");
|
|
|
|
|
|
|
|
if (dprev)
|
|
|
|
dprev->next = d->next;
|
|
|
|
else
|
|
|
|
rescan = d->next;
|
|
|
|
|
|
|
|
free(d->path);
|
|
|
|
free(d);
|
|
|
|
|
|
|
|
if (dprev)
|
|
|
|
d = dprev->next;
|
|
|
|
else
|
|
|
|
d = rescan;
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (w_len > d_len)
|
|
|
|
{
|
|
|
|
/* Watch dir child of stacked dir? */
|
|
|
|
if ((wi.path[d_len] == '/') && (strncmp(wi.path, d->path, d_len) == 0))
|
|
|
|
{
|
|
|
|
DPRINTF(E_DBG, L_SCAN, "Watched directory is a child\n");
|
|
|
|
|
|
|
|
need_rescan = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strcmp(wi.path, d->path) == 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_DBG, L_SCAN, "Watched directory already listed\n");
|
|
|
|
|
|
|
|
need_rescan = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
dprev = d;
|
|
|
|
d = d->next;
|
|
|
|
}
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2010-01-12 12:45:44 -05:00
|
|
|
if (need_rescan)
|
|
|
|
push_dir(&rescan, wi.path);
|
2010-01-09 07:48:52 -05:00
|
|
|
}
|
2010-01-12 12:45:44 -05:00
|
|
|
|
|
|
|
free(wi.path);
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((path = pop_dir(&rescan)))
|
|
|
|
{
|
2010-03-19 14:06:47 -04:00
|
|
|
process_directories(path, 0);
|
2010-01-12 12:45:44 -05:00
|
|
|
|
|
|
|
free(path);
|
|
|
|
|
|
|
|
if (rescan)
|
|
|
|
DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n");
|
2010-01-09 07:48:52 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
event_add(&inoev, NULL);
|
|
|
|
}
|
2010-01-10 11:49:01 -05:00
|
|
|
#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
|
2010-01-09 07:48:52 -05:00
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
/* Thread: scan */
|
|
|
|
static void
|
|
|
|
exit_cb(int fd, short event, void *arg)
|
|
|
|
{
|
|
|
|
event_base_loopbreak(evbase_scan);
|
|
|
|
|
|
|
|
scan_exit = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Thread: main */
|
|
|
|
int
|
|
|
|
filescanner_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
scan_exit = 0;
|
|
|
|
|
|
|
|
evbase_scan = event_base_new();
|
|
|
|
if (!evbase_scan)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not create an event base\n");
|
|
|
|
|
2009-06-10 12:11:29 -04:00
|
|
|
return -1;
|
2009-04-19 09:10:19 -04:00
|
|
|
}
|
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
exit_efd = eventfd(0, EFD_CLOEXEC);
|
|
|
|
if (exit_efd < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not create eventfd: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
goto pipe_fail;
|
|
|
|
}
|
2010-01-09 07:41:14 -05:00
|
|
|
#else
|
2010-02-04 12:52:13 -05:00
|
|
|
# if defined(__linux__)
|
|
|
|
ret = pipe2(exit_pipe, O_CLOEXEC);
|
|
|
|
# else
|
2010-01-09 07:41:14 -05:00
|
|
|
ret = pipe(exit_pipe);
|
2010-02-04 12:52:13 -05:00
|
|
|
# endif
|
2009-04-19 09:10:19 -04:00
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not create pipe: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
goto pipe_fail;
|
|
|
|
}
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif /* USE_EVENTFD */
|
2009-04-19 09:10:19 -04:00
|
|
|
|
2010-01-09 07:48:52 -05:00
|
|
|
#if defined(__linux__)
|
2009-04-19 09:10:19 -04:00
|
|
|
inofd = inotify_init1(IN_CLOEXEC);
|
|
|
|
if (inofd < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not create inotify fd: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
goto ino_fail;
|
|
|
|
}
|
|
|
|
|
2010-01-09 07:48:52 -05:00
|
|
|
event_set(&inoev, inofd, EV_READ, inotify_cb, NULL);
|
|
|
|
|
2010-01-10 11:49:01 -05:00
|
|
|
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2010-01-09 07:48:52 -05:00
|
|
|
|
|
|
|
inofd = kqueue();
|
|
|
|
if (inofd < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not create kqueue: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
goto ino_fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
event_set(&inoev, inofd, EV_READ, kqueue_cb, NULL);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
event_base_set(evbase_scan, &inoev);
|
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
event_set(&exitev, exit_efd, EV_READ, exit_cb, NULL);
|
|
|
|
#else
|
2009-04-19 09:10:19 -04:00
|
|
|
event_set(&exitev, exit_pipe[0], EV_READ, exit_cb, NULL);
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
event_base_set(evbase_scan, &exitev);
|
|
|
|
event_add(&exitev, NULL);
|
|
|
|
|
|
|
|
ret = pthread_create(&tid_scan, NULL, filescanner, NULL);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not spawn filescanner thread: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
goto thread_fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
thread_fail:
|
|
|
|
close(inofd);
|
|
|
|
ino_fail:
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
close(exit_efd);
|
|
|
|
#else
|
2009-04-19 09:10:19 -04:00
|
|
|
close(exit_pipe[0]);
|
|
|
|
close(exit_pipe[1]);
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
pipe_fail:
|
|
|
|
event_base_free(evbase_scan);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Thread: main */
|
|
|
|
void
|
|
|
|
filescanner_deinit(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
ret = eventfd_write(exit_efd, 1);
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not send exit event: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
int dummy = 42;
|
|
|
|
|
2009-04-19 09:10:19 -04:00
|
|
|
ret = write(exit_pipe[1], &dummy, sizeof(dummy));
|
|
|
|
if (ret != sizeof(dummy))
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not write to exit fd: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
|
|
|
|
ret = pthread_join(tid_scan, NULL);
|
|
|
|
if (ret != 0)
|
|
|
|
{
|
|
|
|
DPRINTF(E_FATAL, L_SCAN, "Could not join filescanner thread: %s\n", strerror(errno));
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-07-30 16:15:38 -04:00
|
|
|
event_del(&inoev);
|
|
|
|
|
2010-02-04 12:52:13 -05:00
|
|
|
#ifdef USE_EVENTFD
|
|
|
|
close(exit_efd);
|
|
|
|
#else
|
2009-04-19 09:10:19 -04:00
|
|
|
close(exit_pipe[0]);
|
|
|
|
close(exit_pipe[1]);
|
2010-02-04 12:52:13 -05:00
|
|
|
#endif
|
2009-04-19 09:10:19 -04:00
|
|
|
close(inofd);
|
|
|
|
event_base_free(evbase_scan);
|
|
|
|
}
|