--- DecentralizedMedia/Library.cpp	2005/07/05 06:37:40	550
+++ DecentralizedMedia/Library.cpp	2005/07/10 11:22:54	554
@@ -4,7 +4,7 @@
 //
 // $Id$
 
-#include <menes/standard.hh>
+#include <menes/c++/standard.hh>
 
 #include <menes/dbi/resultset.hpp>
 
@@ -15,57 +15,77 @@ Library::Library(const _R<dbi::Connectio
 	connection->Execute(_B("UPDATE files SET live = FALSE"));
 }
 
-_L<cse::String> Library::GetArtists() const
+_L<MediaFolder> Library::GetFolders(unsigned page) const
 {
-	_R<dbi::ResultSet> artists_(connection->Execute(_B("SELECT DISTINCT artist FROM files WHERE live = TRUE ORDER BY artist")));
-	_L<cse::String> artists;
+	_R<dbi::ResultSet> roots(connection->Parse(_B("SELECT DISTINCT root FROM files WHERE live = TRUE ORDER By root LIMIT 50 OFFSET ?"))->Execute(page * 50));
+	_L<MediaFolder> folders;
 
-	while (artists_->MoveNext())
-		artists.InsertLast(artists_->GetString(_B("artist")));
+	while (roots->MoveNext())
+		folders.InsertLast(GetFolder(roots->GetString(_B("root"))));
 
-	return artists;
+	return folders;
 }
 
-_L<cse::String> Library::GetTitles() const
+_L<MediaFile> Library::GetFiles(const _L<By>& bys, const _L<cse::String>& items, unsigned page) const
 {
-	_R<dbi::ResultSet> titles_(connection->Execute(_B("SELECT DISTINCT title FROM files WHERE live = TRUE ORDER BY title")));
-	_L<cse::String> titles;
+	if (bys.IsEmpty() || ext::Contains(bys, By::LAST) || bys.GetSize() != items.GetSize())
+		return _L<MediaFile>();
 
-	while (titles_->MoveNext())
-		titles.InsertLast(titles_->GetString(_B("title")));
+	_S<ios::String> statement_;
 
-	return titles;
-}
+	statement_ << _B("SELECT path FROM files WHERE live = TRUE ");
 
-_L<cse::String> Library::GetAlbums() const
-{
-	_R<dbi::ResultSet> albums_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE ORDER BY album")));
-	_L<cse::String> albums;
+	_foreach (const _L<By>, by, bys)
+		statement_ << _B("AND ") << *by << _B(" = ? ");
 
-	while (albums_->MoveNext())
-		albums.InsertLast(albums_->GetString(_B("album")));
+	statement_ << _B("ORDER BY path LIMIT 50 OFFSET ?");
 
-	return albums;
-}
+	_R<dbi::Statement> statement(connection->Parse(statement_));
 
-_L<cse::String> Library::GetGenres() const
-{
-	_R<dbi::ResultSet> genres_(connection->Execute(_B("SELECT DISTINCT genre FROM files WHERE live = TRUE ORDER BY genre")));
-	_L<cse::String> genres;
+	_foreach (const _L<cse::String>, item, items)
+		statement->Set(_index, *item);
+
+	statement->Set(items.GetSize(), page * 50);
+
+	_R<dbi::ResultSet> paths(statement->Execute());
+	_L<MediaFile> files;
 
-	while (genres_->MoveNext())
-		genres.InsertLast(genres_->GetString(_B("genre")));
+	while (paths->MoveNext())
+		files.InsertLast(GetFile(paths->GetString(_B("path"))));
 
-	return genres;
+	return files;
 }
 
-_L<MediaFolder> Library::GetFolders() const
+_L<cse::String> Library::GetItems(_L<By> bys, _L<cse::String> items, unsigned page) const
 {
-	_R<dbi::ResultSet> roots(connection->Execute(_B("SELECT DISTINCT root FROM files WHERE live = TRUE ORDER By root")));
-	_L<MediaFolder> folders;
+	if (bys.IsEmpty() || ext::Contains(bys, By::LAST) || bys.GetSize() - 1 != items.GetSize())
+		return _L<cse::String>();
 
-	while (roots->MoveNext())
-		folders.InsertLast(MediaFolder(connection, roots->GetString(_B("root"))));
+	_S<ios::String> statement_;
+	By by(bys.Last());
 
-	return folders;
+	statement_ << _B("SELECT DISTINCT ") << by << _B(" FROM files WHERE live = TRUE ");
+
+	bys.RemoveLast();
+
+	_foreach (const _L<By>, by_, bys)
+		statement_ << _B("AND ") << *by_ << _B(" = ? ");
+
+	statement_ << _B("ORDER BY ") << by << _B(" LIMIT 50 OFFSET ?");
+
+	_R<dbi::Statement> statement(connection->Parse(statement_));
+
+	_foreach (const _L<cse::String>, item, items)
+		statement->Set(_index, *item);
+
+	statement->Set(items.GetSize(), page * 50);
+
+	_R<dbi::ResultSet> items_(statement->Execute());
+	
+	items.Clear();
+
+	while (items_->MoveNext())
+		items.InsertLast(items_->GetString(lexical_cast<cse::String>(by)));
+
+	return items;
 }