From c92d96e01d110d72cee8e8d307667507bf5d6fff Mon Sep 17 00:00:00 2001 From: Nikolay Tischenko Date: Mon, 6 Sep 2010 00:21:13 +0700 Subject: [PATCH] Implemented playlist storage added track length to model and database --- someplayer.pro | 1 - someplayer.pro.user | 2 +- src/dbstorage.cpp | 44 ++++++++++++++++-------- src/dbstorage.h | 2 +- src/filestorage.cpp | 78 ++++++++++++++++++++++++++++++++++++++++-- src/filestorage.h | 22 ++++++++++-- src/library.cpp | 15 ++++++-- src/library.h | 3 ++ src/mainwindow.cpp | 6 ++++ src/mediascanner.cpp | 2 +- src/playlist.cpp | 2 +- src/playlist.h | 2 +- src/storage.cpp | 1 - src/storage.h | 6 ---- src/tagresolver.cpp | 20 +++++------ src/tagresolver.h | 41 ++++++++++++---------- src/trackmetainformation.cpp | 12 ++++++- src/trackmetainformation.h | 5 ++- 18 files changed, 200 insertions(+), 64 deletions(-) delete mode 100644 src/storage.cpp diff --git a/someplayer.pro b/someplayer.pro index d6ad5bc..3a3ad14 100644 --- a/someplayer.pro +++ b/someplayer.pro @@ -17,7 +17,6 @@ SOURCES += src/main.cpp\ src/trackmetainformation.cpp \ src/playlist.cpp \ src/library.cpp \ - src/storage.cpp \ src/filestorage.cpp \ src/dbstorage.cpp \ src/mediascanner.cpp \ diff --git a/someplayer.pro.user b/someplayer.pro.user index 4082206..2d3304b 100644 --- a/someplayer.pro.user +++ b/someplayer.pro.user @@ -202,7 +202,7 @@ 1 - 2010-09-05T16:54:31 + 2010-09-05T23:00:23 1 diff --git a/src/dbstorage.cpp b/src/dbstorage.cpp index 7c6af3a..4921371 100644 --- a/src/dbstorage.cpp +++ b/src/dbstorage.cpp @@ -25,34 +25,34 @@ void DbStorage::_prepare_queries() { _get_albums_for_artist_query->prepare("SELECT name FROM album WHERE artist_id in (SELECT id from artist WHERE name = :name);"); _get_tracks_for_album_query = new QSqlQuery(db); - _get_tracks_for_album_query->prepare("SELECT id, title, source, count FROM tracks WHERE artist_id IN " + _get_tracks_for_album_query->prepare("SELECT id, title, source, count, length FROM tracks WHERE artist_id IN " "(SELECT id FROM artist WHERE name = :artist_name) AND album_id IN " "(SELECT id FROM album WHERE name =: album_name);"); _get_favorites_query = new QSqlQuery(db); - _get_favorites_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count FROM " - "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id FROM " + _get_favorites_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count, length FROM " + "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id, length FROM " "tracks JOIN artist ON tracks.artist_id = artist.id) " "JOIN album ON album_id = album.id WHERE track_id IN " "(SELECT track_id FROM favorites);"); _get_most_played_query = new QSqlQuery(db); - _get_most_played_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count FROM " - "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id FROM " + _get_most_played_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count, length FROM " + "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id, length FROM " "tracks JOIN artist ON tracks.artist_id = artist.id) " "JOIN album ON album_id = album.id ORDER BY count DESC " "LIMIT 0, :max"); _get_never_played_query = new QSqlQuery(db); - _get_never_played_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count FROM " - "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id FROM " + _get_never_played_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count, length FROM " + "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id, length FROM " "tracks JOIN artist ON tracks.artist_id = artist.id) " "JOIN album ON album_id = album.id " "WHERE count = 0"); _get_recently_added_query = new QSqlQuery(db); - _get_recently_added_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count FROM " - "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id FROM " + _get_recently_added_query->prepare("SELECT track_id as id, title, artist, album.name as album, source, count, length FROM " + "(SELECT tracks.id AS track_id, artist.name AS artist, title, count, source, tracks.album_id, length FROM " "tracks JOIN artist ON tracks.artist_id = artist.id) " "JOIN album ON album_id = album.id " "WHERE track_id IN " @@ -73,7 +73,7 @@ void DbStorage::_prepare_queries() { _insert_album_query->prepare("INSERT INTO album (name, artist_id) values (:name, :artist_id)"); _insert_track_query = new QSqlQuery(db); - _insert_track_query->prepare("INSERT INTO tracks (title, artist_id, album_id, source) values (:title, :artist_id, :album_id, :source)"); + _insert_track_query->prepare("INSERT INTO tracks (title, artist_id, album_id, source, length) values (:title, :artist_id, :album_id, :source, :length)"); _insert_date_query = new QSqlQuery(db); _insert_date_query->prepare("INSERT INTO adding_date (track_id, date) values (:track_id, strftime('%s', 'now'))"); @@ -95,6 +95,7 @@ void DbStorage::_create_database_structure() { "title text, " "source text, " "count integer default 0, " + "length integer default 0, " "foreign key(artist_id) references artist(id), " "foreign key(album_id) references album(id) " ");"); @@ -115,6 +116,13 @@ DbStorage::~DbStorage() { delete _get_never_played_query; delete _get_recently_added_query; delete _get_tracks_for_album_query; + delete _check_album_query; + delete _check_artist_query; + delete _check_track_query; + delete _insert_album_query; + delete _insert_artist_query; + delete _insert_date_query; + delete _insert_track_query; db.close(); } @@ -153,7 +161,8 @@ QList DbStorage::getTracksForAlbum(QString album, QString artist) { QString title = query->value(1).toString(); QString source = query->value(2).toString(); int count = query->value(3).toInt(); - TrackMetadata meta (title, artist, album); + int length = query->value(4).toInt(); + TrackMetadata meta (title, artist, album, length); Track track(id, meta, source); track.setCount(count); tracks.append(track); @@ -173,7 +182,8 @@ Playlist DbStorage::getFavorites() { QString album = query->value(3).toString(); QString source = query->value(4).toString(); int count = query->value(5).toInt(); - TrackMetadata meta(title, artist, album); + int length = query->value(6).toInt(); + TrackMetadata meta(title, artist, album, length); Track track(id, meta, source); track.setCount(count); playlist.addTrack(track); @@ -194,7 +204,8 @@ Playlist DbStorage::getMostPlayed() { QString album = query->value(3).toString(); QString source = query->value(4).toString(); int count = query->value(5).toInt(); - TrackMetadata meta(title, artist, album); + int length = query->value(6).toInt(); + TrackMetadata meta(title, artist, album, length); Track track(id, meta, source); track.setCount(count); playlist.addTrack(track); @@ -215,7 +226,8 @@ Playlist DbStorage::getNeverPlayed() { QString album = query->value(3).toString(); QString source = query->value(4).toString(); int count = query->value(5).toInt(); - TrackMetadata meta(title, artist, album); + int length = query->value(6).toInt(); + TrackMetadata meta(title, artist, album, length); Track track(id, meta, source); track.setCount(count); playlist.addTrack(track); @@ -236,7 +248,8 @@ Playlist DbStorage::getRecentlyAdded() { QString album = query->value(3).toString(); QString source = query->value(4).toString(); int count = query->value(5).toInt(); - TrackMetadata meta(title, artist, album); + int length = query->value(6).toInt(); + TrackMetadata meta(title, artist, album, length); Track track(id, meta, source); track.setCount(count); playlist.addTrack(track); @@ -282,6 +295,7 @@ void DbStorage::addTrack(Track track) { query->bindValue(":artist_id", artist_id); query->bindValue(":album_id", album_id); query->bindValue(":source", source); + query->bindValue(":length", track.metadata().length()); if (query->exec()) { //ok query = _check_track_query; diff --git a/src/dbstorage.h b/src/dbstorage.h index 76041d6..7b771b0 100644 --- a/src/dbstorage.h +++ b/src/dbstorage.h @@ -19,7 +19,7 @@ using SomePlayer::DataObjects::Track; namespace SomePlayer { namespace Storage { - class DbStorage : public Storage { + class DbStorage { public: DbStorage(QString path); ~DbStorage(); diff --git a/src/filestorage.cpp b/src/filestorage.cpp index 27df605..f383a1c 100644 --- a/src/filestorage.cpp +++ b/src/filestorage.cpp @@ -1,9 +1,17 @@ #include "filestorage.h" +#include +#include +#include +#include +#include using namespace SomePlayer::Storage; +using namespace SomePlayer::DataObjects; FileStorage::FileStorage(QString path) { _path_prefix = path; + _meta_regexp.setPattern("#META \\[(\\d+)\\].*::(.+)::,::(.+)::,::(.+)::"); + _path_regexp.setPattern("#PATH (.+)"); } QList FileStorage::getPlaylists() { @@ -11,19 +19,85 @@ QList FileStorage::getPlaylists() { return stub; } +Playlist FileStorage::getPlaylist(QString name) { + QFile playlistFile (_path_prefix+"/"+name+_PLAYLIST_FILE_EXTENSION_); + Playlist playlist; + playlist.setName("Bad playlist"); + if (playlistFile.exists()) { + playlist.setName(name); + 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); + buffer = stream.readLine(); + if (_path_regexp.indexIn(buffer) != -1) { + QString source = _path_regexp.cap(0); + TrackMetadata meta(title, artist, album, seconds); + Track track(index++, meta, source); + playlist.addTrack(track); + } + } + } + } + } + return playlist; +} + +QStringList FileStorage::getPlaylistsNames() { + QDir directory(_path_prefix); + QDirIterator iterator(directory, QDirIterator::FollowSymlinks); + QStringList playlistNames; + while (iterator.hasNext()) { + QString entry = iterator.next(); + QFileInfo info(entry); + QString suffix = info.suffix().toLower(); + if (suffix == _PLAYLIST_FILE_EXTENSION_) { + playlistNames.append(info.fileName()); + } + } + return playlistNames; +} + void FileStorage::savePlaylist(Playlist playlist) { + QString filename = _path_prefix+playlist.name()+_PLAYLIST_FILE_EXTENSION_; + QFile playlistFile(filename); + if (playlistFile.exists()) { + playlistFile.remove(); + } + QTextStream stream(&playlistFile); + stream << _PLAYLIST_SIGNATURE_ << endl; + const QList &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_PATH_KEYWORD_ << " " << track.source() << endl; + } } void FileStorage::removePlaylist(Playlist playlist) { + QString filename = _path_prefix + "/" + playlist.name() + "." + _PLAYLIST_FILE_EXTENSION_; + QFile file(filename); + file.remove(); } void FileStorage::removePlaylist(QString name) { + QString filename = _path_prefix + "/" + name + "." + _PLAYLIST_FILE_EXTENSION_; + QFile file(filename); + file.remove(); } Playlist FileStorage::getCurrentPlaylist() { - Playlist stub; - return stub; + return getPlaylist(_CURRENT_PLAYLIST_NAME_); } void FileStorage::saveCurrentPlaylist(Playlist playlist) { + playlist.setName(_CURRENT_PLAYLIST_NAME_); + savePlaylist(playlist); } diff --git a/src/filestorage.h b/src/filestorage.h index 144828e..e8b8a23 100644 --- a/src/filestorage.h +++ b/src/filestorage.h @@ -4,9 +4,23 @@ #include "someplayer.h" #include "storage.h" #include "playlist.h" +#include #define _CURRENT_PLAYLIST_NAME_ "___current" -#define _PLAYLIST_FILE_EXTENSION_ ".m3u" +#define _PLAYLIST_FILE_EXTENSION_ "spls" +#define _PLAYLIST_SIGNATURE_ "#SOMEPLAYLIST" +#define _PLAYLIST_META_KEYWORD_ "#META" +#define _PLAYLIST_PATH_KEYWORD_ "#PATH" + +// format: +/* + #SOMEPLAYLIST + #META [seconds],::artist::,::album::,::title:: + #PATH file_path + #META [seconds],::artist::,::album::,::title:: + #PATH file_path + ... + */ // represents file-level storage // it store data into separate files (e.g. playlist) @@ -16,11 +30,13 @@ using SomePlayer::DataObjects::Playlist; namespace SomePlayer { namespace Storage { - class FileStorage : public Storage { + class FileStorage { public: FileStorage(QString path); QList getPlaylists(); + QStringList getPlaylistsNames(); + Playlist getPlaylist(QString name); void savePlaylist(Playlist playlist); void removePlaylist(Playlist playlist); void removePlaylist(QString name); @@ -29,6 +45,8 @@ namespace SomePlayer { void saveCurrentPlaylist(Playlist playlist); private: QString _path_prefix; + QRegExp _meta_regexp; + QRegExp _path_regexp; }; }; diff --git a/src/library.cpp b/src/library.cpp index 5dcfaf4..54dcf09 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -5,7 +5,6 @@ using namespace SomePlayer::Storage; #include "mediascanner.h" #include -#include Library::Library(QString databasePath, QString playlistsPath) : QObject(0) { _library_storage = new DbStorage(databasePath); @@ -27,7 +26,8 @@ void Library::addDirectory(QString path) { } void Library::addFile(QString path) { - /// TODO: implement this + QStringList files(path); + _resolver->decode(files); } QList Library::getArtists() { @@ -85,6 +85,14 @@ QList Library::getPlaylists() { return _playlist_storage->getPlaylists(); } +QStringList Library::getPlaylistsNames() { + return _playlist_storage->getPlaylistsNames(); +} + +Playlist Library::getPlaylist(QString name) { + return _playlist_storage->getPlaylist(name); +} + void Library::savePlaylist(Playlist playlist) { _playlist_storage->savePlaylist(playlist); } @@ -93,6 +101,9 @@ void Library::removePlaylist(Playlist playlist) { _playlist_storage->removePlaylist(playlist); } +void Library::removePlaylist(QString name) { + _playlist_storage->removePlaylist(name); +} Playlist Library::getCurrentPlaylist() { return _playlist_storage->getCurrentPlaylist(); diff --git a/src/library.h b/src/library.h index 08414c3..36d3878 100644 --- a/src/library.h +++ b/src/library.h @@ -41,8 +41,11 @@ namespace SomePlayer { Playlist getRecentlyAdded(); QList getPlaylists(); + QStringList getPlaylistsNames(); + Playlist getPlaylist(QString name); void savePlaylist(Playlist playlist); void removePlaylist(Playlist playlist); + void removePlaylist(QString name); Playlist getCurrentPlaylist(); void saveCurrentPlaylist(Playlist playlist); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2c576f9..5038088 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4,6 +4,10 @@ #include #include +#include "player.h" + +#include "library.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -19,4 +23,6 @@ MainWindow::~MainWindow() void MainWindow::openMedia() { +// SomePlayer::DataObjects::Library *l = new SomePlayer::DataObjects::Library("/tmp", "/tmp"); +// l->addDirectory("/mnt/music/Three Days Grace"); } diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp index 000d35c..1f9adf0 100644 --- a/src/mediascanner.cpp +++ b/src/mediascanner.cpp @@ -40,5 +40,5 @@ void MediaScanner::init(QString dir) { _initialized = true; if (!_iterator) delete _iterator; - _iterator = new QDirIterator(QDir(dir), QDirIterator::Subdirectories); + _iterator = new QDirIterator(QDir(dir), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); } diff --git a/src/playlist.cpp b/src/playlist.cpp index 86a4ae6..a934bb1 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -11,7 +11,7 @@ QString Playlist::name() const { return _name; } -QList Playlist::tracks() const { +const QList &Playlist::tracks() const { return _tracks; } diff --git a/src/playlist.h b/src/playlist.h index 1e7b7fc..a937a3a 100644 --- a/src/playlist.h +++ b/src/playlist.h @@ -13,7 +13,7 @@ namespace SomePlayer { Playlist(); QString name() const; - QList tracks() const; + const QList &tracks() const; void setName(QString name); void addTrack(Track track); diff --git a/src/storage.cpp b/src/storage.cpp deleted file mode 100644 index 85252e6..0000000 --- a/src/storage.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "storage.h" diff --git a/src/storage.h b/src/storage.h index 5f66bb1..76f1747 100644 --- a/src/storage.h +++ b/src/storage.h @@ -3,15 +3,9 @@ #include "someplayer.h" -// represent abstract storage -// abstract class - namespace SomePlayer{ namespace Storage { - class Storage { - }; - }; }; diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp index 8be3b86..ef579cd 100644 --- a/src/tagresolver.cpp +++ b/src/tagresolver.cpp @@ -1,4 +1,5 @@ #include "tagresolver.h" +#include using namespace SomePlayer::DataObjects; @@ -21,17 +22,16 @@ void TagResolver::decode(QStringList files) { void TagResolver::metaStateChanged(Phonon::State newState, Phonon::State /*oldState*/) { if (newState == Phonon::StoppedState) { + int time = _metaObject->totalTime(); Phonon::MediaSource source = _metaObject->currentSource(); - if (source.type() != Phonon::MediaSource::Invalid) { - QMap meta = _metaObject->metaData(); - TrackMetadata metadata(meta.value("TITLE"), meta.value("ARTIST"), meta.value("ALBUM")); - Track track(0, metadata, source.fileName()); - emit decoded(track); - int index = _sources.indexOf(source)+1; - if (index != _sources.size()) { - Phonon::MediaSource newSource = _sources.at(index); - _metaObject->setCurrentSource(newSource); - } + QMap meta = _metaObject->metaData(); + TrackMetadata metadata(meta.value("TITLE"), meta.value("ARTIST"), meta.value("ALBUM"), time/1000); + Track track(0, metadata, source.fileName()); + emit decoded(track); + int index = _sources.indexOf(source)+1; + if (index != _sources.size()) { + Phonon::MediaSource newSource = _sources.at(index); + _metaObject->setCurrentSource(newSource); } } } diff --git a/src/tagresolver.h b/src/tagresolver.h index 1a0a405..993711e 100644 --- a/src/tagresolver.h +++ b/src/tagresolver.h @@ -9,24 +9,29 @@ using SomePlayer::DataObjects::Track; -class TagResolver : public QObject -{ - Q_OBJECT -public: - explicit TagResolver(QObject *parent = 0); -public slots: - void decode (QStringList files); - -signals: - void decoded(Track); - -private slots: - void metaStateChanged(Phonon::State newState, Phonon::State /*oldState*/); -private: - QStringList _files; - Phonon::MediaObject *_metaObject; - QList _sources; +namespace SomePlayer { + namespace DataObjects { -}; + class TagResolver : public QObject + { + + Q_OBJECT + public: + explicit TagResolver(QObject *parent = 0); + public slots: + void decode (QStringList files); + + signals: + void decoded(Track); + private slots: + void metaStateChanged(Phonon::State newState, Phonon::State /*oldState*/); + private: + QStringList _files; + Phonon::MediaObject *_metaObject; + QList _sources; + + }; + }; +}; #endif // TAGRESOLVER_H diff --git a/src/trackmetainformation.cpp b/src/trackmetainformation.cpp index 0cf35f4..087493c 100644 --- a/src/trackmetainformation.cpp +++ b/src/trackmetainformation.cpp @@ -5,14 +5,16 @@ using namespace SomePlayer::DataObjects; TrackMetadata::TrackMetadata() { } -TrackMetadata::TrackMetadata(QString title = "Unknown title", QString artist = "Unknown artist", QString album = "Unknown album") { +TrackMetadata::TrackMetadata(QString title = "", QString artist = "", QString album = "", int length = 0) { _metadata["TITLE"] = title == "" ? "Unknown title" : title; _metadata["ARTIST"] = artist == "" ? "Unknown artist" : artist; _metadata["ALBUM"] = album == "" ? "Unknown album" : album; + _length = length; } TrackMetadata::TrackMetadata(const TrackMetadata &metadata) { this->_metadata = metadata._metadata; + this->_length = metadata._length; } QString TrackMetadata::title() { @@ -39,6 +41,10 @@ QString TrackMetadata::album() { } } +int TrackMetadata::length() { + return _length; +} + void TrackMetadata::setTitle(QString title) { _metadata["TITLE"] = title; } @@ -50,3 +56,7 @@ void TrackMetadata::setArtist(QString artist) { void TrackMetadata::setAlbum(QString album) { _metadata["ALBUM"] = album; } + +void TrackMetadata::setLength(int length) { + _length = length; +} diff --git a/src/trackmetainformation.h b/src/trackmetainformation.h index 2496d19..29e0d49 100644 --- a/src/trackmetainformation.h +++ b/src/trackmetainformation.h @@ -12,19 +12,22 @@ namespace SomePlayer { public: TrackMetadata(); - TrackMetadata(QString title, QString artist, QString album); + TrackMetadata(QString title, QString artist, QString album, int length); TrackMetadata(const TrackMetadata &metadata); QString title(); QString artist(); QString album(); + int length(); void setTitle(QString title); void setArtist(QString artist); void setAlbum(QString album); + void setLength(int length); private: QMap _metadata; + int _length; }; }; }; -- 1.7.9.5