Use the last modified file attribute in order to display recently added items. fixes #51

This commit is contained in:
emeric
2020-05-02 14:34:40 +02:00
parent 6c1a7863eb
commit 9edad1314e
10 changed files with 19 additions and 19 deletions
+3 -3
View File
@@ -230,13 +230,13 @@ Artist::getByFilter(Session& session,
}
std::vector<Artist::pointer>
Artist::getLastAdded(Session& session, Wt::WDateTime after, std::optional<std::size_t> limit)
Artist::getLastWritten(Session& session, Wt::WDateTime after, std::optional<std::size_t> limit)
{
session.checkSharedLocked();
Wt::Dbo::collection<Artist::pointer> res = session.getDboSession().query<Artist::pointer>("SELECT a from artist a INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id INNER JOIN track t ON t.id = t_a_l.track_id")
.where("t.file_added > ?").bind(after)
.where("t.file_last_write > ?").bind(after)
.groupBy("a.id")
.orderBy("t.file_added DESC")
.orderBy("t.file_last_write DESC")
.limit(limit ? static_cast<int>(*limit) : -1);
return std::vector<pointer>(res.begin(), res.end());
+3 -3
View File
@@ -145,14 +145,14 @@ Release::getAllOrphans(Session& session)
}
std::vector<Release::pointer>
Release::getLastAdded(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> offset, std::optional<std::size_t> limit)
Release::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> offset, std::optional<std::size_t> limit)
{
session.checkSharedLocked();
Wt::Dbo::collection<Release::pointer> res = session.getDboSession().query<Release::pointer>("SELECT r from release r INNER JOIN track t ON r.id = t.release_id")
.where("t.file_added > ?").bind(after)
.where("t.file_last_write > ?").bind(after)
.groupBy("r.id")
.orderBy("t.file_added DESC")
.orderBy("t.file_last_write DESC")
.offset(offset ? static_cast<int>(*offset) : -1)
.limit(limit ? static_cast<int>(*limit) : -1);
+3 -3
View File
@@ -147,13 +147,13 @@ Track::getMBIDDuplicates(Session& session)
}
std::vector<Track::pointer>
Track::getLastAdded(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> limit)
Track::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> limit)
{
session.checkSharedLocked();
Wt::Dbo::collection<Track::pointer> res = session.getDboSession().find<Track>()
.where("file_added > ?").bind(after)
.orderBy("file_added DESC")
.where("file_last_write > ?").bind(after)
.orderBy("file_last_write DESC")
.limit(limit ? static_cast<int>(*limit) : -1);
return std::vector<pointer>(res.begin(), res.end());
@@ -77,7 +77,7 @@ class Artist : public Wt::Dbo::Dbo<Artist>
static std::vector<pointer> getAll(Session& session, SortMethod sortMethod, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<IdType> getAllIds(Session& session);
static std::vector<pointer> getAllOrphans(Session& session); // No track related
static std::vector<pointer> getLastAdded(Session& session, Wt::WDateTime after, std::optional<std::size_t> size = {});
static std::vector<pointer> getLastWritten(Session& session, Wt::WDateTime after, std::optional<std::size_t> size = {});
static std::vector<IdType> getAllIdsWithClusters(Session& session, std::optional<std::size_t> limit = {});
// Accessors
@@ -56,7 +56,7 @@ class Release : public Wt::Dbo::Dbo<Release>
static std::vector<IdType> getAllIds(Session& session);
static std::vector<pointer> getAllOrderedByArtist(Session& session, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<pointer> getAllRandom(Session& session, std::optional<std::size_t> size = {});
static std::vector<pointer> getLastAdded(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<pointer> getLastWritten(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<pointer> getByYear(Session& session, int yearFrom, int yearTo, std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {});
static std::vector<pointer> getByClusters(Session& session, const std::set<IdType>& clusters);
+1 -1
View File
@@ -77,7 +77,7 @@ class Track : public Wt::Dbo::Dbo<Track>
static std::vector<IdType> getAllIds(Session& session);
static std::vector<std::pair<IdType, std::filesystem::path>> getAllPaths(Session& session, std::optional<std::size_t> offset = std::nullopt, std::optional<std::size_t> size = std::nullopt);
static std::vector<pointer> getMBIDDuplicates(Session& session);
static std::vector<pointer> getLastAdded(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> size = 1);
static std::vector<pointer> getLastWritten(Session& session, const Wt::WDateTime& after, std::optional<std::size_t> size = 1);
static std::vector<pointer> getAllWithMBIDAndMissingFeatures(Session& session);
static std::vector<IdType> getAllIdsWithFeatures(Session& session, std::optional<std::size_t> limit = {});
static std::vector<IdType> getAllIdsWithClusters(Session& session, std::optional<std::size_t> limit = {});
+1 -1
View File
@@ -696,7 +696,7 @@ handleGetAlbumListRequestCommon(const RequestContext& context, bool id3)
else if (type == "newest")
{
auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)};
releases = Release::getLastAdded(context.dbSession, after, offset, size);
releases = Release::getLastWritten(context.dbSession, after, offset, size);
}
else if (type == "alphabeticalByName")
{
+2 -2
View File
@@ -57,10 +57,10 @@ ArtistsInfo::ArtistsInfo()
void
ArtistsInfo::refreshRecentlyAdded()
{
auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1);
auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6);
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const std::vector<Database::Artist::pointer> artists {Artist::getLastAdded(LmsApp->getDbSession(), after, 5)};
const std::vector<Database::Artist::pointer> artists {Artist::getLastWritten(LmsApp->getDbSession(), after, 5)};
_recentlyAddedContainer->clear();
for (const Database::Artist::pointer& artist : artists)
+2 -2
View File
@@ -58,11 +58,11 @@ ReleasesInfo::ReleasesInfo()
void
ReleasesInfo::refreshRecentlyAdded()
{
auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1);
auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6);
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const auto releases {Release::getLastAdded(LmsApp->getDbSession(), after, 0, 5)};
const auto releases {Release::getLastWritten(LmsApp->getDbSession(), after, 0, 5)};
_recentlyAddedContainer->clear();
for (const Database::Release::pointer& release : releases)
+2 -2
View File
@@ -74,10 +74,10 @@ TracksInfo::TracksInfo()
void
TracksInfo::refreshRecentlyAdded()
{
const auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1)};
const auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)};
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const auto tracks {Track::getLastAdded(LmsApp->getDbSession(), after, 5)};
const auto tracks {Track::getLastWritten(LmsApp->getDbSession(), after, 5)};
_recentlyAddedContainer->clear();
addEntries(_recentlyAddedContainer, tracks);