Add rewritten scan_static_playlist() as scan_m3u_playlist()

Get rid of the I/O layer, better code.

src/Makefile.am

@@ -19,7 +19,7 @@ mt_daapd_SOURCES = main.c daapd.h webserver.c \
 	mp3-scanner.h mp3-scanner.c \
 	conffile.c conffile.h \
 	filescanner.c filescanner.h \
-	filescanner_ffmpeg.c filescanner_urlfile.c \
+	filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c \
 	mdns_avahi.c mdns_avahi.h \
 	db-generic.c db-generic.h ff-plugins.c ff-plugins.h \
 	rxml.c rxml.h redblack.c redblack.h \

src/filescanner.h

@@ -23,4 +23,7 @@ scan_xml_playlist(char *filename);
 int
 scan_static_playlist(char *filename);
 
+int
+scan_m3u_playlist(char *file);
+
 #endif /* !__FILESCANNER_H__ */

src/filescanner_m3u.c

@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2009 Julien BLACHE <jb@jblache.org>
+ *
+ * Rewritten from mt-daapd code:
+ * 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 <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#include "daapd.h"
+#include "err.h"
+#include "ff-dbstruct.h"
+#include "db-generic.h"
+
+
+int
+scan_m3u_playlist(char *file)
+{
+  FILE *fp;
+  struct playlist_info *pli;
+  struct media_file_info *mfi;
+  struct stat sb;
+  char buf[PATH_MAX];
+  char rel_entry[PATH_MAX];
+  char *pl_base;
+  char *entry;
+  char *filename;
+  char *ptr;
+  char *db_errmsg;
+  size_t len;
+  int pl_id;
+  int ret;
+
+  DPRINTF(E_INF, L_SCAN | L_PL, "Processing static playlist: %s\n", file);
+
+  ret = stat(file, &sb);
+  if (ret < 0)
+    {
+      DPRINTF(E_LOG, L_SCAN, "Could not stat() '%s': %s\n", file, strerror(errno));
+
+      return FALSE;
+    }
+
+  filename = strrchr(file, '/');
+  if (!filename)
+    filename = file;
+  else
+    filename++;
+
+  pli = db_fetch_playlist(NULL, file, 0);
+
+  if (pli)
+    {
+      if (pli->db_timestamp >= sb.st_mtime)
+	{
+	  DPRINTF(E_DBG, L_SCAN, "Playlist up-to-date\n");
+
+	  db_dispose_playlist(pli);
+	  return TRUE;
+	}
+      else
+	{
+	  DPRINTF(E_DBG, L_SCAN, "Playlist needs update\n");
+
+	  db_delete_playlist(NULL, pli->id);
+	  db_dispose_playlist(pli);
+	}
+    }
+
+  fp = fopen(file, "r");
+  if (!fp)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not open playlist '%s': %s\n", file, strerror(errno));
+
+      return FALSE;
+    }
+
+  /* Get only the basename, to be used as the playlist name */
+  ptr = strrchr(filename, '.');
+  if (ptr)
+    *ptr = '\0';
+
+  /* Safe: filename is a subset of file which is <= PATH_MAX already */
+  strncpy(buf, filename, sizeof(buf));
+
+  /* Restore the full filename */
+  if (ptr)
+    *ptr = '.';
+
+  ret = db_add_playlist(&db_errmsg, buf, PL_STATICFILE, NULL, file, 0, &pl_id);
+
+  if (ret != DB_E_SUCCESS)
+    {
+      DPRINTF(E_LOG, L_SCAN, "Error adding m3u playlist '%s': %s\n", file, db_errmsg);
+
+      free(db_errmsg);
+      return FALSE;
+    }
+
+  ptr = strrchr(file, '/');
+  if (!ptr)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Could not determine playlist base path\n");
+
+      return FALSE;
+    }
+
+  *ptr = '\0';
+  pl_base = strdup(file);
+  *ptr = '/';
+
+  if (!pl_base)
+    {
+      DPRINTF(E_WARN, L_SCAN, "Out of memory\n");
+
+      return FALSE;
+    }
+
+  DPRINTF(E_INF, L_SCAN | L_PL, "Added playlist as id %d\n", pl_id);
+
+  while (fgets(buf, sizeof(buf), fp) != NULL)
+    {
+      len = strlen(buf);
+      if (buf[len - 1] != '\n')
+	{
+	  DPRINTF(E_WARN, L_SCAN, "Entry exceeds PATH_MAX, discarding\n");
+
+	  while (fgets(buf, sizeof(buf), fp) != NULL)
+	    {
+	      if (buf[strlen(buf) - 1] == '\n')
+		break;
+	    }
+
+	  continue;
+	}
+
+      if ((buf[0] == ';') || (buf[0] == '#'))
+	continue;
+
+      while (isspace(buf[len - 1]))
+	{
+	  len--;
+	  buf[len] = '\0';
+	}
+
+      /* Absolute vs. relative path */
+      if (buf[0] == '/')
+	{
+	  entry = buf;
+	}
+      else
+	{
+	  ret = snprintf(rel_entry, sizeof(rel_entry),"%s/%s", pl_base, buf);
+	  if ((ret < 0) || (ret >= sizeof(rel_entry)))
+	    {
+	      DPRINTF(E_WARN, L_SCAN, "Skipping entry, PATH_MAX exceeded\n");
+
+	      continue;
+	    }
+
+	  entry = rel_entry;
+	}
+
+	filename = realpath(entry, NULL);
+	if (!filename)
+	  {
+	    DPRINTF(E_WARN, L_SCAN, "Could not determine real path for '%s': %s\n", entry, strerror(errno));
+
+	    continue;
+	  }
+
+	DPRINTF(E_DBG, L_SCAN | L_PL, "Checking %s\n", filename);
+
+	mfi = db_fetch_path(&db_errmsg, filename, 0);
+	if (!mfi)
+	  {
+	    DPRINTF(E_WARN, L_SCAN | L_PL, "Playlist entry '%s' not found: %s\n", entry, db_errmsg);
+
+	    free(db_errmsg);
+	    free(filename);
+	    continue;
+	  }
+
+	DPRINTF(E_DBG, L_SCAN | L_PL, "Resolved %s to %d\n", filename, mfi->id);
+	db_add_playlist_item(NULL, pl_id, mfi->id);
+	db_dispose_item(mfi);
+    }
+
+  if (!feof(fp))
+    {
+      DPRINTF(E_LOG, L_SCAN, "Error reading playlist '%s': %s\n", file, strerror(errno));
+
+      fclose(fp);
+      return FALSE;
+    }
+
+  fclose(fp);
+
+  DPRINTF(E_INF, L_SCAN | L_PL, "Done processing playlist\n");
+
+  return TRUE;
+}