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

Merge pull request #451 from TeamPiped/playlist-fixes

Browse source 
Simplify transaction for video updates.
This commit is contained in:
Kavin 2022-11-18 21:09:03 +00:00 committed by GitHub
commit d6bfc8f9ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/me/kavin/piped/server/handlers/ChannelHandlers.java
View file

@ -106,7 +106,7 @@ public class ChannelHandlers {
.filter(v -> v.getId().equals(id)) .filter(v -> v.getId().equals(id))
.findFirst(); .findFirst();
if (video.isPresent()) { if (video.isPresent()) {
VideoHelpers.updateVideo(s, id, item); VideoHelpers.updateVideo(id, item);
} else { } else {
VideoHelpers.handleNewVideo("https://youtube.com/watch?v=" + id, time, channel); VideoHelpers.handleNewVideo("https://youtube.com/watch?v=" + id, time, channel);
} }

2
src/main/java/me/kavin/piped/utils/DatabaseHelper.java
View file

@ -150,7 +150,7 @@ public class DatabaseHelper {
sq.select(sqRoot.get("videos").get("id")) sq.select(sqRoot.get("videos").get("id"))
.where(cb.equal(sqRoot.get("playlist_id"), UUID.fromString(id))); .where(cb.equal(sqRoot.get("playlist_id"), UUID.fromString(id)));
} }
cr.where(cb.equal(root.get("id"), sq)); cr.where(root.get("id").in(sq));
return s.createQuery(cr).list(); return s.createQuery(cr).list();
} }

75
src/main/java/me/kavin/piped/utils/VideoHelpers.java
View file

@ -52,8 +52,13 @@ public class VideoHelpers {
Math.max(infoTime, time), info.getThumbnailUrl(), info.isShortFormContent(), channel); Math.max(infoTime, time), info.getThumbnailUrl(), info.isShortFormContent(), channel);
var tr = s.beginTransaction(); var tr = s.beginTransaction();
s.insert(video); try {
tr.commit(); s.insert(video);
tr.commit();
} catch (Exception e) {
tr.rollback();
ExceptionHandler.handle(e);
}
return; return;
} }
} }
@ -66,12 +71,9 @@ public class VideoHelpers {
public static void updateVideo(String id, StreamInfoItem item, long time) { public static void updateVideo(String id, StreamInfoItem item, long time) {
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
try { try {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { if (!updateVideo(id, item.getViewCount(), item.getDuration(), item.getName())) {
if (!updateVideo(s, id, item.getViewCount(), item.getDuration(), item.getName())) { handleNewVideo(item.getUrl(), time, null);
handleNewVideo(item.getUrl(), time, null);
}
} }
} catch (Exception e) { } catch (Exception e) {
ExceptionHandler.handle(e); ExceptionHandler.handle(e);
} }
@ -81,10 +83,8 @@ public class VideoHelpers {
public static void updateVideo(String id, StreamInfo info, long time) { public static void updateVideo(String id, StreamInfo info, long time) {
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
try { try {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { if (!updateVideo(id, info.getViewCount(), info.getDuration(), info.getName())) {
if (!updateVideo(s, id, info.getViewCount(), info.getDuration(), info.getName())) { handleNewVideo(info, time, null);
handleNewVideo(info, time, null);
}
} }
} catch (Exception e) { } catch (Exception e) {
ExceptionHandler.handle(e); ExceptionHandler.handle(e);
@ -92,32 +92,43 @@ public class VideoHelpers {
}); });
} }
public static void updateVideo(StatelessSession s, String id, StreamInfoItem item) { public static void updateVideo(String id, StreamInfoItem item) {
updateVideo(s, id, item.getViewCount(), item.getDuration(), item.getName()); updateVideo(id, item.getViewCount(), item.getDuration(), item.getName());
} }
public static boolean updateVideo(StatelessSession s, String id, long views, long duration, String title) { public static boolean updateVideo(String id, long views, long duration, String title) {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) {
var cb = s.getCriteriaBuilder(); var cb = s.getCriteriaBuilder();
var cu = cb.createCriteriaUpdate(Video.class); var cu = cb.createCriteriaUpdate(Video.class);
var root = cu.from(Video.class); var root = cu.from(Video.class);
cu.where(cb.equal(root.get("id"), id)); cu.where(cb.equal(root.get("id"), id));
if (duration > 0) { if (duration > 0) {
cu.set(root.get("duration"), duration); cu.set(root.get("duration"), duration);
}
if (title != null) {
cu.set(root.get("title"), title);
}
if (views > 0) {
cu.set(root.get("views"), views);
}
long updated;
var tr = s.beginTransaction();
try {
updated = s.createMutationQuery(cu).executeUpdate();
tr.commit();
} catch (Exception e) {
tr.rollback();
// return true, so that we don't try to insert a video!
return true;
}
return updated > 0;
} }
if (title != null) {
cu.set(root.get("title"), title);
}
if (views > 0) {
cu.set(root.get("views"), views);
}
var tr = s.beginTransaction();
long updated = s.createMutationQuery(cu).executeUpdate();
tr.commit();
return updated > 0;
} }
} }

16
src/main/java/me/kavin/piped/utils/matrix/SyncRunner.java
View file

@ -137,15 +137,14 @@ public class SyncRunner implements Runnable {
case "video.piped.stream.info" -> { case "video.piped.stream.info" -> {
FederatedVideoInfo info = mapper.treeToValue(content, FederatedVideoInfo.class); FederatedVideoInfo info = mapper.treeToValue(content, FederatedVideoInfo.class);
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { if (!VideoHelpers.updateVideo(info.getVideoId(),
if (!VideoHelpers.updateVideo(s, info.getVideoId(), info.getViews(),
info.getViews(), info.getDuration(),
info.getDuration(), info.getTitle())) {
info.getTitle())) { VideoHelpers.handleNewVideo("https://www.youtube.com/watch?v=" + info.getVideoId(),
VideoHelpers.handleNewVideo("https://www.youtube.com/watch?v=" + info.getVideoId(), System.currentTimeMillis(), null);
System.currentTimeMillis(), null);
}
} }
}); });
} }
case "video.piped.channel.info" -> { case "video.piped.channel.info" -> {
@ -171,6 +170,7 @@ public class SyncRunner implements Runnable {
response.get("next_batch").asText(); response.get("next_batch").asText();
} catch (Exception ignored) { } catch (Exception ignored) {
ignored.printStackTrace();
Thread.sleep(1000); Thread.sleep(1000);
} }
} }