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

Optimize playlist adding queries.

Browse source
This commit is contained in:
Kavin 2022-11-26 19:45:31 +00:00
parent d5054a9fbb
commit d0fd4e0da6
No known key found for this signature in database
GPG key ID: 49451E4482CC5BCD
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/me/kavin/piped/server/ServerLauncher.java
View file

@ -13,6 +13,7 @@ import io.activej.inject.annotation.Provides;
import io.activej.inject.module.AbstractModule; import io.activej.inject.module.AbstractModule;
import io.activej.inject.module.Module; import io.activej.inject.module.Module;
import io.activej.launchers.http.MultithreadedHttpServerLauncher; import io.activej.launchers.http.MultithreadedHttpServerLauncher;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import me.kavin.piped.consts.Constants; import me.kavin.piped.consts.Constants;
import me.kavin.piped.server.handlers.*; import me.kavin.piped.server.handlers.*;
import me.kavin.piped.server.handlers.auth.AuthPlaylistHandlers; import me.kavin.piped.server.handlers.auth.AuthPlaylistHandlers;
@ -32,8 +33,6 @@ import org.xml.sax.InputSource;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -380,7 +379,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();
var videoIds = new ArrayList<String>(); var videoIds = new ObjectArrayList<String>();
// backwards compatibility // backwards compatibility
var videoIdField = json.get("videoId"); var videoIdField = json.get("videoId");
if (videoIdField != null) { if (videoIdField != null) {
@ -389,7 +388,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
var videoIdsField = json.get("videoIds"); var videoIdsField = json.get("videoIds");
if (videoIdsField != null) { if (videoIdsField != null) {
for (JsonNode node : videoIdsField) { for (JsonNode node : videoIdsField) {
videoIds.add(node.asText()); videoIds.add(node.textValue());
} }
} }

25
src/main/java/me/kavin/piped/server/handlers/auth/AuthPlaylistHandlers.java
View file

@ -8,6 +8,7 @@ import com.rometools.rome.feed.synd.SyndFeedImpl;
import com.rometools.rome.io.SyndFeedOutput; import com.rometools.rome.io.SyndFeedOutput;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.JoinType;
import me.kavin.piped.consts.Constants; import me.kavin.piped.consts.Constants;
import me.kavin.piped.utils.*; import me.kavin.piped.utils.*;
@ -198,10 +199,14 @@ public class AuthPlaylistHandlers {
return mapper.writeValueAsBytes(new AcceptedResponse()); return mapper.writeValueAsBytes(new AcceptedResponse());
} }
public static byte[] addToPlaylistResponse(String session, String playlistId, ArrayList<String> videoIds) throws IOException, ExtractionException { public static byte[] addToPlaylistResponse(String session, String playlistId, List<String> videoIds) throws IOException, ExtractionException {
if (StringUtils.isBlank(session) || StringUtils.isBlank(playlistId)) videoIds = videoIds.stream()
ExceptionHandler.throwErrorResponse(new InvalidRequestResponse("session, playlistId and videoId are required parameters")); .filter(StringUtils::isNotBlank)
.collect(Collectors.toList());
if (StringUtils.isBlank(session) || StringUtils.isBlank(playlistId) || videoIds.isEmpty())
ExceptionHandler.throwErrorResponse(new InvalidRequestResponse("session, playlistId and videoId(s) are required parameters"));
var user = DatabaseHelper.getUserFromSession(session); var user = DatabaseHelper.getUserFromSession(session);
@ -223,11 +228,16 @@ 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"));
var tr = s.beginTransaction(); var playlistVideos = DatabaseHelper.getPlaylistVideosFromIds(s, new ObjectOpenHashSet<>(videoIds));
var videos = playlist.getVideos();
for (String videoId : videoIds) { for (String videoId : videoIds) {
if (StringUtils.isEmpty(videoId)) continue; if (StringUtils.isEmpty(videoId)) continue;
var video = DatabaseHelper.getPlaylistVideoFromId(s, videoId); var video = playlistVideos.stream().filter(v -> v.getId().equals(videoId))
.findFirst()
.orElse(null);
if (video == null) { if (video == null) {
StreamInfo info = StreamInfo.getInfo("https://www.youtube.com/watch?v=" + videoId); StreamInfo info = StreamInfo.getInfo("https://www.youtube.com/watch?v=" + videoId);
@ -245,11 +255,12 @@ public class AuthPlaylistHandlers {
s.persist(video); s.persist(video);
} }
if (playlist.getVideos().isEmpty()) playlist.setThumbnail(video.getThumbnail()); if (playlist.getVideos().isEmpty()) playlist.setThumbnail(video.getThumbnail());
playlist.getVideos().add(video); videos.add(video);
} }
var tr = s.beginTransaction();
s.merge(playlist); s.merge(playlist);
tr.commit(); tr.commit();