From 702e3098a46816bb63372e0d8224abcb120f7f80 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 19 May 2018 14:30:51 +0200 Subject: [PATCH] Renamed DbArtist to Artist to be more consistent --- src/Makefile.am | 2 +- src/database/{DbArtist.cpp => Artist.cpp} | 2 +- src/database/{DbArtist.hpp => Artist.hpp} | 0 src/database/Cluster.cpp | 2 +- src/database/DatabaseHandler.cpp | 5 +++-- src/database/Release.cpp | 2 +- src/database/Track.cpp | 2 +- src/scanner/MediaScanner.cpp | 2 +- src/ui/LmsApplication.hpp | 2 +- src/ui/explore/ArtistView.cpp | 2 +- src/ui/explore/ArtistsView.cpp | 2 +- src/ui/explore/TracksView.cpp | 4 ++-- 12 files changed, 14 insertions(+), 13 deletions(-) rename src/database/{DbArtist.cpp => Artist.cpp} (99%) rename src/database/{DbArtist.hpp => Artist.hpp} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 1866457c..b364c52d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ lms_SOURCES = \ $(srcdir)/av/AvInfo.cpp \ $(srcdir)/av/AvTranscoder.cpp \ $(srcdir)/cover/CoverArtGrabber.cpp \ + $(srcdir)/database/Artist.cpp \ $(srcdir)/database/Cluster.cpp \ - $(srcdir)/database/DbArtist.cpp \ $(srcdir)/database/DatabaseHandler.cpp \ $(srcdir)/database/MediaDirectory.cpp \ $(srcdir)/database/Playlist.cpp \ diff --git a/src/database/DbArtist.cpp b/src/database/Artist.cpp similarity index 99% rename from src/database/DbArtist.cpp rename to src/database/Artist.cpp index f3aa714d..2da5adbf 100644 --- a/src/database/DbArtist.cpp +++ b/src/database/Artist.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ -#include "DbArtist.hpp" +#include "Artist.hpp" #include "utils/Logger.hpp" diff --git a/src/database/DbArtist.hpp b/src/database/Artist.hpp similarity index 100% rename from src/database/DbArtist.hpp rename to src/database/Artist.hpp diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp index b32ac64d..12c7e947 100644 --- a/src/database/Cluster.cpp +++ b/src/database/Cluster.cpp @@ -19,7 +19,7 @@ #include "Cluster.hpp" -#include "DbArtist.hpp" +#include "Artist.hpp" #include "Release.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp index 2f34c468..4978703b 100644 --- a/src/database/DatabaseHandler.cpp +++ b/src/database/DatabaseHandler.cpp @@ -35,7 +35,7 @@ #include "utils/Logger.hpp" -#include "DbArtist.hpp" +#include "Artist.hpp" #include "Cluster.hpp" #include "MediaDirectory.hpp" #include "Playlist.hpp" @@ -120,7 +120,8 @@ Handler::Handler(Wt::Dbo::SqlConnectionPool& connectionPool) LMS_LOG(DB, INFO) << "Tables created"; } - catch(std::exception& e) { + catch (Wt::Dbo::Exception& e) + { LMS_LOG(DB, ERROR) << "Cannot create tables: " << e.what(); } diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 5088f040..cc49954f 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -19,8 +19,8 @@ #include "Release.hpp" +#include "Artist.hpp" #include "Cluster.hpp" -#include "DbArtist.hpp" #include "SqlQuery.hpp" #include "Track.hpp" diff --git a/src/database/Track.cpp b/src/database/Track.cpp index 1e509f7e..6fdf6c49 100644 --- a/src/database/Track.cpp +++ b/src/database/Track.cpp @@ -23,8 +23,8 @@ #include "utils/Logger.hpp" +#include "Artist.hpp" #include "Cluster.hpp" -#include "DbArtist.hpp" #include "Release.hpp" #include "SqlQuery.hpp" diff --git a/src/scanner/MediaScanner.cpp b/src/scanner/MediaScanner.cpp index 1235c89e..42709b6a 100644 --- a/src/scanner/MediaScanner.cpp +++ b/src/scanner/MediaScanner.cpp @@ -28,8 +28,8 @@ #include "cover/CoverArtGrabber.hpp" +#include "database/Artist.hpp" #include "database/Cluster.hpp" -#include "database/DbArtist.hpp" #include "database/Release.hpp" #include "database/MediaDirectory.hpp" #include "database/Track.hpp" diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 5de87a0e..b03a66d5 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -26,8 +26,8 @@ #include "database/DatabaseHandler.hpp" #include "scanner/MediaScanner.hpp" +#include "database/Artist.hpp" #include "database/Cluster.hpp" -#include "database/DbArtist.hpp" #include "database/Release.hpp" #include "Auth.hpp" diff --git a/src/ui/explore/ArtistView.cpp b/src/ui/explore/ArtistView.cpp index 91dcc3ab..e308d009 100644 --- a/src/ui/explore/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -24,7 +24,7 @@ #include #include -#include "database/DbArtist.hpp" +#include "database/Artist.hpp" #include "database/Setting.hpp" #include "utils/Logger.hpp" diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp index 2c953754..4ca9a617 100644 --- a/src/ui/explore/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -23,7 +23,7 @@ #include #include -#include "database/DbArtist.hpp" +#include "database/Artist.hpp" #include "database/Setting.hpp" #include "utils/Logger.hpp" diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp index 2d1d53ee..7889499b 100644 --- a/src/ui/explore/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -24,10 +24,10 @@ #include #include -#include "database/DbArtist.hpp" -#include "database/Track.hpp" +#include "database/Artist.hpp" #include "database/Release.hpp" #include "database/Setting.hpp" +#include "database/Track.hpp" #include "utils/Logger.hpp" #include "utils/Utils.hpp"