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

diff --git a/src/filestorage.cpp b/src/filestorage.cpp
index f383a1c..3dab290 100644
--- a/src/filestorage.cpp
+++ b/src/filestorage.cpp
@@ -1,3 +1,22 @@
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 #include "filestorage.h"
 #include <QDir>
 #include <QDirIterator>
@@ -10,8 +29,14 @@ 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();
+	if (current.name() == PLAYLIST_BAD_NAME) {
+		current.setName(_CURRENT_PLAYLIST_NAME_);
+		saveCurrentPlaylist(current);
+	}
 }
 
 QList<Playlist> FileStorage::getPlaylists() {
@@ -20,27 +45,30 @@ QList<Playlist> FileStorage::getPlaylists() {
 }
 
 Playlist FileStorage::getPlaylist(QString name) {
-	QFile playlistFile (_path_prefix+"/"+name+_PLAYLIST_FILE_EXTENSION_);
+	if (name == _CURRENT_PLAYLIST_SUBST_)
+		name = _CURRENT_PLAYLIST_NAME_;
+	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;
 		if (buffer.startsWith(_PLAYLIST_SIGNATURE_)) {
 			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 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(0);
+						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);
 					}
 				}
@@ -59,24 +87,32 @@ 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);
+			if (name == _CURRENT_PLAYLIST_NAME_)
+			    name = _CURRENT_PLAYLIST_SUBST_;
+			playlistNames.append(name);
 		}
 	}
 	return playlistNames;
 }
 
 void FileStorage::savePlaylist(Playlist playlist) {
-	QString filename = _path_prefix+playlist.name()+_PLAYLIST_FILE_EXTENSION_;
+	QString name = playlist.name();
+	if (playlist.name() == _CURRENT_PLAYLIST_SUBST_)
+		name = _CURRENT_PLAYLIST_NAME_;
+	QString filename = _path_prefix + "/" +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();
 	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;
 	}
 }
@@ -88,7 +124,8 @@ void FileStorage::removePlaylist(Playlist playlist) {
 }
 
 void FileStorage::removePlaylist(QString name) {
-	QString filename = _path_prefix + "/" + name + "." + _PLAYLIST_FILE_EXTENSION_;
+	QString filename = _path_prefix + "/" + (name == _CURRENT_PLAYLIST_SUBST_ ? _CURRENT_PLAYLIST_NAME_ : name)
+			   + "." + _PLAYLIST_FILE_EXTENSION_;
 	QFile file(filename);
 	file.remove();
 }