owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed regression on covers

Browse Source
This commit is contained in:
emeric
2018-09-16 20:44:27 +02:00
parent fa73b88a2b
commit 9a0a491dfe
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cover/CoverArtGrabber.cpp
+7 -7
View File
@@ -76,6 +76,7 @@ getFromAvMediaFile(const Av::MediaFile& input)
LMS_LOG(COVER, ERROR) << "Cannot load embedded cover file in '" << input.getPath().string() << "'"; LMS_LOG(COVER, ERROR) << "Cannot load embedded cover file in '" << input.getPath().string() << "'";
} }
LMS_LOG(COVER, DEBUG) << "No cover found in media file '" << input.getPath().string() << "'";
return boost::none; return boost::none;
} }
@@ -92,6 +93,7 @@ Grabber::getFromDirectory(const boost::filesystem::path& p) const
LMS_LOG(COVER, ERROR) << "Cannot load image in file '" << coverPath.string() << "'"; LMS_LOG(COVER, ERROR) << "Cannot load image in file '" << coverPath.string() << "'";
} }
LMS_LOG(COVER, DEBUG) << "No cover found in directory '" << p.string() << "'";
return boost::none; return boost::none;
} }
@@ -162,13 +164,11 @@ Grabber::getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::
transaction.commit(); transaction.commit();
switch (coverType) if (coverType == Track::CoverType::Embedded)
{ cover = getFromTrack(trackPath);
case Track::CoverType::Embedded:
cover = getFromTrack(trackPath); if (!cover)
case Track::CoverType::None: cover = getFromDirectory(trackPath.parent_path());
cover = getFromDirectory(trackPath.parent_path());
}
} }
} }