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

Comparing DecentralizedMedia/MediaFolder.cpp (file contents):
Revision 546 by douglas, 2005-07-03T22:13: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 "MediaFolder.hpp"
12 + #include "Share.hpp"
13  
14   MediaFolder::MediaFolder(const _R<dbi::Connection>& connection, const api::Path& path) : connection(connection), path(path)
15   {
# Line 34 | Line 35 | MediaFolder::MediaFolder(const _R<dbi::C
35                          connection->Parse(_B("INSERT INTO folders (path, folder, root) VALUES (?, NULL, ?)"))->Execute(path.GetPath(), root.GetPath());
36   }
37  
38 + cse::String MediaFolder::GetName() const
39 + {
40 +        if (path == root && path.GetPath().StartsWithAll(Share::shares.GetPath()))
41 +        {
42 +                api::Address address(api::Address::Resolve(path.GetParent().GetName(), _B("6996")).First());
43 +                cse::String host, port;
44 +
45 +                address.ToString(host, port, true);
46 +
47 +                return _S<ios::String>() << _B("Share from ") << host;
48 +        }
49 +        else
50 +                return path.GetName();
51 + }
52 +
53   _L<MediaFile> MediaFolder::GetFiles() const
54   {
55 <        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM files WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
55 >        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM files WHERE live = TRUE AND folder = ? ORDER BY path"))->Execute(path.GetPath()));
56          _L<MediaFile> files;
57  
58          while (paths->MoveNext())
# Line 47 | Line 63 | _L<MediaFile> MediaFolder::GetFiles() co
63  
64   _L<MediaFolder> MediaFolder::GetFolders() const
65   {
66 <        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM folders WHERE live = TRUE AND folder = ?"))->Execute(path.GetPath()));
66 >        _R<dbi::ResultSet> paths(connection->Parse(_B("SELECT path FROM folders WHERE folder = ? ORDER BY path"))->Execute(path.GetPath()));
67          _L<MediaFolder> folders;
68  
69          while (paths->MoveNext())

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines