- Initial implementation of sqlite3 as backend for music.

- Add current database schema.
- Remove old query support, since this is replaced by sqlite now.

7 files changed, 179 insertions, 849 deletions

diff --git a/Makefile b/Makefile
index 45b54d8..0681845 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 CFLAGS  = -Wall -std=c99 -D_BSD_SOURCE -I/usr/local/include/ -Iinclude/ \
 	`pkg-config fuse --cflags` `pkg-config taglib --cflags` -DDEBUGGING
 
-LD_ADD  = -L/usr/local/lib -ltag_c \
+LD_ADD  = -L/usr/local/lib -lsqlite3 -ltag_c \
 	`pkg-config fuse --libs`
 CC = gcc
 
diff --git a/dbschema.sql b/dbschema.sql
new file mode 100644
index 0000000..b46aa88
--- /dev/null
+++ b/dbschema.sql
@@ -0,0 +1,21 @@
+-- Could have saved two table here. But having them avoids redundancy as well as
+-- make it possible for future enhancements.
+
+CREATE TABLE artist (
+	name varchar(200) NOT NULL,
+	PRIMARY KEY(name)
+);
+
+CREATE TABLE song (
+	title varchar(200) NOT NULL,
+	album varchar(200),
+	artistname varchar(200),
+	genrename varchar(200),
+	year int,
+	PRIMARY KEY(title, artistname, year)
+);
+
+CREATE TABLE genre (
+	name varchar(200) NOT NULL,
+	PRIMARY KEY(name)
+)
diff --git a/include/mnode.h b/include/mnode.h
deleted file mode 100644
index ff27eb7..0000000
--- a/include/mnode.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _MP3NODE_H_
-#define _MP3NODE_H_
-#include <queue.h>
-struct TagLib_File;
-
-struct mnode {
-	char *path;
-	TagLib_File *tag;
-	/* Entry in search structure. */
-	LIST_ENTRY(mnode) coll_next;
-	LIST_ENTRY(mnode) sel_next;
-};
-
-struct collection {
-	LIST_HEAD(, mnode) head;
-};
-#endif
diff --git a/include/mp3fs.h b/include/mp3fs.h
index 05e84e7..cbb1537 100644
--- a/include/mp3fs.h
+++ b/include/mp3fs.h
@@ -1,11 +1,12 @@
 #ifndef _MP3FS_H_
 #define _MP3FS_H_
 struct fuse_args;
-struct collection;
-struct mnode;
+
+#define DBNAME "music.db"
 
 int	mp3_run(int, char **);
-void	mp3_initscan(char *);
+int	mp3_initscan(char *);
+
 /*
  * Data passed to traverse function pointers.'
  */
@@ -18,37 +19,8 @@ struct filler_data {
  * Functions traversing the underlying filesystem and do operations on the
  * files, for instance scanning the collection.
  */
-typedef void traverse_fn_t(char *, struct collection *);
-void traverse_hierarchy(char *, traverse_fn_t, struct collection *);
+typedef void traverse_fn_t(char *);
+void traverse_hierarchy(char *, traverse_fn_t);
 traverse_fn_t mp3_scan;
 
-/*
- * Functions performing queries on the collection.
- * Usage:
- * To list all artists:
- 	mp3_select(SELECT_ARTIST, NULL, NULL, NULL);
- * To list one artist "Haddaway":
- 	mp3_select(SELECT_ARTIST, "Haddaway", NULL, NULL);
- * To list unique artists in genre "Rock"
- 	mp3_select(SELECT_ARTIST | SELECT_GENRE, NULL, NULL, "Rock");
-
- * So, one can say that the first parameter specifies which fields should be
- * taken into account when comparing for duplicates, and the field parameters
- * determines if * there are some fields of that paramters which it must match.
-
- * I hope to improve this soon.
- */
-#define SELECT_ARTIST 0x1
-#define SELECT_TITLE 0x2
-#define SELECT_GENRE 0x4
-struct collection *mp3_select(int, char *, char *, char *);
-
-/*
- * Use a selection to input a certain tag field into a filler.
- */
-/* XXX: no need to use bitmask since we only need one field at a time? */
-#define FILTER_ARTIST 0
-#define FILTER_GENRE 1
-#define FILTER_TITLE 2
-void	mp3_filter(struct collection *, int, struct filler_data *);
 #endif
diff --git a/include/queue.h b/include/queue.h
deleted file mode 100644
index d62afcc..0000000
--- a/include/queue.h
+++ /dev/null
@@ -1,618 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.68 2006/10/24 11:20:29 ru Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *				SLIST	LIST	STAILQ	TAILQ
- * _HEAD			+	+	+	+
- * _HEAD_INITIALIZER		+	+	+	+
- * _ENTRY			+	+	+	+
- * _INIT			+	+	+	+
- * _EMPTY			+	+	+	+
- * _FIRST			+	+	+	+
- * _NEXT			+	+	+	+
- * _PREV			-	-	-	+
- * _LAST			-	-	+	+
- * _FOREACH			+	+	+	+
- * _FOREACH_SAFE		+	+	+	+
- * _FOREACH_REVERSE		-	-	-	+
- * _FOREACH_REVERSE_SAFE	-	-	-	+
- * _INSERT_HEAD			+	+	+	+
- * _INSERT_BEFORE		-	+	-	+
- * _INSERT_AFTER		+	+	+	+
- * _INSERT_TAIL			-	-	+	+
- * _CONCAT			-	-	+	+
- * _REMOVE_HEAD			+	-	+	-
- * _REMOVE			+	+	+	+
- *
- */
-#ifdef QUEUE_MACRO_DEBUG
-/* Store the last 2 places the queue element or head was altered */
-struct qm_trace {
-	char * lastfile;
-	int lastline;
-	char * prevfile;
-	int prevline;
-};
-
-#define	TRACEBUF	struct qm_trace trace;
-#define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
-
-#define	QMD_TRACE_HEAD(head) do {					\
-	(head)->trace.prevline = (head)->trace.lastline;		\
-	(head)->trace.prevfile = (head)->trace.lastfile;		\
-	(head)->trace.lastline = __LINE__;				\
-	(head)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#define	QMD_TRACE_ELEM(elem) do {					\
-	(elem)->trace.prevline = (elem)->trace.lastline;		\
-	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
-	(elem)->trace.lastline = __LINE__;				\
-	(elem)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#else
-#define	QMD_TRACE_ELEM(elem)
-#define	QMD_TRACE_HEAD(head)
-#define	TRACEBUF
-#define	TRASHIT(x)
-#endif	/* QUEUE_MACRO_DEBUG */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
-
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != NULL;					\
-	    (varp) = &SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_NEXT(curelm, field) =				\
-		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
-	}								\
-	TRASHIT((elm)->field.sle_next);					\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-
-#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = STAILQ_FIRST((head));				\
-	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
-		NULL :							\
-	        ((struct type *)(void *)				\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		if ((STAILQ_NEXT(curelm, field) =			\
-		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
-	}								\
-	TRASHIT((elm)->field.stqe_next);				\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#if (defined(_KERNEL) && defined(INVARIANTS))
-#define	QMD_LIST_CHECK_HEAD(head, field) do {				\
-	if (LIST_FIRST((head)) != NULL &&				\
-	    LIST_FIRST((head))->field.le_prev !=			\
-	     &LIST_FIRST((head)))					\
-		panic("Bad list head %p first->prev != head", (head));	\
-} while (0)
-
-#define	QMD_LIST_CHECK_NEXT(elm, field) do {				\
-	if (LIST_NEXT((elm), field) != NULL &&				\
-	    LIST_NEXT((elm), field)->field.le_prev !=			\
-	     &((elm)->field.le_next))					\
-	     	panic("Bad link elm %p next->prev != elm", (elm));	\
-} while (0)
-
-#define	QMD_LIST_CHECK_PREV(elm, field) do {				\
-	if (*(elm)->field.le_prev != (elm))				\
-		panic("Bad link elm %p prev->next != elm", (elm));	\
-} while (0)
-#else
-#define	QMD_LIST_CHECK_HEAD(head, field)
-#define	QMD_LIST_CHECK_NEXT(elm, field)
-#define	QMD_LIST_CHECK_PREV(elm, field)
-#endif /* (_KERNEL && INVARIANTS) */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = LIST_FIRST((head));				\
-	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	QMD_LIST_CHECK_NEXT(listelm, field);				\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	QMD_LIST_CHECK_PREV(listelm, field);				\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	QMD_LIST_CHECK_HEAD((head), field);				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	QMD_LIST_CHECK_NEXT(elm, field);				\
-	QMD_LIST_CHECK_PREV(elm, field);				\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-	TRASHIT((elm)->field.le_next);					\
-	TRASHIT((elm)->field.le_prev);					\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-	TRACEBUF							\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-	TRACEBUF							\
-}
-
-/*
- * Tail queue functions.
- */
-#if (defined(_KERNEL) && defined(INVARIANTS))
-#define	QMD_TAILQ_CHECK_HEAD(head, field) do {				\
-	if (!TAILQ_EMPTY(head) &&					\
-	    TAILQ_FIRST((head))->field.tqe_prev !=			\
-	     &TAILQ_FIRST((head)))					\
-		panic("Bad tailq head %p first->prev != head", (head));	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_TAIL(head, field) do {				\
-	if (*(head)->tqh_last != NULL)					\
-	    	panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); 	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_NEXT(elm, field) do {				\
-	if (TAILQ_NEXT((elm), field) != NULL &&				\
-	    TAILQ_NEXT((elm), field)->field.tqe_prev !=			\
-	     &((elm)->field.tqe_next))					\
-		panic("Bad link elm %p next->prev != elm", (elm));	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_PREV(elm, field) do {				\
-	if (*(elm)->field.tqe_prev != (elm))				\
-		panic("Bad link elm %p prev->next != elm", (elm));	\
-} while (0)
-#else
-#define	QMD_TAILQ_CHECK_HEAD(head, field)
-#define	QMD_TAILQ_CHECK_TAIL(head, headname)
-#define	QMD_TAILQ_CHECK_NEXT(elm, field)
-#define	QMD_TAILQ_CHECK_PREV(elm, field)
-#endif /* (_KERNEL && INVARIANTS) */
-
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-		QMD_TRACE_HEAD(head1);					\
-		QMD_TRACE_HEAD(head2);					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-	    (var) = (tvar))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	QMD_TAILQ_CHECK_NEXT(listelm, field);				\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else {								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	QMD_TAILQ_CHECK_PREV(listelm, field);				\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	QMD_TAILQ_CHECK_HEAD(head, field);				\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	QMD_TAILQ_CHECK_TAIL(head, field);				\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	QMD_TAILQ_CHECK_NEXT(elm, field);				\
-	QMD_TAILQ_CHECK_PREV(elm, field);				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else {								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
-	TRASHIT((elm)->field.tqe_prev);					\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef __CC_SUPPORTS___INLINE
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = (struct quehead *)a,
-		 *head = (struct quehead *)b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = (struct quehead *)a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__CC_SUPPORTS___INLINE */
-
-void	insque(void *a, void *b);
-void	remque(void *a);
-
-#endif /* __CC_SUPPORTS___INLINE */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/src/mp3_subr.c b/src/mp3_subr.c
index dd8e68d..869eadb 100644
--- a/src/mp3_subr.c
+++ b/src/mp3_subr.c
@@ -13,29 +13,26 @@
 
 #include <tag_c.h>
 #include <mp3fs.h>
-#include <mnode.h>
-#include <queue.h>
+#include <sqlite3.h>
 #include <debug.h>
 
-struct queryvector {
-	char *artist;
-	char *title;
-	char *genre;
-};
+sqlite3 *handle;
 
-/* Local prototypes. */
-static int isduplicate(struct collection *, struct queryvector *, int);
-static void free_query_vector(struct queryvector *);
-static void fill_query_vector(struct queryvector *, struct mnode *);
-static int query_matches(struct queryvector *, struct queryvector *, int);
-/* Simple list containing our nodes. */
-struct collection allmusic;
-
-void
+int
 mp3_initscan(char *musicpath)
 {
-	LIST_INIT(&allmusic.head);
-	traverse_hierarchy(musicpath, mp3_scan, &allmusic);
+	int error;
+
+	/* Open database. */
+	error = sqlite3_open(DBNAME, &handle);
+	if (error) {
+		warnx("Can't open database: %s\n", sqlite3_errmsg(handle));
+		sqlite3_close(handle);
+		return (-1);
+	}
+	traverse_hierarchy(musicpath, mp3_scan);
+	sqlite3_close(handle);
+	return (0);
 }
 
 /*
@@ -44,7 +41,7 @@ mp3_initscan(char *musicpath)
  * sub-directories.
  */
 void
-traverse_hierarchy(char *dirpath, traverse_fn_t fileop, struct collection *coll)
+traverse_hierarchy(char *dirpath, traverse_fn_t fileop)
 {
 	DIR *dirp;
 	struct dirent *dp;
@@ -67,180 +64,162 @@ traverse_hierarchy(char *dirpath, traverse_fn_t fileop, struct collection *coll)
 			err(1, "error doing stat on %s", filepath);
 		/* Recurse if it's a directory. */
 		if (st.st_mode & S_IFDIR)  {
-			traverse_hierarchy(filepath, fileop, coll);
+			traverse_hierarchy(filepath, fileop);
 			continue;
 		}
 		/* If it's a regular file, perform the operation. */
 		if (st.st_mode & S_IFREG) {
-			fileop(filepath, coll);
+			fileop(filepath);
 		}
 	}
 	closedir(dirp);
 }
 
-
-/* Scan the music initially. */
-void
-mp3_scan(char *filepath, struct collection *coll)
+static int
+mp3_scan_callback(void *ignore, int argc, char **argv, char **colname)
 {
-	struct mnode *mp_new;
-
-	mp_new = malloc(sizeof(struct mnode));
-	if (mp_new == NULL)
-		err(1, "malloc");
-	mp_new->tag = taglib_file_new(filepath);
-	mp_new->path = strdup(filepath);
-	if (mp_new->path == NULL)
-		err(1, "strdup");
-
-	/* Insert node into music list. */
-	LIST_INSERT_HEAD(&coll->head, mp_new, coll_next);
-
-#ifdef DEBUGGING
-	LIST_FOREACH(mp_new, &coll->head, coll_next) {
-		DEBUG("Loaded '%s' into database\n", mp_new->path);
-	}
-
-#endif
+	return 0;
 }
 
-/*
- * Given a selection, fetch out the wanted tag and use filler.
- */
+/* Scan the music initially. */
 void
-mp3_filter(struct collection *selection, int filter, struct filler_data *fd)
+mp3_scan(char *filepath)
 {
+	TagLib_File *file;
 	TagLib_Tag *tag;
-	struct mnode *mp;
-	char *field, name[MAXPATHLEN];
+	char *artist, *album, *genre, *title;
+	char *query, *errmsg;
+	int ret;
+	unsigned int year;
+	sqlite3_stmt *st;
+
+	file = taglib_file_new(filepath);
+	/* XXX: errmsg. */
+	if (file == NULL)
+		return;
+	tag = taglib_file_tag(file);
+	if (tag == NULL) {
+		printf("error!\n");
+		return;
+	}
 
-	LIST_FOREACH(mp, &selection->head, sel_next) {
-	
-		tag = taglib_file_tag(mp->tag);
-		switch (filter) {
-			case FILTER_ARTIST:
-			field = taglib_tag_artist(tag);
+	/* XXX: The main query code should perhaps be a bit generalized. */
+
+	/* First insert artist if we have it. */
+	do {
+		artist = taglib_tag_artist(tag);
+		if (artist == NULL)
+			break;
+		/* First find out if it exists. */
+		asprintf(&query, "SELECT * FROM artist WHERE name='%s'",
+		    artist);
+		if (query == NULL)
 			break;
-			case FILTER_GENRE:
-			field = taglib_tag_genre(tag);
+		ret = sqlite3_prepare(handle, query, -1, &st, NULL);
+		if (ret != SQLITE_OK) {
+			warnx("Error preparing statement\n");
+			free(query);
 			break;
-			case FILTER_TITLE:
-			field = taglib_tag_title(tag);
+		}
+		ret = sqlite3_step(st);
+		sqlite3_finalize(st);
+		/* Already exists or generic error. */
+		if (ret != SQLITE_DONE)
 			break;
-			default:
-				err(1, "invalid filter given");
+		/* Doesn't exist, so we can insert it. */
+		free(query);
+		asprintf(&query, "INSERT INTO artist(name) VALUES('%s')",
+		    artist);
+		if (query == NULL)
+			break;
+		ret = sqlite3_exec(handle, query, mp3_scan_callback, 0,
+		    &errmsg);
+		free(query);
+		if (ret != SQLITE_OK) {
+			warnx("Error inserting into database: %s\n", errmsg);
+			sqlite3_free(errmsg);
 			break;
 		}
-		if (field == NULL || !strcmp(field, ""))
-			continue;
-		/* XXX: check if we need to free this or not. */
-		strncpy(name, field, sizeof(name));
-		fd->filler(fd->buf, name, NULL, 0);
-	}
-}
+	} while (0);
 
-/*
- * Perform a query selecting artists given a filter.
- */
-struct collection *
-mp3_select(int flags, char *artist, char *title, char *genre)
-{
-	struct mnode *mp;
-	struct collection *selection;
-	struct queryvector qv, qv2;
-
-	if (flags & SELECT_ARTIST)
-		qv.artist = artist;
-	if (flags & SELECT_TITLE)
-		qv.title = title;
-	if (flags & SELECT_GENRE)
-		qv.genre = genre;
-
-	/* Initialize selection structure. */
-	selection = malloc(sizeof(struct collection));
-	if (selection == NULL)
-		return (NULL);
-
-	LIST_INIT(&selection->head);
-	/* Filter our collection. */
-
-	LIST_FOREACH(mp, &allmusic.head, coll_next) {
-		/* First make sure it matches our criteria. */
-		fill_query_vector(&qv2, mp);
-		if (query_matches(&qv2, &qv, flags) && !isduplicate(selection,
-		    &qv2, flags))
-			LIST_INSERT_HEAD(&selection->head, mp, sel_next);
-		free_query_vector(&qv2);
-	}
-
-	return (selection);
-}
-
-/*
- * Filter out unique fields.
- */
-static int
-isduplicate(struct collection *selection, struct queryvector *qv, int flags)
-{
-	struct mnode *mp2;
-	struct queryvector qv_entry;
-
-	LIST_FOREACH(mp2, &selection->head, sel_next) {
-		/* Compare to determine if it's a duplicate. */
-		fill_query_vector(&qv_entry, mp2);
-		if (query_matches(&qv_entry, qv, flags)) {
-			free_query_vector(&qv_entry);
-			return (1);
+	/* Insert genre if it doesn't exist. */
+	do {
+		genre = taglib_tag_genre(tag);
+		if (genre == NULL)
+			break;
+		/* First find out if it exists. */
+		asprintf(&query, "SELECT * FROM genre WHERE name='%s'", genre);
+		if (query == NULL)
+			break;
+		ret = sqlite3_prepare(handle, query, -1, &st, NULL);
+		if (ret != SQLITE_OK) {
+			warnx("Error preparing statement\n");
+			free(query);
+			break;
 		}
-		free_query_vector(&qv_entry);
-	}
-	return (0);
-}
-
-/* Fill in a query vector given a node with tags. */
-static void
-fill_query_vector(struct queryvector *qv, struct mnode *mp)
-{
-	TagLib_Tag *tag;
+		ret = sqlite3_step(st);
+		sqlite3_finalize(st);
+		/* Already exists or generic error. */
+		if (ret != SQLITE_DONE)
+			break;
+		free(query);
+		asprintf(&query, "INSERT INTO genre(name) VALUES('%s')", genre);
+		if (query == NULL)
+			break;
+		ret = sqlite3_exec(handle, query, mp3_scan_callback, 0,
+		    &errmsg);
+		free(query);
+		if (ret != SQLITE_OK) {
+			warnx("Error inserting into database: %s\n", errmsg);
+			sqlite3_free(errmsg);
+			break;
+		}
+	} while (0);
+
+	/* Finally, insert song. */
+	do {
+		title = taglib_tag_title(tag);
+		album = taglib_tag_album(tag);
+		year = taglib_tag_year(tag);
+		if (title == NULL || genre == NULL || artist == NULL ||
+		    album == NULL)
+			break;
 
-	tag = taglib_file_tag(mp->tag);
-	qv->artist = strdup(taglib_tag_artist(tag));
-	qv->title = strdup(taglib_tag_title(tag));
-	qv->genre = strdup(taglib_tag_genre(tag));
+		/* First find out if it exists. */
+		asprintf(&query, "SELECT * FROM song, artist WHERE "
+		    "artist.name=song.artistname AND title='%s' AND year=%u",
+		    title, year);
+		if (query == NULL)
+			break;
+		ret = sqlite3_prepare(handle, query, -1, &st, NULL);
+		if (ret != SQLITE_OK) {
+			warnx("Error preparing statement\n");
+			free(query);
+			break;
+		}
+		ret = sqlite3_step(st);
+		sqlite3_finalize(st);
+		free(query);
+		/* Already exists or generic error. */
+		if (ret != SQLITE_DONE) {
+			printf("Duplicate song!\n");
+			break;
+		}
+		/* Now, finally insert it. */
+		asprintf(&query, "INSERT INTO song(title, artistname, album, "
+		    "genrename, year) VALUES('%s', '%s', '%s', '%s', %u)",
+		    title, artist, album, genre, year);
+		if (query == NULL)
+			break;
+		ret = sqlite3_exec(handle, query, mp3_scan_callback, 0,
+		    &errmsg);
+		free(query);
+		if (ret != SQLITE_OK) {
+			warnx("Error inserting into database: %s\n", errmsg);
+			sqlite3_free(errmsg);
+			break;
+		}	
+		
+	} while (0);
 	taglib_tag_free_strings();
 }
-
-/* Free a query vector. */
-static void
-free_query_vector(struct queryvector *qv)
-{
-
-	if (qv->artist != NULL)
-		free(qv->artist);
-	if (qv->title != NULL)
-		free(qv->title);
-	if (qv->genre != NULL)
-		free(qv->genre);
-}
-
-/* Determine if two query vectors matches. */
-static int
-query_matches(struct queryvector *qv1, struct queryvector *qv2, int flags)
-{
-
-	/* Check if it matches the different fields. */
-	if ((flags & SELECT_ARTIST) && qv1->artist != NULL && qv2->artist != NULL) {
-		if (strcmp(qv1->artist, qv2->artist))
-			return (0);
-	} 
-	if ((flags & SELECT_TITLE) && qv1->title != NULL && qv2->title != NULL) {
-		if (strcmp(qv1->title, qv2->title))
-			return (0);
-	}
-	if ((flags & SELECT_GENRE) && qv1->genre != NULL && qv2->genre != NULL) {
-		if (strcmp(qv1->genre, qv2->genre))
-			return (0);
-	}
-	return (1);
-}
-
diff --git a/src/mp3_vnops.c b/src/mp3_vnops.c
index e1da22b..0df1cb9 100755
--- a/src/mp3_vnops.c
+++ b/src/mp3_vnops.c
@@ -41,7 +41,6 @@ static int mp3_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
 						off_t offset, struct fuse_file_info *fi)
 {
 	struct filler_data fd;
-	struct collection *selection;
 
 	filler (buf, ".", NULL, 0);
 	filler (buf, "..", NULL, 0);
@@ -61,14 +60,7 @@ static int mp3_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
 	 */
 	if (!strcmp(path, "/Artists")) {
 		/* List artists. */
-
 		/* XXX: need to free selection structure!. */
-		selection = mp3_select(SELECT_ARTIST, NULL, NULL, NULL);
-		/* Could we save a loop iteration here? Doesn' really matter
-		 * since it has much lower complexity than mp3_select.
-		 */
-		mp3_filter(selection, FILTER_ARTIST, &fd);
-		free(selection);
 		return (0);
 	}
 	return (-ENOENT);
@@ -155,6 +147,7 @@ mp3_run(int argc, char **argv)
 	DEBUG("musicpath: %s\n", musicpath);
 	mp3_initscan(musicpath);
 
-	ret = fuse_main(args.argc, args.argv, &mp3_ops, NULL);
+	ret = 0;
+//	ret = fuse_main(args.argc, args.argv, &mp3_ops, NULL);
 	return (ret);
 }