kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-04-29 16:30:29 +05:30
Code Issues Projects Releases Wiki Activity

introduce a dedicated method to clear a playlist

Browse Source
This commit is contained in:
frajibe 2023-01-07 13:01:27 +01:00
parent fef6022104
commit a145ad4e77
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/kavin/piped/server/ServerLauncher.java
View File

@ -416,7 +416,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
try { try {
var json = Constants.mapper.readTree(request.loadBody().getResult().asArray()); var json = Constants.mapper.readTree(request.loadBody().getResult().asArray());
var playlistId = json.get("playlistId").textValue(); var playlistId = json.get("playlistId").textValue();
return getJsonResponse(AuthPlaylistHandlers.removeFromPlaylistResponse(request.getHeader(AUTHORIZATION), playlistId, null), "private"); return getJsonResponse(AuthPlaylistHandlers.clearPlaylistResponse(request.getHeader(AUTHORIZATION), playlistId), "private");
} catch (Exception e) { } catch (Exception e) {
return getErrorResponse(e, request.getPath()); return getErrorResponse(e, request.getPath());
} }

44
src/main/java/me/kavin/piped/server/handlers/auth/AuthPlaylistHandlers.java
View File

@ -283,7 +283,7 @@ public class AuthPlaylistHandlers {
} }
} }
public static byte[] removeFromPlaylistResponse(String session, String playlistId, Integer index) throws IOException { public static byte[] removeFromPlaylistResponse(String session, String playlistId, int index) throws IOException {
if (StringUtils.isBlank(session) || StringUtils.isBlank(playlistId)) if (StringUtils.isBlank(session) || StringUtils.isBlank(playlistId))
ExceptionHandler.throwErrorResponse(new InvalidRequestResponse("session and playlistId are required parameters")); ExceptionHandler.throwErrorResponse(new InvalidRequestResponse("session and playlistId are required parameters"));
@ -303,15 +303,41 @@ public class AuthPlaylistHandlers {
return mapper.writeValueAsBytes(mapper.createObjectNode() return mapper.writeValueAsBytes(mapper.createObjectNode()
.put("error", "You are not the owner this playlist")); .put("error", "You are not the owner this playlist"));
if (index != null) { if (index < 0 || index >= playlist.getVideos().size())
if (index < 0 || index >= playlist.getVideos().size()) return mapper.writeValueAsBytes(mapper.createObjectNode()
return mapper.writeValueAsBytes(mapper.createObjectNode() .put("error", "Video Index out of bounds"));
.put("error", "Video Index out of bounds"));
playlist.getVideos().remove((int) index); playlist.getVideos().remove(index);
} else {
playlist.getVideos().clear(); var tr = s.beginTransaction();
} s.merge(playlist);
tr.commit();
return mapper.writeValueAsBytes(new AcceptedResponse());
}
}
public static byte[] clearPlaylistResponse(String session, String playlistId) throws IOException {
if (StringUtils.isBlank(session) || StringUtils.isBlank(playlistId))
ExceptionHandler.throwErrorResponse(new InvalidRequestResponse("session and playlistId are required parameters"));
try (Session s = DatabaseSessionFactory.createSession()) {
var cb = s.getCriteriaBuilder();
var query = cb.createQuery(me.kavin.piped.utils.obj.db.Playlist.class);
var root = query.from(me.kavin.piped.utils.obj.db.Playlist.class);
root.fetch("videos", JoinType.RIGHT);
query.where(cb.equal(root.get("playlist_id"), UUID.fromString(playlistId)));
var playlist = s.createQuery(query).uniqueResult();
if (playlist == null)
return mapper.writeValueAsBytes(mapper.createObjectNode()
.put("error", "Playlist not found"));
if (playlist.getOwner().getId() != DatabaseHelper.getUserFromSession(session).getId())
return mapper.writeValueAsBytes(mapper.createObjectNode()
.put("error", "You are not the owner this playlist"));
playlist.getVideos().clear();
var tr = s.beginTransaction(); var tr = s.beginTransaction();
s.merge(playlist); s.merge(playlist);