CodeFactor review

This commit is contained in:
emeric
2021-01-11 13:13:00 +01:00
parent 5f46a69d4e
commit f21282eba5
5 changed files with 120 additions and 116 deletions
-1
View File
@@ -888,7 +888,6 @@ checkFile(const std::filesystem::path& p, const std::filesystem::path& mediaDire
} }
return true; return true;
} }
catch (std::filesystem::filesystem_error& e) catch (std::filesystem::filesystem_error& e)
{ {
+1 -2
View File
@@ -115,8 +115,7 @@ class Scanner : public IScanner
std::unordered_set<std::filesystem::path> _fileExtensions; std::unordered_set<std::filesystem::path> _fileExtensions;
std::filesystem::path _mediaDirectory; std::filesystem::path _mediaDirectory;
Database::ScanSettings::RecommendationEngineType _recommendationEngineType; Database::ScanSettings::RecommendationEngineType _recommendationEngineType;
};
}; // class Scanner
} // Scanner } // Scanner
+14 -9
View File
@@ -412,7 +412,17 @@ PlayQueue::addSome()
auto tracklistEntries = tracklist->getEntries(_entriesContainer->count(), 50); auto tracklistEntries = tracklist->getEntries(_entriesContainer->count(), 50);
for (const Database::TrackListEntry::pointer& tracklistEntry : tracklistEntries) for (const Database::TrackListEntry::pointer& tracklistEntry : tracklistEntries)
{ addEntry(tracklistEntry);
if (static_cast<std::size_t>(_entriesContainer->count()) < tracklist->getCount())
displayLoadingIndicator();
else
hideLoadingIndicator();
}
void
PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry)
{
const auto tracklistEntryId {tracklistEntry.id()}; const auto tracklistEntryId {tracklistEntry.id()};
const auto track {tracklistEntry->getTrack()}; const auto track {tracklistEntry->getTrack()};
const Database::IdType trackId {track->id()}; const Database::IdType trackId {track->id()};
@@ -462,12 +472,12 @@ PlayQueue::addSome()
entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);
Wt::WText* playBtn {entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.PlayQueue.template.play-btn"), Wt::TextFormat::XHTML)}; Wt::WText* playBtn {entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.PlayQueue.template.play-btn"), Wt::TextFormat::XHTML)};
playBtn->clicked().connect(std::bind([=] playBtn->clicked().connect([=]
{ {
auto pos = _entriesContainer->indexOf(entry); auto pos = _entriesContainer->indexOf(entry);
if (pos >= 0) if (pos >= 0)
loadTrack(pos, true); loadTrack(pos, true);
})); });
Wt::WText* delBtn {entry->bindNew<Wt::WText>("del-btn", Wt::WString::tr("Lms.PlayQueue.template.delete-btn"), Wt::TextFormat::XHTML)}; Wt::WText* delBtn {entry->bindNew<Wt::WText>("del-btn", Wt::WString::tr("Lms.PlayQueue.template.delete-btn"), Wt::TextFormat::XHTML)};
delBtn->clicked().connect([=] delBtn->clicked().connect([=]
@@ -504,6 +514,7 @@ PlayQueue::addSome()
if (auto track {Database::Track::getById(LmsApp->getDbSession(), trackId)}) if (auto track {Database::Track::getById(LmsApp->getDbSession(), trackId)})
isStarred = LmsApp->getUser()->hasStarredTrack(track); isStarred = LmsApp->getUser()->hasStarredTrack(track);
} }
popup->addItem(Wt::WString::tr(isStarred ? "Lms.Explore.unstar" : "Lms.Explore.star")) popup->addItem(Wt::WString::tr(isStarred ? "Lms.Explore.unstar" : "Lms.Explore.star"))
->triggered().connect(moreBtn, [=] ->triggered().connect(moreBtn, [=]
{ {
@@ -523,12 +534,6 @@ PlayQueue::addSome()
popup->popup(moreBtn); popup->popup(moreBtn);
}); });
}
if (static_cast<std::size_t>(_entriesContainer->count()) < tracklist->getCount())
displayLoadingIndicator();
else
hideLoadingIndicator();
} }
void void
+2
View File
@@ -35,6 +35,7 @@ namespace Similarity {
namespace Database { namespace Database {
class Track; class Track;
class TrackList; class TrackList;
class TrackListEntry;
} }
namespace UserInterface { namespace UserInterface {
@@ -65,6 +66,7 @@ class PlayQueue : public Wt::WTemplate
void clearTracks(); void clearTracks();
std::size_t enqueueTracks(const std::vector<Database::IdType>& trackIds); std::size_t enqueueTracks(const std::vector<Database::IdType>& trackIds);
void addSome(); void addSome();
void addEntry(const Wt::Dbo::ptr<Database::TrackListEntry>& entry);
void enqueueRadioTracks(); void enqueueRadioTracks();
void updateInfo(); void updateInfo();
void updateCurrentTrack(bool selected); void updateCurrentTrack(bool selected);
-1
View File
@@ -44,7 +44,6 @@ namespace UserInterface
private: private:
void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override; void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
}; };
} // namespace UserInterface } // namespace UserInterface