Rework of podcast and compilation scanning

- identify podcasts by config path
- always set album_artist to empty for podcasts
- album_artist for compilations made configurable
- clean up media type enumeration

forked-daapd.conf

@@ -25,9 +25,24 @@ library {
 
 	# Directories to index
 	directories = { "/srv/music" }
-	# Directories containing compilations
-	# Matches anywhere in the path (not a regexp, though)
-	compilations = { "/Compilations/", "/Podcasts/" }
+
+	# Directories containing podcasts
+	# For each directory that is indexed the path is matched against these
+	# names. If there is a match all items in the directory are marked as 
+	# podcasts. Eg. if you index /srv/music, and your podcasts are in
+	# /srv/music/Podcasts, you can set this to "/Podcasts".
+#	podcasts = { "/Podcasts" }
+
+	# Directories containing compilations (eg soundtracks)
+	# For each directory that is indexed the path is matched against these
+	# names. If there is a match all items in the directory are marked as 
+	# compilations.
+#	compilations = { "/Compilations" }
+
+	# Compilations usually have many artists, and if you don't want every
+	# artist to be listed when artist browsing in Remote, you can set
+	# a single name which will be used for all music in the compilation dir
+#	compilation_artist = "Various artists"
 
 	# Artwork file names (without file type extension)
 	# forked-daapd will look for jpg and png files with these base names

src/conffile.c

@@ -61,6 +61,8 @@ static cfg_opt_t sec_library[] =
     CFG_STR("password", NULL, CFGF_NONE),
     CFG_STR_LIST("directories", NULL, CFGF_NONE),
     CFG_STR_LIST("compilations", NULL, CFGF_NONE),
+    CFG_STR_LIST("podcasts", NULL, CFGF_NONE),
+    CFG_STR("compilation_artist", NULL, CFGF_NONE),
     CFG_STR_LIST("artwork_basenames", "{artwork,cover}", CFGF_NONE),
     CFG_BOOL("itunes_overrides", cfg_false, CFGF_NONE),
     CFG_STR_LIST("no_transcode", NULL, CFGF_NONE),

src/filescanner.c

@@ -156,9 +156,11 @@ normalize_fixup_tag(char **tag, char *src_tag)
 static void
 fixup_tags(struct media_file_info *mfi)
 {
+  cfg_t *lib;
   size_t len;
   char *tag;
   char *sep = " - ";
+  char *ca;
 
   if (mfi->genre && (strlen(mfi->genre) == 0))
     {
@@ -272,16 +274,36 @@ fixup_tags(struct media_file_info *mfi)
   normalize_fixup_tag(&mfi->album_sort, mfi->album);
   normalize_fixup_tag(&mfi->title_sort, mfi->title);
 
-  /* If we don't have an album_artist, set it to artist */
-  if (!mfi->album_artist)
+  /* We need to set album_artist according to media type and config */
+  if (mfi->compilation)          /* Compilation */
     {
-      if (mfi->compilation)
+      lib = cfg_getsec(cfg, "library");
+      ca = cfg_getstr(lib, "compilation_artist");
+      if (ca && mfi->album_artist)
+	{
+	  free(mfi->album_artist);
+	  mfi->album_artist = strdup(ca);
+	}
+      else if (ca && !mfi->album_artist)
+	{
+	  mfi->album_artist = strdup(ca);
+	}
+      else if (!ca && !mfi->album_artist)
 	{
 	  mfi->album_artist = strdup("");
 	  mfi->album_artist_sort = strdup("");
 	}
-      else
-	mfi->album_artist = strdup(mfi->artist);
+    }
+  else if (mfi->media_kind == 4) /* Podcast */
+    {
+      if (mfi->album_artist)
+	free(mfi->album_artist);
+      mfi->album_artist = strdup("");
+      mfi->album_artist_sort = strdup("");
+    }
+  else if (!mfi->album_artist)   /* Regular media without album_artist */
+    {
+      mfi->album_artist = strdup(mfi->artist);
     }
 
   if (!mfi->album_artist_sort && (strcmp(mfi->album_artist, mfi->artist) == 0))
@@ -296,7 +318,7 @@ fixup_tags(struct media_file_info *mfi)
 
 
 void
-process_media_file(char *file, time_t mtime, off_t size, int compilation, int url, struct extinf_ctx *extinf)
+process_media_file(char *file, time_t mtime, off_t size, int type, struct extinf_ctx *extinf)
 {
   struct media_file_info mfi;
   char *filename;
@@ -373,7 +395,7 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation, int ur
   mfi.time_modified = mtime;
   mfi.file_size = size;
 
-  if (!url)
+  if (!(type & F_SCAN_TYPE_URL))
     {
       mfi.data_kind = 0; /* real file */
       ret = scan_metadata_ffmpeg(file, &mfi);
@@ -397,7 +419,10 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation, int ur
       goto out;
     }
 
-  mfi.compilation = compilation;
+  if (type & F_SCAN_TYPE_COMPILATION)
+    mfi.compilation = 1;
+  if (type & F_SCAN_TYPE_PODCAST)
+    mfi.media_kind = 4; /* podcast */
 
   if (!mfi.item_kind)
     mfi.item_kind = 2; /* music */
@@ -491,7 +516,7 @@ process_deferred_playlists(void)
 
 /* Thread: scan */
 static void
-process_file(char *file, time_t mtime, off_t size, int compilation, int flags)
+process_file(char *file, time_t mtime, off_t size, int type, int flags)
 {
   char *ext;
 
@@ -520,9 +545,28 @@ process_file(char *file, time_t mtime, off_t size, int compilation, int flags)
     }
 
   /* Not any kind of special file, so let's see if it's a media file */
-  process_media_file(file, mtime, size, compilation, 0, NULL);
+  process_media_file(file, mtime, size, type, NULL);
 }
 
+/* Thread: scan */
+static int
+check_podcast(char *path)
+{
+  cfg_t *lib;
+  int ndirs;
+  int i;
+
+  lib = cfg_getsec(cfg, "library");
+  ndirs = cfg_size(lib, "podcasts");
+
+  for (i = 0; i < ndirs; i++)
+    {
+      if (strstr(path, cfg_getnstr(lib, "podcasts", i)))
+	return 1;
+    }
+
+  return 0;
+}
 
 /* Thread: scan */
 static int
@@ -559,7 +603,7 @@ process_directory(char *path, int flags)
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   struct kevent kev;
 #endif
-  int compilation;
+  int type;
   int ret;
 
   if (flags & F_SCAN_BULK)
@@ -590,8 +634,12 @@ process_directory(char *path, int flags)
       return;
     }
 
-  /* Check for a compilation directory */
-  compilation = check_compilation(path);
+  /* Check if compilation and/or podcast directory */
+  type = 0;
+  if (check_compilation(path))
+    type |= F_SCAN_TYPE_COMPILATION;
+  if (check_podcast(path))
+    type |= F_SCAN_TYPE_PODCAST;
 
   for (;;)
     {
@@ -655,7 +703,7 @@ process_directory(char *path, int flags)
 	}
 
       if (S_ISREG(sb.st_mode))
-	process_file(entry, sb.st_mtime, sb.st_size, compilation, flags);
+	process_file(entry, sb.st_mtime, sb.st_size, type, flags);
       else if (S_ISDIR(sb.st_mode))
 	push_dir(&dirstack, entry);
       else
@@ -968,7 +1016,7 @@ process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie
   struct stat sb;
   char *deref = NULL;
   char *file = path;
-  int compilation;
+  int type;
   int ret;
 
   DPRINTF(E_DBG, L_SCAN, "File event: 0x%x, cookie 0x%x, wd %d\n", ie->mask, ie->cookie, wi->wd);
@@ -1041,9 +1089,13 @@ process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie
 	    }
 	}
 
-      compilation = check_compilation(path);
+      type = 0;
+      if (check_compilation(path))
+	type |= F_SCAN_TYPE_COMPILATION;
+      if (check_podcast(path))
+	type |= F_SCAN_TYPE_PODCAST;
 
-      process_file(file, sb.st_mtime, sb.st_size, compilation, 0);
+      process_file(file, sb.st_mtime, sb.st_size, type, 0);
 
       if (deref)
 	free(deref);

src/filescanner.h

@@ -4,6 +4,10 @@
 
 #include "db.h"
 
+#define F_SCAN_TYPE_PODCAST      (1 << 0)
+#define F_SCAN_TYPE_COMPILATION  (1 << 1)
+#define F_SCAN_TYPE_URL          (1 << 2)
+
 int
 filescanner_init(void);
 
@@ -18,7 +22,7 @@ struct extinf_ctx
 };
 
 void
-process_media_file(char *file, time_t mtime, off_t size, int compilation, int url, struct extinf_ctx *extinf);
+process_media_file(char *file, time_t mtime, off_t size, int type, struct extinf_ctx *extinf);
 
 /* Actual scanners */
 int

src/filescanner_ffmpeg.c

@@ -616,15 +616,6 @@ scan_metadata_ffmpeg(char *file, struct media_file_info *mfi)
     {
       mfi->media_kind = 2;
     }
-  /* Podcasts are either media_kind 4, 6 or 7 - unsure what the difference is */
-  else if (mfi->path && strstr(mfi->path, "/Podcasts/"))
-    {
-      mfi->media_kind = 4;
-    }
-  else if ((mdcount > 0) && mfi->genre && (strcmp(mfi->genre,"Podcast") == 0))
-    {
-      mfi->media_kind = 4;
-    }
 
  skip_extract:
   if (mdcount == 0)

src/filescanner_m3u.c

@@ -212,7 +212,7 @@ scan_m3u_playlist(char *file, time_t mtime)
 	  if (extinf.found)
 	    DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", extinf.artist, extinf.title);
 
-	  process_media_file(filename, mtime, 0, 0, 1, &extinf);
+	  process_media_file(filename, mtime, 0, F_SCAN_TYPE_URL, &extinf);
 	}
       /* Regular file */
       else