Implemented playback.

[someplayer] / src / filestorage.cpp

diff --git a/src/filestorage.cpp b/src/filestorage.cpp
index f383a1c..f1e5222 100644 (file)
--- a/src/filestorage.cpp
+++ b/src/filestorage.cpp
@@ -4,6 +4,7 @@
 #include <QFileInfo>
 #include <QTextStream>
 #include <QRegExp>
+#include <QDebug>
 
 using namespace SomePlayer::Storage;
 using namespace SomePlayer::DataObjects;
@@ -12,6 +13,12 @@ FileStorage::FileStorage(QString path) {
        _path_prefix = path;
        _meta_regexp.setPattern("#META \\[(\\d+)\\].*::(.+)::,::(.+)::,::(.+)::");
        _path_regexp.setPattern("#PATH (.+)");
+
+       Playlist current = getCurrentPlaylist();
+       if (current.name() == PLAYLIST_BAD_NAME) {
+               current.setName(_CURRENT_PLAYLIST_NAME_);
+               saveCurrentPlaylist(current);
+       }
 }
 
 QList<Playlist> FileStorage::getPlaylists() {
@@ -20,11 +27,12 @@ QList<Playlist> FileStorage::getPlaylists() {
 }
 
 Playlist FileStorage::getPlaylist(QString name) {
-       QFile playlistFile (_path_prefix+"/"+name+_PLAYLIST_FILE_EXTENSION_);
+       QFile playlistFile (_path_prefix+"/"+name+"."+_PLAYLIST_FILE_EXTENSION_);
        Playlist playlist;
-       playlist.setName("Bad playlist");
+       playlist.setName(PLAYLIST_BAD_NAME);
        if (playlistFile.exists()) {
                playlist.setName(name);
+               playlistFile.open(QFile::ReadOnly);
                QTextStream stream(&playlistFile);
                QString buffer = stream.readLine();
                int index = 0;
@@ -32,13 +40,13 @@ Playlist FileStorage::getPlaylist(QString name) {
                        while (!stream.atEnd()) {
                                buffer = stream.readLine();
                                if (_meta_regexp.indexIn(buffer) != -1) {
-                                       int seconds = _meta_regexp.cap(0).toInt();
-                                       QString artist = _meta_regexp.cap(1);
-                                       QString album = _meta_regexp.cap(2);
-                                       QString title = _meta_regexp.cap(3);
+                                       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);
                                        buffer = stream.readLine();
                                        if (_path_regexp.indexIn(buffer) != -1) {
-                                               QString source = _path_regexp.cap(0);
+                                               QString source = _path_regexp.cap(1);
                                                TrackMetadata meta(title, artist, album, seconds);
                                                Track track(index++, meta, source);
                                                playlist.addTrack(track);
@@ -59,18 +67,20 @@ QStringList FileStorage::getPlaylistsNames() {
                QFileInfo info(entry);
                QString suffix = info.suffix().toLower();
                if (suffix == _PLAYLIST_FILE_EXTENSION_) {
-                       playlistNames.append(info.fileName());
+                       QString name = info.fileName().replace(QString(".%1").arg(_PLAYLIST_FILE_EXTENSION_), "", Qt::CaseInsensitive);
+                       playlistNames.append(name);
                }
        }
        return playlistNames;
 }
 
 void FileStorage::savePlaylist(Playlist playlist) {
-       QString filename = _path_prefix+playlist.name()+_PLAYLIST_FILE_EXTENSION_;
+       QString filename = _path_prefix + "/" +playlist.name()+"."_PLAYLIST_FILE_EXTENSION_;
        QFile playlistFile(filename);
        if (playlistFile.exists()) {
                playlistFile.remove();
        }
+       playlistFile.open(QFile::WriteOnly);
        QTextStream stream(&playlistFile);
        stream << _PLAYLIST_SIGNATURE_ << endl;
        const QList<Track> &tracks = playlist.tracks();