TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix pruneUnusedPlaylistVideos()

Browse source
This commit is contained in:
theanonymousexyz 2022-04-23 19:18:24 +02:00
parent c64162ee2b
commit 06f7bdb353
No known key found for this signature in database
GPG key ID: 35EE09F5481049BB
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View file

@ -651,6 +651,7 @@ public class ResponseHelper {
plQuery.from(me.kavin.piped.utils.obj.db.Playlist.class); plQuery.from(me.kavin.piped.utils.obj.db.Playlist.class);
plQuery.select(plRoot).where(plCriteria.equal(plRoot.get("owner"), user.getId())); plQuery.select(plRoot).where(plCriteria.equal(plRoot.get("owner"), user.getId()));
List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList(); List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList();
Iterator<me.kavin.piped.utils.obj.db.Playlist> iter = playlists.iterator(); Iterator<me.kavin.piped.utils.obj.db.Playlist> iter = playlists.iterator();
while (iter.hasNext()) while (iter.hasNext())
@ -660,11 +661,12 @@ public class ResponseHelper {
s.getTransaction().begin(); s.getTransaction().begin();
s.getTransaction().commit(); s.getTransaction().commit();
Multithreading.runAsync(() -> pruneUnusedPlaylistVideos());
} catch (Exception e) { } catch (Exception e) {
return Constants.mapper.writeValueAsBytes(new ErrorResponse(ExceptionUtils.getStackTrace(e), e.getMessage())); return Constants.mapper.writeValueAsBytes(new ErrorResponse(ExceptionUtils.getStackTrace(e), e.getMessage()));
} }
Multithreading.runAsync(() -> pruneUnusedPlaylistVideos());
return Constants.mapper.writeValueAsBytes(new DeleteUserResponse(user.getUsername())); return Constants.mapper.writeValueAsBytes(new DeleteUserResponse(user.getUsername()));
} }
} }
@ -950,6 +952,7 @@ public class ResponseHelper {
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
try (Session s = DatabaseSessionFactory.createSession()) { try (Session s = DatabaseSessionFactory.createSession()) {
var channels = DatabaseHelper.getChannelsFromIds(s, Arrays.asList(channelIds)); var channels = DatabaseHelper.getChannelsFromIds(s, Arrays.asList(channelIds));
outer: outer:
for (String channelId : channelIds) { for (String channelId : channelIds) {
for (var channel : channels) for (var channel : channels)
@ -1213,7 +1216,9 @@ public class ResponseHelper {
try (Session s = DatabaseSessionFactory.createSession()) { try (Session s = DatabaseSessionFactory.createSession()) {
CriteriaQuery<me.kavin.piped.utils.obj.db.Playlist> plQuery = CriteriaQuery<me.kavin.piped.utils.obj.db.Playlist> plQuery =
s.getCriteriaBuilder().createQuery(me.kavin.piped.utils.obj.db.Playlist.class); s.getCriteriaBuilder().createQuery(me.kavin.piped.utils.obj.db.Playlist.class);
plQuery.select(plQuery.from(me.kavin.piped.utils.obj.db.Playlist.class)); Root<me.kavin.piped.utils.obj.db.Playlist> plRoot = plQuery.from(me.kavin.piped.utils.obj.db.Playlist.class);
//plRoot.fetch("videos", JoinType.INNER);
plQuery.select(plRoot);
List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList(); List<me.kavin.piped.utils.obj.db.Playlist> playlists = s.createQuery(plQuery).getResultList();
CriteriaQuery<PlaylistVideo> pvQuery = s.getCriteriaBuilder().createQuery(PlaylistVideo.class); CriteriaQuery<PlaylistVideo> pvQuery = s.getCriteriaBuilder().createQuery(PlaylistVideo.class);
@ -1222,25 +1227,23 @@ public class ResponseHelper {
Iterator<PlaylistVideo> pvIter = playlistVideos.iterator(); Iterator<PlaylistVideo> pvIter = playlistVideos.iterator();
outer:
while (pvIter.hasNext()) { while (pvIter.hasNext()) {
PlaylistVideo pv = pvIter.next(); PlaylistVideo pv = pvIter.next();
boolean exists = false;
for (me.kavin.piped.utils.obj.db.Playlist pl : playlists) { for (me.kavin.piped.utils.obj.db.Playlist pl : playlists) {
exists = false;
for (PlaylistVideo plpv : pl.getVideos()) { for (PlaylistVideo plpv : pl.getVideos()) {
if (plpv.getId().equals(pv.getId())) { if (plpv.getId().equals(pv.getId())) {
exists = true; continue outer;
break;
} }
} }
if (exists) break;
} }
if (!exists) s.delete(pv); s.delete(pv);
} }
s.getTransaction().begin();
s.getTransaction().commit();
} }
} }