X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=blobdiff_plain;f=src%2Ffilestorage.cpp;h=f32f47d49b97d03b399c6731ad2e580d86df4b1a;hp=f383a1c7988e67081e65d98ae955b1b5d5f63d18;hb=a33363a44394be6efff8593737eaa53efd9b6c01;hpb=c92d96e01d110d72cee8e8d307667507bf5d6fff

diff --git a/src/filestorage.cpp b/src/filestorage.cpp
index f383a1c..f32f47d 100644
--- a/src/filestorage.cpp
+++ b/src/filestorage.cpp
@@ -20,11 +20,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");
 	if (playlistFile.exists()) {
 		playlist.setName(name);
+		playlistFile.open(QFile::ReadOnly);
 		QTextStream stream(&playlistFile);
 		QString buffer = stream.readLine();
 		int index = 0;
@@ -32,13 +33,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,7 +60,8 @@ QStringList FileStorage::getPlaylistsNames() {
 		QFileInfo info(entry);
 		QString suffix = info.suffix().toLower();
 		if (suffix == _PLAYLIST_FILE_EXTENSION_) {
-			playlistNames.append(info.fileName());
+			playlistNames.append(info.fileName()
+								 .replace(QString(".%1").arg(_PLAYLIST_FILE_EXTENSION_), "", Qt::CaseInsensitive));
 		}
 	}
 	return playlistNames;