Version bump

[someplayer] / src / library.cpp

diff --git a/src/library.cpp b/src/library.cpp
index 7f8165b..4c0047e 100644 (file)
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -18,13 +18,13 @@
  */
 
 #include "library.h"
-#include <QDebug>
 
 using namespace SomePlayer::DataObjects;
 using namespace SomePlayer::Storage;
 
 #include "mediascanner.h"
 #include <QDir>
+#include <QDebug>
 
 Library::Library(QString databasePath, QString playlistsPath) : QObject(0) {
        _library_storage = new DbStorage(databasePath);
@@ -32,6 +32,7 @@ Library::Library(QString databasePath, QString playlistsPath) : QObject(0) {
        _scanner = new MediaScanner();
        _resolver = new TagResolver(this);
        connect(_scanner, SIGNAL(scanFinish(QStringList)), this, SLOT(_scanned(QStringList)));
+       connect(_resolver, SIGNAL(started()), this, SIGNAL(started()));
        connect(_resolver, SIGNAL(done()), this, SIGNAL(done()));
        connect(_resolver, SIGNAL(decoded(Track)), this, SLOT(_decoded(Track)));
 }
@@ -41,9 +42,10 @@ Library::~Library() {
        delete _playlist_storage;
 }
 
-void Library::addDirectory(QString path) {
+void Library::addDirectory(QString path, bool async) {
        _scanner->init(path);
-       _scanner->start(QThread::LowestPriority);
+       if (async) _scanner->start(QThread::LowestPriority);
+       else _scanner->run();
 }
 
 void Library::addFile(QString path) {
@@ -55,7 +57,7 @@ QList<QString> Library::getArtists() {
        return _library_storage->getArtists();
 }
 
-QList<QString> Library::getAlbumsForArtist(QString artist) {
+QMap<QString, int> Library::getAlbumsForArtist(QString artist) {
        return _library_storage->getAlbumsForArtist(artist);
 }
 
@@ -63,6 +65,15 @@ QList<Track> Library::getTracksForAlbum(QString album, QString artist) {
        return _library_storage->getTracksForAlbum(album, artist);
 }
 
+QList<Track> Library::getAllTracksForArtist(QString artist) {
+       QList<Track> all;
+       QMap<QString, int> albumsmap = getAlbumsForArtist(artist);
+       QList<QString> albums = albumsmap.keys();
+       foreach (QString album, albums) {
+               all.append(getTracksForAlbum(album, artist));
+       }
+       return all;
+}
 
 // dynamic:
 
@@ -126,6 +137,21 @@ void Library::removePlaylist(QString name) {
        _playlist_storage->removePlaylist(name);
 }
 
+void Library::importPlaylist(QString name) {
+       _playlist_storage->importPlaylist(name);
+}
+
+void Library::importPlaylists(QStringList files) {
+       foreach (QString name, files) {
+               importPlaylist(name);
+       }
+}
+
+void Library::scanAndImportPlaylists(QString dirpath) {
+       QStringList playlists = _scanner->scanForPlaylists(dirpath);
+       importPlaylists(playlists);
+}
+
 Playlist Library::getCurrentPlaylist() {
        return _playlist_storage->getCurrentPlaylist();
 }
@@ -135,20 +161,17 @@ void Library::saveCurrentPlaylist(const Playlist &playlist) {
 }
 
 void Library::_decoded(Track track) {
-       emit trackAdded();
+       emit tick();
        addTrack(track);
 }
 
 void Library::_scanned(QStringList files) {
-       emit addingTracks(files.count());
+       emit allCount(files.count());
        _resolver->decode(files);
 }
 
 void Library::updateTrackMetadata(Track track) {
-       Track ntrack = track;
-       if (track.id() > 0) {
-               ntrack = _library_storage->updateTrack(track);
-       }
+       Track ntrack = _library_storage->updateTrack(track);
        // update all playlists
        QList<QString> playlists = getPlaylistsNames();
        foreach (QString name, playlists) {
@@ -162,3 +185,77 @@ void Library::updateTrackMetadata(Track track) {
        }
        _resolver->updateTags(ntrack);
 }
+
+QList<Track> Library::searchTracks(QString pattern) {
+       return _library_storage->searchTracks(pattern);
+}
+
+QList<QString> Library::getDirectories() {
+       return _library_storage->getDirectories();
+}
+
+int Library::getArtistsCount() {
+       return _library_storage->getArtistsCount();
+}
+
+int Library::getAlbumsCount() {
+       return _library_storage->getAlbumsCount();
+}
+
+int Library::getTracksCount() {
+       return _library_storage->getTracksCount();
+}
+
+void Library::updateAll() {
+       QList<QString> directories = _library_storage->getDirectories();
+       updateDirectories(directories);
+}
+
+void Library::updateDirectories(QList<QString> directories) {
+       foreach (QString directory, directories) {
+               _library_storage->checkTracksFrom(directory);
+               addDirectory(directory, false);
+       }
+}
+
+void Library::deleteDirectories(QList<QString> directories) {
+       foreach (QString directory, directories) {
+               _library_storage->deleteTracksFrom(directory);
+       }
+}
+
+void Library::updatePlaylists() {
+       emit started();
+       QList<QString> playlists = getPlaylistsNames();
+       emit allCount(playlists.count());
+       foreach (QString name, playlists) {
+               Playlist playlist = getPlaylist(name);
+               QList<Track> tracks = playlist.tracks();
+               QList<Track> ntracks;
+               foreach (const Track &track, tracks) {
+                       if (QFile::exists(track.source())) {
+                               ntracks.append(track);
+                       }
+               }
+               playlist.setTracks(ntracks);
+               savePlaylist(playlist);
+               emit tick();
+       }
+       emit done();
+}
+
+void Library::removeFromFavorites(Track track) {
+       _library_storage->removeFromFavorites(track);
+}
+
+bool Library::isFavorite(Track track) {
+       return _library_storage->isFavorite(track);
+}
+
+LastPlayed Library::getLastPlayedForCurPlaylist() {
+       return _playlist_storage->getLastPlayedForCurPlaylist();
+}
+
+void Library::saveLastPlayedForCurPlaylist(LastPlayed lastplayed) {
+       _playlist_storage->saveLastPlayedForCurPlaylist(lastplayed);
+}