Merge lp:~jamesh/mediascanner2/qmlplugin-updates into lp:mediascanner2

[James Henstridge]

Add genre and discNumber metadata fields to the media index, and expose it in the QML binding.

Add rowCount property and get(row, role) method to each of the model classes in the QML binding.

Updates to the QML interface for music-app.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:234
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/qmlplugin-updates/+merge/218351/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/mediascanner2/qmlplugin-updates]

235. By James Henstridge on 2014-05-08

Update qmltypes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/62/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Code-wise this looks good and can be merged.

However this increases the size of MediaFile, which means it is an ABI break. How are we dealing with this? What packages are affected and can we just transition them all in the same silo?

Also noted is that we don't have a symbols file or visibility specifications. Let's not block this MR for those but we should probably add them sooner rather than later.

review: Needs Information

[James Henstridge (jamesh)]

We will need to rebuild unity-scope-mediascanner too, yes. We don't currently have any other users. If we are settling down on a stable ABI though, we'll probably want to make a few more changes than just this (e.g. move MediaFile's members to a private struct, get rid of its big long constructor, etc). I'm not sure if we want to do this right now though.

[Jussi Pakkanen (jpakkane)]

Since we don't currently have other users than the scope, we can do this.

review: Approve

=== modified file 'src/daemon/MetadataExtractor.cc'
--- src/daemon/MetadataExtractor.cc	2014-04-03 09:05:20 +0000
+++ src/daemon/MetadataExtractor.cc	2014-05-08 07:17:36 +0000
@@ -129,6 +129,8 @@
                 mfb->setAlbum(g_value_get_string(val));
             else if (tagname == GST_TAG_ALBUM_ARTIST)
                 mfb->setAlbumArtist(g_value_get_string(val));
+            else if (tagname == GST_TAG_GENRE)
+                mfb->setGenre(g_value_get_string(val));
         } else if (G_VALUE_HOLDS(val, GST_TYPE_DATE_TIME)) {
             if (tagname == GST_TAG_DATE_TIME) {
                 GstDateTime *dt = static_cast<GstDateTime*>(g_value_get_boxed(val));
@@ -139,6 +141,8 @@
         } else if (G_VALUE_HOLDS_UINT(val)) {
             if (tagname == GST_TAG_TRACK_NUMBER) {
                 mfb->setTrackNumber(g_value_get_uint(val));
+            } else if (tagname == GST_TAG_ALBUM_VOLUME_NUMBER) {
+                mfb->setDiscNumber(g_value_get_uint(val));
             }
         }
 

=== modified file 'src/mediascanner/MediaFile.cc'
--- src/mediascanner/MediaFile.cc	2014-01-31 07:17:15 +0000
+++ src/mediascanner/MediaFile.cc	2014-05-08 07:17:36 +0000
@@ -24,9 +24,9 @@
 
 namespace mediascanner {
 
-MediaFile::MediaFile(std::string filename, std::string content_type, std::string etag, std::string title, std::string date, std::string author, std::string album, std::string album_artist,
-        int track_number, int duration, MediaType type) :
-    filename(filename), content_type(content_type), etag(etag), title(title), date(date), author(author), album(album), album_artist(album_artist), track_number(track_number), duration(duration), type(type) {
+MediaFile::MediaFile(std::string filename, std::string content_type, std::string etag, std::string title, std::string date, std::string author, std::string album, std::string album_artist, std::string genre,
+    int disc_number, int track_number, int duration, MediaType type) :
+    filename(filename), content_type(content_type), etag(etag), title(title), date(date), author(author), album(album), album_artist(album_artist), genre(genre), disc_number(disc_number), track_number(track_number), duration(duration), type(type) {
 
 }
 
@@ -62,6 +62,14 @@
     return date;
 }
 
+const std::string& MediaFile::getGenre() const noexcept {
+    return genre;
+}
+
+int MediaFile::getDiscNumber() const noexcept {
+    return disc_number;
+}
+
 int MediaFile::getTrackNumber() const noexcept {
     return track_number;
 }
@@ -88,6 +96,8 @@
         album == other.album &&
         album_artist == other.album_artist &&
         date == other.date &&
+        genre == other.genre &&
+        disc_number == other.disc_number &&
         track_number == other.track_number &&
         duration == other.duration &&
         type == other.type;

=== modified file 'src/mediascanner/MediaFile.hh'
--- src/mediascanner/MediaFile.hh	2014-01-31 03:48:16 +0000
+++ src/mediascanner/MediaFile.hh	2014-05-08 07:17:36 +0000
@@ -29,9 +29,9 @@
 public:
 
     MediaFile(std::string filename) : filename(filename), content_type(""), etag(""), title(""), date(""), author(""),
-        album(""), album_artist(""), track_number(0), duration(0), type(UnknownMedia) {}
-    MediaFile(std::string filename, std::string content_type, std::string etag, std::string title, std::string date, std::string author, std::string album, std::string album_artist,
-              int track_number, int duration, MediaType type);
+        album(""), album_artist(""), genre(""), disc_number(0), track_number(0), duration(0), type(UnknownMedia) {}
+    MediaFile(std::string filename, std::string content_type, std::string etag, std::string title, std::string date, std::string author, std::string album, std::string album_artist, std::string genre,
+              int disc_number, int track_number, int duration, MediaType type);
     MediaFile() = delete;
 
     const std::string& getFileName() const noexcept;
@@ -42,8 +42,10 @@
     const std::string& getAlbum() const noexcept;
     const std::string& getAlbumArtist() const noexcept;
     const std::string& getDate() const noexcept;
+    const std::string& getGenre() const noexcept;
     std::string getUri() const;
 
+    int getDiscNumber() const noexcept;
     int getTrackNumber() const noexcept;
     int getDuration() const noexcept;
     MediaType getType() const noexcept;
@@ -62,6 +64,8 @@
     std::string author;
     std::string album;
     std::string album_artist;
+    std::string genre;
+    int disc_number;
     int track_number;
     int duration; // In seconds.
     MediaType type;

=== modified file 'src/mediascanner/MediaFileBuilder.cc'
--- src/mediascanner/MediaFileBuilder.cc	2014-01-31 03:48:16 +0000
+++ src/mediascanner/MediaFileBuilder.cc	2014-05-08 07:17:36 +0000
@@ -37,13 +37,15 @@
     author(mf.getAuthor()),
     album(mf.getAlbum()),
     album_artist(mf.getAlbumArtist()),
+    genre(mf.getGenre()),
+    disc_number(mf.getDiscNumber()),
     track_number(mf.getTrackNumber()),
     duration(mf.getDuration()) {
 }
 
 MediaFile MediaFileBuilder::build() const {
     return MediaFile(filename, content_type, etag, title, date, author,
-            album, album_artist, track_number, duration, type);
+        album, album_artist, genre, disc_number, track_number, duration, type);
 }
 
 void MediaFileBuilder::setType(MediaType t) {
@@ -103,6 +105,20 @@
     album_artist_set = true;
 }
 
+void MediaFileBuilder::setGenre(const std::string &g) {
+    if(genre_set)
+        throw std::invalid_argument("Tried to set genre when it was already set.");
+    genre = g;
+    genre_set = true;
+}
+
+void MediaFileBuilder::setDiscNumber(int n) {
+    if(disc_number_set)
+        throw std::invalid_argument("Tried to set disc number when it was already set.");
+    disc_number = n;
+    disc_number_set = true;
+}
+
 void MediaFileBuilder::setTrackNumber(int n) {
     if(track_number_set)
         throw std::invalid_argument("Tried to set track number when it was already set.");

=== modified file 'src/mediascanner/MediaFileBuilder.hh'
--- src/mediascanner/MediaFileBuilder.hh	2014-01-31 03:48:16 +0000
+++ src/mediascanner/MediaFileBuilder.hh	2014-05-08 07:17:36 +0000
@@ -57,6 +57,8 @@
     void setAuthor(const std::string &a);
     void setAlbum(const std::string &a);
     void setAlbumArtist(const std::string &a);
+    void setGenre(const std::string &g);
+    void setDiscNumber(int n);
     void setTrackNumber(int n);
     void setDuration(int d);
 
@@ -87,11 +89,17 @@
     bool album_artist_set = false;
     std::string album_artist;
 
+    bool genre_set = false;
+    std::string genre;
+
+    bool disc_number_set = false;
+    int disc_number = 0;
+
+    bool track_number_set = false;
     int track_number = 0;
-    bool track_number_set = false;
 
+    bool duration_set = false;
     int duration = 0;
-    bool duration_set = false;
 };
 
 }

=== modified file 'src/mediascanner/MediaStore.cc'
--- src/mediascanner/MediaStore.cc	2014-03-07 08:15:52 +0000
+++ src/mediascanner/MediaStore.cc	2014-05-08 07:17:36 +0000
@@ -41,7 +41,7 @@
 
 // Increment this whenever changing db schema.
 // It will cause dbstore to rebuild its tables.
-static const int schemaVersion = 4;
+static const int schemaVersion = 5;
 
 struct MediaStorePrivate {
     sqlite3 *db;
@@ -175,9 +175,11 @@
     etag TEXT,
     title TEXT,
     date TEXT,
-    artist TEXT,       -- Only relevant to audio
-    album TEXT,        -- Only relevant to audio
-    album_artist TEXT, -- Only relevant to audio
+    artist TEXT,          -- Only relevant to audio
+    album TEXT,           -- Only relevant to audio
+    album_artist TEXT,    -- Only relevant to audio
+    genre TEXT,           -- Only relevant to audio
+    disc_number INTEGER,  -- Only relevant to audio
     track_number INTEGER, -- Only relevant to audio
     duration INTEGER,
     type INTEGER   -- 0=Audio, 1=Video
@@ -191,9 +193,11 @@
     etag TEXT,
     title TEXT,
     date TEXT,
-    artist TEXT,    -- Only relevant to audio
-    album TEXT,     -- Only relevant to audio
-    album_artist TEXT, -- Only relevant to audio
+    artist TEXT,          -- Only relevant to audio
+    album TEXT,           -- Only relevant to audio
+    album_artist TEXT,    -- Only relevant to audio
+    genre TEXT,           -- Only relevant to audio
+    disc_number INTEGER,  -- Only relevant to audio
     track_number INTEGER, -- Only relevant to audio
     duration INTEGER,
     type INTEGER   -- 0=Audio, 1=Video
@@ -283,7 +287,7 @@
 }
 
 void MediaStorePrivate::insert(const MediaFile &m) const {
-    Statement query(db, "INSERT OR REPLACE INTO media (filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type)  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    Statement query(db, "INSERT OR REPLACE INTO media (filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type)  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     string fname = m.getFileName();
     string title = m.getTitle();
     if(title.empty())
@@ -299,9 +303,11 @@
     if (album_artist.empty())
         album_artist = m.getAuthor();
     query.bind(8, album_artist);
-    query.bind(9, m.getTrackNumber());
-    query.bind(10, m.getDuration());
-    query.bind(11, (int)m.getType());
+    query.bind(9, m.getGenre());
+    query.bind(10, m.getDiscNumber());
+    query.bind(11, m.getTrackNumber());
+    query.bind(12, m.getDuration());
+    query.bind(13, (int)m.getType());
     query.step();
 
     const char *typestr = m.getType() == AudioMedia ? "song" : "video";
@@ -327,10 +333,12 @@
     const string author = query.getText(5);
     const string album = query.getText(6);
     const string album_artist = query.getText(7);
-    int track_number = query.getInt(8);
-    int duration = query.getInt(9);
-    MediaType type = (MediaType)query.getInt(10);
-    return MediaFile(filename, content_type, etag, title, date, author, album, album_artist, track_number, duration, type);
+    const string genre = query.getText(8);
+    int disc_number = query.getInt(9);
+    int track_number = query.getInt(10);
+    int duration = query.getInt(11);
+    MediaType type = (MediaType)query.getInt(12);
+    return MediaFile(filename, content_type, etag, title, date, author, album, album_artist, genre, disc_number, track_number, duration, type);
 }
 
 static vector<MediaFile> collect_media(Statement &query) {
@@ -343,7 +351,7 @@
 
 MediaFile MediaStorePrivate::lookup(const std::string &filename) const {
     Statement query(db, R"(
-SELECT filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type
+SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type
   FROM media
   WHERE filename = ?
 )");
@@ -357,7 +365,7 @@
 vector<MediaFile> MediaStorePrivate::query(const std::string &core_term, MediaType type, int limit) const {
     if (core_term == "") {
         Statement query(db, R"(
-SELECT filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type
+SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type
   FROM media
   WHERE type == ?
   LIMIT ?
@@ -367,7 +375,7 @@
         return collect_media(query);
     } else {
         Statement query(db, R"(
-SELECT filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type
+SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type
   FROM media JOIN (
     SELECT docid, rank(matchinfo(media_fts), 1.0, 0.5, 0.75) AS rank
       FROM media_fts WHERE media_fts MATCH ?
@@ -425,9 +433,9 @@
 
 vector<MediaFile> MediaStorePrivate::getAlbumSongs(const Album& album) const {
     Statement query(db, R"(
-SELECT filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type FROM media
+SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type FROM media
 WHERE album = ? AND album_artist = ? AND type = ?
-ORDER BY track_number
+ORDER BY disc_number, track_number
 )");
     query.bind(1, album.getTitle());
     query.bind(2, album.getArtist());
@@ -449,7 +457,7 @@
 
 std::vector<MediaFile> MediaStore::listSongs(const std::string& artist, const std::string& album, const std::string& album_artist, int limit) const {
     std::string qs(R"(
-SELECT filename, content_type, etag, title, date, artist, album, album_artist, track_number, duration, type
+SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, type
   FROM media
   WHERE type = ?
 )");
@@ -463,7 +471,7 @@
         qs += " AND album_artist = ?";
     }
     qs += R"(
-ORDER BY album_artist, album, track_number, title
+ORDER BY album_artist, album, disc_number, track_number, title
 LIMIT ?
 )";
     Statement query(p->db, qs.c_str());

=== modified file 'src/qml/Ubuntu/MediaScanner/AlbumModelBase.cc'
--- src/qml/Ubuntu/MediaScanner/AlbumModelBase.cc	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/AlbumModelBase.cc	2014-05-08 07:17:36 +0000
@@ -50,6 +50,10 @@
     }
 }
 
+QVariant AlbumModelBase::get(int row, AlbumModelBase::Roles role) const {
+    return data(index(row, 0), role);
+}
+
 QHash<int, QByteArray> AlbumModelBase::roleNames() const {
     return roles;
 }

=== modified file 'src/qml/Ubuntu/MediaScanner/AlbumModelBase.hh'
--- src/qml/Ubuntu/MediaScanner/AlbumModelBase.hh	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/AlbumModelBase.hh	2014-05-08 07:17:36 +0000
@@ -31,6 +31,7 @@
 class AlbumModelBase : public QAbstractListModel {
     Q_OBJECT
     Q_ENUMS(Roles)
+    Q_PROPERTY(int rowCount READ rowCount) // NOTIFY modelReset
 public:
     enum Roles {
         RoleTitle,
@@ -41,6 +42,8 @@
     explicit AlbumModelBase(QObject *parent = 0);
     int rowCount(const QModelIndex &parent=QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
+
+    Q_INVOKABLE QVariant get(int row, Roles role) const;
 protected:
     QHash<int, QByteArray> roleNames() const override;
     void updateResults(const std::vector<mediascanner::Album> &results);

=== modified file 'src/qml/Ubuntu/MediaScanner/ArtistsModel.cc'
--- src/qml/Ubuntu/MediaScanner/ArtistsModel.cc	2014-02-28 07:01:44 +0000
+++ src/qml/Ubuntu/MediaScanner/ArtistsModel.cc	2014-05-08 07:17:36 +0000
@@ -45,6 +45,10 @@
     }
 }
 
+QVariant ArtistsModel::get(int row, ArtistsModel::Roles role) const {
+    return data(index(row, 0), role);
+}
+
 QHash<int, QByteArray> ArtistsModel::roleNames() const {
     return roles;
 }

=== modified file 'src/qml/Ubuntu/MediaScanner/ArtistsModel.hh'
--- src/qml/Ubuntu/MediaScanner/ArtistsModel.hh	2014-02-28 07:01:44 +0000
+++ src/qml/Ubuntu/MediaScanner/ArtistsModel.hh	2014-05-08 07:17:36 +0000
@@ -35,6 +35,7 @@
     Q_PROPERTY(mediascanner::qml::MediaStoreWrapper* store READ getStore WRITE setStore)
     Q_PROPERTY(bool albumArtists READ getAlbumArtists WRITE setAlbumArtists)
     Q_PROPERTY(int limit READ getLimit WRITE setLimit)
+    Q_PROPERTY(int rowCount READ rowCount) // NOTIFY modelReset
 public:
     enum Roles {
         RoleArtist,
@@ -43,6 +44,8 @@
     explicit ArtistsModel(QObject *parent = 0);
     int rowCount(const QModelIndex &parent=QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
+
+    Q_INVOKABLE QVariant get(int row, Roles role) const;
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

=== modified file 'src/qml/Ubuntu/MediaScanner/MediaFileModelBase.cc'
--- src/qml/Ubuntu/MediaScanner/MediaFileModelBase.cc	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileModelBase.cc	2014-05-08 07:17:36 +0000
@@ -35,6 +35,8 @@
     roles[Roles::RoleAlbum] = "album";
     roles[Roles::RoleAlbumArtist] = "albumArtist";
     roles[Roles::RoleDate] = "date";
+    roles[Roles::RoleGenre] = "genre";
+    roles[Roles::RoleDiscNumber] = "discNumber";
     roles[Roles::RoleTrackNumber] = "trackNumber";
     roles[Roles::RoleDuration] = "duration";
     roles[Roles::RoleArt] = "art";
@@ -70,6 +72,10 @@
         return QString::fromStdString(media.getAlbumArtist());
     case RoleDate:
         return QString::fromStdString(media.getDate());
+    case RoleGenre:
+        return QString::fromStdString(media.getGenre());
+    case RoleDiscNumber:
+        return media.getDiscNumber();
     case RoleTrackNumber:
         return media.getTrackNumber();
     case RoleDuration:
@@ -81,6 +87,10 @@
     }
 }
 
+QVariant MediaFileModelBase::get(int row, MediaFileModelBase::Roles role) const {
+    return data(index(row, 0), role);
+}
+
 QHash<int, QByteArray> MediaFileModelBase::roleNames() const {
     return roles;
 }

=== modified file 'src/qml/Ubuntu/MediaScanner/MediaFileModelBase.hh'
--- src/qml/Ubuntu/MediaScanner/MediaFileModelBase.hh	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileModelBase.hh	2014-05-08 07:17:36 +0000
@@ -31,6 +31,7 @@
 class MediaFileModelBase : public QAbstractListModel {
     Q_OBJECT
     Q_ENUMS(Roles)
+    Q_PROPERTY(int rowCount READ rowCount) // NOTIFY modelReset
 public:
     enum Roles {
         RoleModelData,
@@ -43,6 +44,8 @@
         RoleAlbum,
         RoleAlbumArtist,
         RoleDate,
+        RoleGenre,
+        RoleDiscNumber,
         RoleTrackNumber,
         RoleDuration,
         RoleArt,
@@ -51,6 +54,8 @@
     explicit MediaFileModelBase(QObject *parent = 0);
     int rowCount(const QModelIndex &parent=QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
+
+    Q_INVOKABLE QVariant get(int row, Roles role) const;
 protected:
     QHash<int, QByteArray> roleNames() const override;
     void updateResults(const std::vector<mediascanner::MediaFile> &results);

=== modified file 'src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc'
--- src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc	2014-05-08 07:17:36 +0000
@@ -62,6 +62,14 @@
     return QString::fromStdString(media.getDate());
 }
 
+QString MediaFileWrapper::genre() const {
+    return QString::fromStdString(media.getGenre());
+}
+
+int MediaFileWrapper::discNumber() const {
+    return media.getDiscNumber();
+}
+
 int MediaFileWrapper::trackNumber() const {
     return media.getTrackNumber();
 }

=== modified file 'src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh'
--- src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh	2014-03-24 10:04:19 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh	2014-05-08 07:17:36 +0000
@@ -39,6 +39,8 @@
     Q_PROPERTY(QString album READ album CONSTANT)
     Q_PROPERTY(QString albumArtist READ albumArtist CONSTANT)
     Q_PROPERTY(QString date READ date CONSTANT)
+    Q_PROPERTY(QString genre READ genre CONSTANT)
+    Q_PROPERTY(int discNumber READ discNumber CONSTANT)
     Q_PROPERTY(int trackNumber READ trackNumber CONSTANT)
     Q_PROPERTY(int duration READ duration CONSTANT)
     Q_PROPERTY(QString art READ art CONSTANT)
@@ -53,6 +55,8 @@
     QString album() const;
     QString albumArtist() const;
     QString date() const;
+    QString genre() const;
+    int discNumber() const;
     int trackNumber() const;
     int duration() const;
     QString art() const;

=== modified file 'src/qml/Ubuntu/MediaScanner/plugin.qmltypes'
--- src/qml/Ubuntu/MediaScanner/plugin.qmltypes	2014-03-24 10:28:30 +0000
+++ src/qml/Ubuntu/MediaScanner/plugin.qmltypes	2014-05-08 07:17:36 +0000
@@ -18,6 +18,13 @@
                 "RoleArt": 2
             }
         }
+        Property { name: "rowCount"; type: "int"; isReadonly: true }
+        Method {
+            name: "get"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "Roles" }
+        }
     }
     Component {
         name: "mediascanner::qml::AlbumsModel"
@@ -43,6 +50,13 @@
         Property { name: "store"; type: "mediascanner::qml::MediaStoreWrapper"; isPointer: true }
         Property { name: "albumArtists"; type: "bool" }
         Property { name: "limit"; type: "int" }
+        Property { name: "rowCount"; type: "int"; isReadonly: true }
+        Method {
+            name: "get"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "Roles" }
+        }
     }
     Component {
         name: "mediascanner::qml::MediaFileModelBase"
@@ -60,11 +74,20 @@
                 "RoleAlbum": 7,
                 "RoleAlbumArtist": 8,
                 "RoleDate": 9,
-                "RoleTrackNumber": 10,
-                "RoleDuration": 11,
-                "RoleArt": 12
+                "RoleGenre": 10,
+                "RoleDiscNumber": 11,
+                "RoleTrackNumber": 12,
+                "RoleDuration": 13,
+                "RoleArt": 14
             }
         }
+        Property { name: "rowCount"; type: "int"; isReadonly: true }
+        Method {
+            name: "get"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "Roles" }
+        }
     }
     Component {
         name: "mediascanner::qml::MediaFileWrapper"
@@ -80,6 +103,8 @@
         Property { name: "album"; type: "string"; isReadonly: true }
         Property { name: "albumArtist"; type: "string"; isReadonly: true }
         Property { name: "date"; type: "string"; isReadonly: true }
+        Property { name: "genre"; type: "string"; isReadonly: true }
+        Property { name: "discNumber"; type: "int"; isReadonly: true }
         Property { name: "trackNumber"; type: "int"; isReadonly: true }
         Property { name: "duration"; type: "int"; isReadonly: true }
         Property { name: "art"; type: "string"; isReadonly: true }

=== modified file 'src/utils/scaletest.cc'
--- src/utils/scaletest.cc	2014-01-31 07:17:15 +0000
+++ src/utils/scaletest.cc	2014-05-08 07:17:36 +0000
@@ -84,7 +84,7 @@
                     track += " " + RNDWORD;
                 }
                 string fname = to_string(i) + ".mp3";
-                MediaFile mf(fname, "audio/mp3", "", track, "2013-01-01", artist, album, artist, trackCount, rnd() % 300, AudioMedia);
+                MediaFile mf(fname, "audio/mp3", "", track, "2013-01-01", artist, album, artist, "", 0, trackCount, rnd() % 300, AudioMedia);
                 store.insert(mf);
                 i++;
                 //printf("%s, %s, %s\n", artist.c_str(), album.c_str(), track.c_str());

=== modified file 'test/qml/tst_mediastore.qml'
--- test/qml/tst_mediastore.qml	2014-03-24 10:04:19 +0000
+++ test/qml/tst_mediastore.qml	2014-05-08 07:17:36 +0000
@@ -31,6 +31,8 @@
             checkAttr("album", "Spiderbait");
             checkAttr("albumArtist", "Spiderbait");
             checkAttr("date", "2013-11-15");
+            checkAttr("genre", "rock");
+            checkAttr("discNumber", 1);
             checkAttr("trackNumber", 1);
             checkAttr("duration", 235);
             checkAttr("art", "image://albumart/artist=Spiderbait&album=Spiderbait");

=== modified file 'test/qml/tst_songsearchmodel.qml'
--- test/qml/tst_songsearchmodel.qml	2014-02-25 05:54:27 +0000
+++ test/qml/tst_songsearchmodel.qml	2014-05-08 07:17:36 +0000
@@ -15,14 +15,14 @@
         query: ""
     }
 
-    ListView {
-        id: songs_view
-        model: songs_model
-    }
-
     TestCase {
         name: "SongsSearchModelTests"
-        function test_foo() {
+        function test_search() {
+            // By default, the model lists all songs.
+            compare(songs_model.rowCount, 7, "songs_model.rowCount == 7");
+            songs_model.query = "revolution";
+            compare(songs_model.rowCount, 1, "songs_model.rowCount == 1");
+            compare(songs_model.get(0, SongsSearchModel.RoleTitle), "Revolution");
         }
     }
 }

=== modified file 'test/test_mediastore.cc'
--- test/test_mediastore.cc	2014-03-07 08:13:07 +0000
+++ test/test_mediastore.cc	2014-05-08 07:17:36 +0000
@@ -54,11 +54,11 @@
 }
 
 TEST_F(MediaStoreTest, equality) {
-    MediaFile audio1("a", "type", "etag", "1900", "b", "c", "d", "e", 1, 5, AudioMedia);
-    MediaFile audio2("aa", "type", "etag", "1900", "b", "c", "d", "e", 1, 5, AudioMedia);
+    MediaFile audio1("a", "type", "etag", "1900", "b", "c", "d", "e", "f", 0, 1, 5, AudioMedia);
+    MediaFile audio2("aa", "type", "etag", "1900", "b", "c", "d", "e", "f", 0, 1, 5, AudioMedia);
 
-    MediaFile video1("a", "type", "etag", "b", "1900", "c", "d", "e", 0, 5, VideoMedia);
-    MediaFile video2("aa", "type", "etag", "b", "1900", "c", "d", "e", 0, 5, VideoMedia);
+    MediaFile video1("a", "type", "etag", "b", "1900", "c", "d", "e", "f", 0, 0, 5, VideoMedia);
+    MediaFile video2("aa", "type", "etag", "b", "1900", "c", "d", "e", "f", 0, 0, 5, VideoMedia);
 
     EXPECT_EQ(audio1, audio1);
     EXPECT_EQ(video1, video1);
@@ -70,7 +70,7 @@
 }
 
 TEST_F(MediaStoreTest, lookup) {
-    MediaFile audio("aaa", "type", "etag", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", 3, 5, AudioMedia);
+    MediaFile audio("aaa", "type", "etag", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", "fff", 0, 3, 5, AudioMedia);
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio);
 
@@ -79,8 +79,8 @@
 }
 
 TEST_F(MediaStoreTest, roundtrip) {
-    MediaFile audio("aaa", "type", "etag", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", 3, 5, AudioMedia);
-    MediaFile video("aaa2", "type", "etag", "bbb bbb", "2012-01-01", "ccc", "ddd", "eee", 0, 5, VideoMedia);
+    MediaFile audio("aaa", "type", "etag", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", "fff", 0, 3, 5, AudioMedia);
+    MediaFile video("aaa2", "type", "etag", "bbb bbb", "2012-01-01", "ccc", "ddd", "eee", "fff", 0, 0, 5, VideoMedia);
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio);
     store.insert(video);
@@ -93,7 +93,7 @@
 }
 
 TEST_F(MediaStoreTest, query_by_album) {
-    MediaFile audio("/path/foo.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio("/path/foo.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", "genre", 0, 3, 5, AudioMedia);
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio);
 
@@ -103,7 +103,7 @@
  }
 
 TEST_F(MediaStoreTest, query_by_artist) {
-    MediaFile audio("/path/foo.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio("/path/foo.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio);
 
@@ -113,18 +113,18 @@
  }
 
 TEST_F(MediaStoreTest, query_ranking) {
-   MediaFile audio1("/path/foo1.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
-   MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
-   MediaFile audio3("/path/foo3.ogg", "", "", "title", "1900-01-01", "artist aaa", "album", "albumartist", 3, 5, AudioMedia);
-   MediaFile audio4("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", 3, 5, AudioMedia);
-   MediaFile audio5("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio1("/path/foo1.ogg", "", "", "title", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio3("/path/foo3.ogg", "", "", "title", "1900-01-01", "artist aaa", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio4("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio5("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
 
-   MediaStore store(":memory:", MS_READ_WRITE);
-   store.insert(audio1);
-   store.insert(audio2);
-   store.insert(audio3);
-   store.insert(audio4);
-   store.insert(audio5);
+    MediaStore store(":memory:", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+    store.insert(audio3);
+    store.insert(audio4);
+    store.insert(audio5);
 
     vector<MediaFile> result = store.query("aaa", AudioMedia);
     ASSERT_EQ(result.size(), 4);
@@ -135,9 +135,9 @@
 }
 
 TEST_F(MediaStoreTest, query_limit) {
-    MediaFile audio1("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", 3, 5, AudioMedia);
-    MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
-    MediaFile audio3("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio1("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio3("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -151,8 +151,8 @@
 }
 
 TEST_F(MediaStoreTest, query_short) {
-    MediaFile audio1("/path/foo5.ogg", "", "", "title xyz", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
-    MediaFile audio2("/path/foo2.ogg", "", "", "title xzy", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio1("/path/foo5.ogg", "", "", "title xyz", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio2("/path/foo2.ogg", "", "", "title xzy", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -165,9 +165,9 @@
 }
 
 TEST_F(MediaStoreTest, query_empty) {
-    MediaFile audio1("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", 3, 5, AudioMedia);
-    MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", 3, 5, AudioMedia);
-    MediaFile audio3("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", 3, 5, AudioMedia);
+    MediaFile audio1("/path/foo5.ogg", "", "", "title aaa", "1900-01-01", "artist aaa", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio2("/path/foo2.ogg", "", "", "title aaa", "1900-01-01", "artist", "album", "albumartist", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio3("/path/foo4.ogg", "", "", "title", "1900-01-01", "artist", "album aaa", "albumartist", "genre", 1, 3, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -180,8 +180,8 @@
 }
 
 TEST_F(MediaStoreTest, unmount) {
-    MediaFile audio1("/media/username/dir/fname.ogg", "", "", "bbb bbb", "2000-01-01", "ccc", "ddd", "eee", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/fname.ogg", "", "", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", 42, 5, AudioMedia);
+    MediaFile audio1("/media/username/dir/fname.ogg", "", "", "bbb bbb", "2000-01-01", "ccc", "ddd", "eee", "ffff", 0, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/fname.ogg", "", "", "bbb bbb", "1900-01-01", "ccc", "ddd", "eee", "ffff", 0, 42, 5, AudioMedia);
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
@@ -210,10 +210,10 @@
 }
 
 TEST_F(MediaStoreTest, queryAlbums) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", 2, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", 3, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", 1, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", "genre", 1, 2, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", "genre", 1, 1, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -241,10 +241,10 @@
 }
 
 TEST_F(MediaStoreTest, queryAlbums_limit) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", 2, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", 3, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", 1, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", "genre", 1, 2, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", "genre", 1, 1, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -259,10 +259,10 @@
 }
 
 TEST_F(MediaStoreTest, queryAlbums_empty) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", 2, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", 3, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", 1, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", "genre", 1, 2, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/fname.ogg", "", "", "TitleFour", "1900-01-01", "ArtistFour", "AlbumTwo", "ArtistFour", "genre", 1, 1, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -277,9 +277,9 @@
 }
 
 TEST_F(MediaStoreTest, getAlbumSongs) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", 2, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", 3, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistTwo", "AlbumOne", "Various Artists", "genre", 1, 2, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistThree", "AlbumOne", "Various Artists", "genre", 1, 3, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -295,7 +295,7 @@
 }
 
 TEST_F(MediaStoreTest, getETag) {
-    MediaFile file("/path/file.ogg", "audio/ogg", "etag", "title", "2013", "artist", "album", "artist", 1, 5, AudioMedia);
+    MediaFile file("/path/file.ogg", "audio/ogg", "etag", "title", "2013", "artist", "album", "artist", "genre", 1, 1, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(file);
@@ -305,12 +305,12 @@
 }
 
 TEST_F(MediaStoreTest, listSongs) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", 2, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", 3, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", 1, 5, AudioMedia);
-    MediaFile audio5("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio6("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", 2, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track2.ogg", "", "", "TitleTwo", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", "genre", 1, 2, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio5("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio6("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", "genre", 1, 2, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -352,11 +352,11 @@
 }
 
 TEST_F(MediaStoreTest, listAlbums) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", 3, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", 1, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio5("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", 2, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio5("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", "genre", 1, 2, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);
@@ -387,11 +387,11 @@
 }
 
 TEST_F(MediaStoreTest, listArtists) {
-    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", 1, 5, AudioMedia);
-    MediaFile audio2("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", 3, 5, AudioMedia);
-    MediaFile audio3("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", 1, 5, AudioMedia);
-    MediaFile audio4("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", 1, 5, AudioMedia);
-    MediaFile audio5("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", 2, 5, AudioMedia);
+    MediaFile audio1("/home/username/Music/track1.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumOne", "ArtistOne", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio2("/home/username/Music/track3.ogg", "", "", "TitleThree", "1900-01-01", "ArtistOne", "AlbumTwo", "ArtistOne", "genre", 1, 3, 5, AudioMedia);
+    MediaFile audio3("/home/username/Music/track4.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumThree", "ArtistTwo", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio4("/home/username/Music/track5.ogg", "", "", "TitleOne", "1900-01-01", "ArtistOne", "AlbumFour", "Various Artists", "genre", 1, 1, 5, AudioMedia);
+    MediaFile audio5("/home/username/Music/track6.ogg", "", "", "TitleFour", "1900-01-01", "ArtistTwo", "AlbumFour", "Various Artists", "genre", 1, 2, 5, AudioMedia);
 
     MediaStore store(":memory:", MS_READ_WRITE);
     store.insert(audio1);

=== modified file 'test/test_qml.cc'
--- test/test_qml.cc	2014-02-25 05:54:27 +0000
+++ test/test_qml.cc	2014-05-08 07:17:36 +0000
@@ -29,28 +29,28 @@
 
         store.insert(MediaFile("/path/foo1.ogg", "audio/ogg", "etag",
                                "Straight Through The Sun", "2013-11-15", "Spiderbait",
-                               "Spiderbait", "Spiderbait", 1, 235, AudioMedia));
+                               "Spiderbait", "Spiderbait", "rock", 1, 1, 235, AudioMedia));
         store.insert(MediaFile("/path/foo2.ogg", "audio/ogg", "etag",
                                "It's Beautiful", "2013-11-15", "Spiderbait",
-                               "Spiderbait", "Spiderbait", 2, 220, AudioMedia));
+                               "Spiderbait", "Spiderbait", "rock", 1, 2, 220, AudioMedia));
 
         store.insert(MediaFile("/path/foo3.ogg", "audio/ogg", "etag",
                                "Buy Me a Pony", "1996-10-04", "Spiderbait",
-                               "Ivy and the Big Apples", "Spiderbait", 3, 104, AudioMedia));
+                               "Ivy and the Big Apples", "Spiderbait", "rock", 1, 3, 104, AudioMedia));
 
         store.insert(MediaFile("/path/foo4.ogg", "audio/ogg", "etag",
                                "Peaches & Cream", "2004-03-08", "The John Butler Trio",
-                               "Sunrise Over Sea", "The John Butler Trio", 2, 407, AudioMedia));
+                               "Sunrise Over Sea", "The John Butler Trio", "roots", 1, 2, 407, AudioMedia));
         store.insert(MediaFile("/path/foo5.ogg", "audio/ogg", "etag",
                                "Zebra", "2004-03-08", "The John Butler Trio",
-                               "Sunrise Over Sea", "The John Butler Trio", 10, 237, AudioMedia));
+                               "Sunrise Over Sea", "The John Butler Trio", "roots", 1, 10, 237, AudioMedia));
 
         store.insert(MediaFile("/path/foo6.ogg", "audio/ogg", "etag",
                                "Revolution", "2010-01-01", "The John Butler Trio",
-                               "April Uprising", "The John Butler Trio", 1, 305, AudioMedia));
+                               "April Uprising", "The John Butler Trio", "roots", 1, 1, 305, AudioMedia));
         store.insert(MediaFile("/path/foo7.ogg", "audio/ogg", "etag",
                                "One Way Road", "2010-01-01", "The John Butler Trio",
-                               "April Uprising", "The John Butler Trio", 2, 185, AudioMedia));
+                               "April Uprising", "The John Butler Trio", "roots", 1, 2, 185, AudioMedia));
     }
 
 private: