TeamPiped-mirror
/
Piped-Backend
mirror of https://github.com/TeamPiped/Piped-Backend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #497 from Bnyro/fix-playlist-import 

Don't error out when a video of many is private when adding to playlist
This commit is contained in:
Kavin 2023-01-02 21:00:32 +00:00 committed by GitHub
parent 3b4f5274e6 48ee0bba85
commit 09d538d355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,6 +232,8 @@ public class AuthPlaylistHandlers {
var videos = playlist.getVideos();
boolean added = false;
for (String videoId : videoIds) {
if (StringUtils.isEmpty(videoId)) continue;
@ -240,26 +242,39 @@ public class AuthPlaylistHandlers {
.orElse(null);
if (video == null) {
StreamInfo info = StreamInfo.getInfo("https://www.youtube.com/watch?v=" + videoId);
try {
StreamInfo info = StreamInfo.getInfo("https://www.youtube.com/watch?v=" + videoId);
String channelId = StringUtils.substringAfter(info.getUploaderUrl(), "/channel/");
String channelId = StringUtils.substringAfter(info.getUploaderUrl(), "/channel/");
var channel = DatabaseHelper.getChannelFromId(s, channelId);
var channel = DatabaseHelper.getChannelFromId(s, channelId);
if (channel == null) {
channel = DatabaseHelper.saveChannel(channelId);
if (channel == null) {
channel = DatabaseHelper.saveChannel(channelId);
}
video = new PlaylistVideo(videoId, info.getName(), info.getThumbnailUrl(), info.getDuration(), channel);
s.persist(video);
} catch (Exception e) {
ExceptionHandler.handle(e);
continue;
}
video = new PlaylistVideo(videoId, info.getName(), info.getThumbnailUrl(), info.getDuration(), channel);
s.persist(video);
}
if (playlist.getVideos().isEmpty()) playlist.setThumbnail(video.getThumbnail());
added = true;
videos.add(video);
}
if (!added) {
// only return an error if no videos were added
return mapper.writeValueAsBytes(mapper.createObjectNode()
.put("error", "Unable to add any videos, since they were unable to be fetched"));
}
var tr = s.beginTransaction();
s.merge(playlist);
tr.commit();