ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/DecentralizedMedia/Library.cpp
(Generate patch)

Comparing DecentralizedMedia/Library.cpp (file contents):
Revision 542 by douglas, 2005-07-03T00:31:07-07:00 vs.
Revision 550 by douglas, 2005-07-04T23:37:40-07:00

# Line 6 | Line 6
6  
7   #include <menes/standard.hh>
8  
9 < #include <menes-dbi/resultset.hpp>
9 > #include <menes/dbi/resultset.hpp>
10  
11   #include "Library.hpp"
12  
# Line 17 | Line 17 | Library::Library(const _R<dbi::Connectio
17  
18   _L<cse::String> Library::GetArtists() const
19   {
20 <        _R<dbi::ResultSet> artists_(connection->Execute(_B("SELECT DISTINCT artist FROM files WHERE live = TRUE")));
20 >        _R<dbi::ResultSet> artists_(connection->Execute(_B("SELECT DISTINCT artist FROM files WHERE live = TRUE ORDER BY artist")));
21          _L<cse::String> artists;
22  
23          while (artists_->MoveNext())
# Line 28 | Line 28 | _L<cse::String> Library::GetArtists() co
28  
29   _L<cse::String> Library::GetTitles() const
30   {
31 <        _R<dbi::ResultSet> titles_(connection->Execute(_B("SELECT DISTINCT title FROM files WHERE live = TRUE")));
31 >        _R<dbi::ResultSet> titles_(connection->Execute(_B("SELECT DISTINCT title FROM files WHERE live = TRUE ORDER BY title")));
32          _L<cse::String> titles;
33  
34          while (titles_->MoveNext())
# Line 39 | Line 39 | _L<cse::String> Library::GetTitles() con
39  
40   _L<cse::String> Library::GetAlbums() const
41   {
42 <        _R<dbi::ResultSet> albums_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
42 >        _R<dbi::ResultSet> albums_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE ORDER BY album")));
43          _L<cse::String> albums;
44  
45          while (albums_->MoveNext())
# Line 50 | Line 50 | _L<cse::String> Library::GetAlbums() con
50  
51   _L<cse::String> Library::GetGenres() const
52   {
53 <        _R<dbi::ResultSet> genres_(connection->Execute(_B("SELECT DISTINCT album FROM files WHERE live = TRUE")));
53 >        _R<dbi::ResultSet> genres_(connection->Execute(_B("SELECT DISTINCT genre FROM files WHERE live = TRUE ORDER BY genre")));
54          _L<cse::String> genres;
55  
56          while (genres_->MoveNext())
# Line 61 | Line 61 | _L<cse::String> Library::GetGenres() con
61  
62   _L<MediaFolder> Library::GetFolders() const
63   {
64 <        _R<dbi::ResultSet> paths(connection->Execute(_B("SELECT DISTINCT root FROM files WHERE live = TRUE")));
64 >        _R<dbi::ResultSet> roots(connection->Execute(_B("SELECT DISTINCT root FROM files WHERE live = TRUE ORDER By root")));
65          _L<MediaFolder> folders;
66  
67 <        while (paths->MoveNext())
68 <                folders.InsertLast(MediaFolder(connection, paths->GetString(_B("path"))));
67 >        while (roots->MoveNext())
68 >                folders.InsertLast(MediaFolder(connection, roots->GetString(_B("root"))));
69  
70          return folders;
71   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines