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

Fixed regression when adding all from search results

Browse Source
This commit is contained in:
emeric
2022-03-30 20:21:29 +02:00
parent 9fccd17f9b
commit 6c10192028
3 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/explore/ArtistCollector.cpp
+18 -5
View File
@@ -20,8 +20,9 @@
#include "ArtistCollector.hpp" #include "ArtistCollector.hpp"
#include "services/database/Artist.hpp" #include "services/database/Artist.hpp"
#include "services/database/User.hpp" #include "services/database/Session.hpp"
#include "services/database/TrackList.hpp" #include "services/database/TrackList.hpp"
#include "services/database/User.hpp"
#include "services/scrobbling/IScrobblingService.hpp" #include "services/scrobbling/IScrobblingService.hpp"
#include "utils/Service.hpp" #include "utils/Service.hpp"
#include "Filters.hpp" #include "Filters.hpp"
@@ -65,7 +66,10 @@ namespace UserInterface
params.setSortMethod(ArtistSortMethod::LastWritten); params.setSortMethod(ArtistSortMethod::LastWritten);
params.setRange(range); params.setRange(range);
artists = Artist::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
artists = Artist::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -77,7 +81,10 @@ namespace UserInterface
params.setSortMethod(ArtistSortMethod::BySortName); params.setSortMethod(ArtistSortMethod::BySortName);
params.setRange(range); params.setRange(range);
artists = Artist::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
artists = Artist::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -89,7 +96,10 @@ namespace UserInterface
params.setSortMethod(ArtistSortMethod::BySortName); params.setSortMethod(ArtistSortMethod::BySortName);
params.setRange(range); params.setRange(range);
artists = Artist::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
artists = Artist::find(LmsApp->getDbSession(), params);
}
break; break;
} }
} }
@@ -113,7 +123,10 @@ namespace UserInterface
params.setSortMethod(ArtistSortMethod::Random); params.setSortMethod(ArtistSortMethod::Random);
params.setRange(Range {0, getMaxCount()}); params.setRange(Range {0, getMaxCount()});
_randomArtists = Artist::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
_randomArtists = Artist::find(LmsApp->getDbSession(), params);
}
} }
return _randomArtists->getSubRange(range); return _randomArtists->getSubRange(range);
src/lms/ui/explore/ReleaseCollector.cpp
+17 -4
View File
@@ -67,7 +67,10 @@ namespace UserInterface
params.setSortMethod(ReleaseSortMethod::LastWritten); params.setSortMethod(ReleaseSortMethod::LastWritten);
params.setRange(range); params.setRange(range);
releases = Release::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
releases = Release::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -79,7 +82,10 @@ namespace UserInterface
params.setSortMethod(ReleaseSortMethod::Name); params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range); params.setRange(range);
releases = Release::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
releases = Release::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -90,7 +96,10 @@ namespace UserInterface
params.setSortMethod(ReleaseSortMethod::Name); params.setSortMethod(ReleaseSortMethod::Name);
params.setRange(range); params.setRange(range);
releases = Release::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
releases = Release::find(LmsApp->getDbSession(), params);
}
break; break;
} }
} }
@@ -112,7 +121,11 @@ namespace UserInterface
params.setClusters(getFilters().getClusterIds()); params.setClusters(getFilters().getClusterIds());
params.setSortMethod(ReleaseSortMethod::Random); params.setSortMethod(ReleaseSortMethod::Random);
params.setRange({0, getMaxCount()}); params.setRange({0, getMaxCount()});
_randomReleases = Release::find(LmsApp->getDbSession(), params);
{
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
_randomReleases = Release::find(LmsApp->getDbSession(), params);
}
} }
return _randomReleases->getSubRange(range); return _randomReleases->getSubRange(range);
src/lms/ui/explore/TrackCollector.cpp
+17 -4
View File
@@ -66,7 +66,10 @@ namespace UserInterface
params.setSortMethod(TrackSortMethod::LastWritten); params.setSortMethod(TrackSortMethod::LastWritten);
params.setRange(range); params.setRange(range);
tracks = Track::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
tracks = Track::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -77,7 +80,10 @@ namespace UserInterface
params.setKeywords(getSearchKeywords()); params.setKeywords(getSearchKeywords());
params.setRange(range); params.setRange(range);
tracks = Track::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
tracks = Track::find(LmsApp->getDbSession(), params);
}
break; break;
} }
@@ -87,7 +93,10 @@ namespace UserInterface
params.setClusters(getFilters().getClusterIds()); params.setClusters(getFilters().getClusterIds());
params.setRange(range); params.setRange(range);
tracks = Track::find(LmsApp->getDbSession(), params); {
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
tracks = Track::find(LmsApp->getDbSession(), params);
}
break; break;
} }
} }
@@ -109,7 +118,11 @@ namespace UserInterface
params.setClusters(getFilters().getClusterIds()); params.setClusters(getFilters().getClusterIds());
params.setSortMethod(TrackSortMethod::Random); params.setSortMethod(TrackSortMethod::Random);
params.setRange({0, getMaxCount()}); params.setRange({0, getMaxCount()});
_randomTracks = Track::find(LmsApp->getDbSession(), params);
{
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
_randomTracks = Track::find(LmsApp->getDbSession(), params);
}
} }
return _randomTracks->getSubRange(range); return _randomTracks->getSubRange(range);