Implemented dynamic playlists

[someplayer] / src / filestorage.cpp

diff --git a/src/filestorage.cpp b/src/filestorage.cpp
index f1e5222..93c7261 100644 (file)
--- a/src/filestorage.cpp
+++ b/src/filestorage.cpp
@@ -11,7 +11,7 @@ using namespace SomePlayer::DataObjects;
 
 FileStorage::FileStorage(QString path) {
        _path_prefix = path;
-       _meta_regexp.setPattern("#META \\[(\\d+)\\].*::(.+)::,::(.+)::,::(.+)::");
+       _meta_regexp.setPattern("#META\\ +\\[(\\d+)\\]\\[(\\d+)\\].*::(.+)::,::(.+)::,::(.+)::");
        _path_regexp.setPattern("#PATH (.+)");
 
        Playlist current = getCurrentPlaylist();
@@ -35,20 +35,20 @@ Playlist FileStorage::getPlaylist(QString name) {
                playlistFile.open(QFile::ReadOnly);
                QTextStream stream(&playlistFile);
                QString buffer = stream.readLine();
-               int index = 0;
                if (buffer.startsWith(_PLAYLIST_SIGNATURE_)) {
                        while (!stream.atEnd()) {
                                buffer = stream.readLine();
                                if (_meta_regexp.indexIn(buffer) != -1) {
-                                       int seconds = _meta_regexp.cap(1).toInt();
-                                       QString artist = _meta_regexp.cap(2);
-                                       QString album = _meta_regexp.cap(3);
-                                       QString title = _meta_regexp.cap(4);
+                                       int id = _meta_regexp.cap(1).toInt();
+                                       int seconds = _meta_regexp.cap(2).toInt();
+                                       QString artist = _meta_regexp.cap(3);
+                                       QString album = _meta_regexp.cap(4);
+                                       QString title = _meta_regexp.cap(5);
                                        buffer = stream.readLine();
                                        if (_path_regexp.indexIn(buffer) != -1) {
                                                QString source = _path_regexp.cap(1);
                                                TrackMetadata meta(title, artist, album, seconds);
-                                               Track track(index++, meta, source);
+                                               Track track(id, meta, source);
                                                playlist.addTrack(track);
                                        }
                                }
@@ -85,8 +85,9 @@ void FileStorage::savePlaylist(Playlist playlist) {
        stream << _PLAYLIST_SIGNATURE_ << endl;
        const QList<Track> &tracks = playlist.tracks();
        foreach (Track track, tracks) {
-               stream << _PLAYLIST_META_KEYWORD_ << " [" << track.metadata().length() << "],::" << track.metadata().artist()
-                               << "::,::" << track.metadata().album() << "::,::" << track.metadata().title() << "::" << endl;
+               stream << _PLAYLIST_META_KEYWORD_ << " [" << track.id() << "]" << "[" << track.metadata().length() << "],::"
+                               << track.metadata().artist() << "::,::" << track.metadata().album() << "::,::"
+                               << track.metadata().title() << "::" << endl;
                stream << _PLAYLIST_PATH_KEYWORD_ << " " << track.source() << endl;
        }
 }