core/database: Move database out of containers/ subdirectory

It doesn't make sense to have a subdirectory with a single file.  Let's
move it back to core/

Implements #45: Move database into core/
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

core/Sconscript

@@ -3,7 +3,6 @@ Import("env")
 
 res  = Glob("*.c")
 res += SConscript("tags/Sconscript")
-res += SConscript("containers/Sconscript")
 res += SConscript("playlists/Sconscript")
 
 env.UsePackage("gstreamer-1.0")

core/containers/Sconscript

@@ -1,3 +0,0 @@
-#!/usr/bin/python
-res = Glob("*.c")
-Return("res")

core/database.c

@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <core/containers/database.h>
+#include <core/database.h>
 #include <core/idle.h>
 
 #define DB_ENTRY_AT(db, index) \

include/core/tags/album.h

@@ -14,7 +14,7 @@
 #ifndef OCARINA_CORE_TAGS_ALBUM_H
 #define OCARINA_CORE_TAGS_ALBUM_H
 
-#include <core/containers/database.h>
+#include <core/database.h>
 #include <core/tags/artist.h>
 
 struct album {

include/core/tags/artist.h

@@ -13,7 +13,7 @@
 #ifndef OCARINA_CORE_TAGS_ARTIST_H
 #define OCARINA_CORE_TAGS_ARTIST_H
 
-#include <core/containers/database.h>
+#include <core/database.h>
 
 struct artist {
 	gchar *ar_name;  /* This artist's name. */

include/core/tags/genre.h

@@ -13,7 +13,7 @@
 #ifndef OCARINA_CORE_TAGS_GENRE_H
 #define OCARINA_CORE_TAGS_GENRE_H
 
-#include <core/containers/database.h>
+#include <core/database.h>
 
 struct genre {
 	gchar *ge_name;  /* This genre's name. */

include/core/tags/library.h

@@ -13,7 +13,7 @@
 #ifndef OCARINA_CORE_TAGS_LIBRARY_H
 #define OCARINA_CORE_TAGS_LIBRARY_H
 
-#include <core/containers/database.h>
+#include <core/database.h>
 
 struct library {
 	unsigned int li_size;	/* This library's track count. */

include/core/tags/track.h

@@ -20,7 +20,7 @@
 #ifndef OCARINA_CORE_TAGS_TRACK_H
 #define OCARINA_CORE_TAGS_TRACK_H
 
-#include <core/containers/database.h>
+#include <core/database.h>
 #include <core/date.h>
 #include <core/tags/album.h>
 #include <core/tags/artist.h>

tests/core/.gitignore

@@ -3,7 +3,7 @@ string
 file
 date
 idle
-containers/database
+database
 filter
 tags/artist
 tags/album

tests/core/Sconscript

@@ -29,8 +29,7 @@ res += [ CoreTest("string")     ]
 res += [ CoreTest("file")       ]
 res += [ CoreTest("date")       ]
 res += [ CoreTest("idle")       ]
-
-res += SConscript("containers/Sconscript")
+res += [ CoreTest("database")   ]
 res += [ CoreTest("filter")     ]
 
 res += SConscript("tags/Sconscript")

tests/core/containers/Sconscript

@@ -1,15 +0,0 @@
-#!/usr/bin/python
-Import("CoreTest", "testing_group")
-
-res = []
-
-def ContainerTest(name):
-	run = CoreTest("containers/%s" % name)
-	Alias("tests/core/containers", run)
-	if len(res) > 0 and testing_group([ "tests/core/containers" ]):
-		Depends(run, res[-1])
-	return run
-
-res += [ ContainerTest("database") ]
-
-Return("res")

tests/core/database.c

@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  * Test a Database
  */
-#include <core/containers/database.h>
+#include <core/database.h>
 #include <core/idle.h>
 #include <core/string.h>
 #include <tests/test.h>