Fixed bug with directory scanning

[someplayer] / src / library.h

diff --git a/src/library.h b/src/library.h
index 1a4ecc7..ed9b2be 100644 (file)
--- a/src/library.h
+++ b/src/library.h
@@ -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.
+ */
+
 #ifndef LIBRARY
 #define LIBRARY
 
@@ -6,6 +25,8 @@
 #include "playlist.h"
 #include "dbstorage.h"
 #include "filestorage.h"
+#include "mediascanner.h"
+#include "tagresolver.h"
 
 // represents media library: tracks, playlists
 // it uses different media storages for tracks and playlists
@@ -15,43 +36,76 @@ using SomePlayer::DataObjects::Track;
 using SomePlayer::DataObjects::Playlist;
 using SomePlayer::Storage::DbStorage;
 using SomePlayer::Storage::FileStorage;
+using SomePlayer::Storage::MediaScanner;
 
 namespace SomePlayer {
        namespace DataObjects {
 
-               class Library {
+               class Library : public QObject {
+                       Q_OBJECT
                public:
                        Library(QString databasePath, QString playlistsPath);
                        ~Library();
 
-                       void addDirectory(QString path);
+                       void addDirectory(QString path, bool async = true);
                        void addFile(QString path);
 
+                       QList<QString> getDirectories();
                        QList<QString> getArtists();
-                       QList<QString> getAlbumsForArtist(QString artist);
+                       QMap<QString, int> getAlbumsForArtist(QString artist);
                        QList<Track> getTracksForAlbum(QString album, QString artist);
+                       QList<Track> getAllTracksForArtist(QString artist);
+
+                       QList<Track> searchTracks(QString pattern);
 
                        Playlist getFavorites();
                        Playlist getMostPlayed();
                        Playlist getNeverPlayed();
                        Playlist getRecentlyAdded();
 
-                       void removeTrack(Track);
-                       void addTrack(Track);
-                       void addToFavorites(Track);
-
-                       void updateTrack(Track);
+                       int getArtistsCount();
+                       int getAlbumsCount();
+                       int getTracksCount();
 
                        QList<Playlist> getPlaylists();
-                       void savePlaylist(Playlist playlist);
-                       void removePlaylist(Playlist playlist);
+                       QStringList getPlaylistsNames();
+                       Playlist getPlaylist(QString name);
+                       void savePlaylist(const Playlist &playlist);
+                       void removePlaylist(const Playlist &playlist);
+                       void removePlaylist(QString name);
 
                        Playlist getCurrentPlaylist();
-                       void saveCurrentPlaylist(Playlist playlist);
+                       void saveCurrentPlaylist(const Playlist &playlist);
+
+                       void updateDirectories(QList<QString> directories);
+                       void updateAll();
+                       void deleteDirectories(QList<QString> directories);
+
+               signals:
+                       void started();
+                       void done();
+                       void busy(QString);
+                       void allCount(int);
+                       void tick();
 
                private:
                        DbStorage *_library_storage;
                        FileStorage *_playlist_storage;
+                       MediaScanner *_scanner;
+                       TagResolver *_resolver;
+
+               private slots:
+                       void _scanned(QStringList);
+                       void _decoded(Track);
+
+               public slots:
+                       void removeTrack(Track);
+                       void addTrack(Track);
+                       void addToFavorites(Track);
+                       void removeFromFavorites(Track);
+                       void updateTrackCount(Track);
+                       void updateTrackMetadata(Track);
+                       void updatePlaylists();
                };
 
        };