mp3-composer/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add playlistTitle, bump yt-dlp-java version

Browse Source
This commit is contained in:
bivashy
2026-01-08 19:59:27 +05:00
parent f6b545d46d
commit 9fb0ab3513
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -35,7 +35,7 @@
<apache-tika.version>3.2.3</apache-tika.version> <apache-tika.version>3.2.3</apache-tika.version>
<springdoc-openapi.version>2.8.5</springdoc-openapi.version> <springdoc-openapi.version>2.8.5</springdoc-openapi.version>
<jaffree.version>2024.08.29</jaffree.version> <jaffree.version>2024.08.29</jaffree.version>
<yt-dlp-java.version>2.0.7</yt-dlp-java.version> <yt-dlp-java.version>2.0.8</yt-dlp-java.version>
<record-builder.version>51</record-builder.version> <record-builder.version>51</record-builder.version>
</properties> </properties>
<repositories> <repositories>

2
src/main/java/com/bivashy/backend/composer/dto/importing/BaseTrackProgress.java
View File

@ -31,7 +31,7 @@ public abstract class BaseTrackProgress {
return id; return id;
} }
public Long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }

8
src/main/java/com/bivashy/backend/composer/dto/importing/PlaylistProgress.java
View File

@ -4,17 +4,19 @@ public class PlaylistProgress extends BaseTrackProgress {
private String ytdlnStdout; private String ytdlnStdout;
private int overallProgress; private int overallProgress;
private int trackCount; private int trackCount;
private String playlistTitle;
private ProgressStatus status; private ProgressStatus status;
PlaylistProgress() { PlaylistProgress() {
super(0, 0, 0); super(0, 0, 0);
} }
public PlaylistProgress(long playlistId, long trackSourceId, long userId, int trackCount) { public PlaylistProgress(long playlistId, long trackSourceId, long userId, int trackCount, String playlistTitle) {
super(playlistId, trackSourceId, userId); super(playlistId, trackSourceId, userId);
this.setType(ProgressEntryType.PLAYLIST); this.setType(ProgressEntryType.PLAYLIST);
this.status = ProgressStatus.LOADING; this.status = ProgressStatus.LOADING;
this.trackCount = trackCount; this.trackCount = trackCount;
this.playlistTitle = playlistTitle;
} }
public String getYtdlnStdout() { public String getYtdlnStdout() {
@ -45,4 +47,8 @@ public class PlaylistProgress extends BaseTrackProgress {
return trackCount; return trackCount;
} }
public String getPlaylistTitle() {
return playlistTitle;
}
} }

11
src/main/java/com/bivashy/backend/composer/service/YoutubeTrackService.java
View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -136,8 +137,14 @@ public class YoutubeTrackService {
ytDlpRequest.setOption("audio-format", "best"); ytDlpRequest.setOption("audio-format", "best");
ytDlpRequest.setOption("no-overwrites"); ytDlpRequest.setOption("no-overwrites");
String playlistTitle = videoInfos.stream()
.map(VideoInfo::getExtraProperties)
.filter(Objects::nonNull)
.map(v -> String.valueOf(v.getOrDefault("playlist_title", ""))).findFirst()
.orElse("");
PlaylistProgress playlistProgress = new PlaylistProgress(playlistId, trackSource.getId(), userId, PlaylistProgress playlistProgress = new PlaylistProgress(playlistId, trackSource.getId(), userId,
videoInfos.size()); videoInfos.size(), playlistTitle);
redisProgressService.saveProgress(playlistProgress); redisProgressService.saveProgress(playlistProgress);
var response = YtDlp.execute(ytDlpRequest, (downloadProgress, ignored) -> { var response = YtDlp.execute(ytDlpRequest, (downloadProgress, ignored) -> {
@ -162,7 +169,7 @@ public class YoutubeTrackService {
try (Stream<Path> pathStream = Files.walk(temporaryFolder)) { try (Stream<Path> pathStream = Files.walk(temporaryFolder)) {
List<Path> downloadedFiles = Files.walk(temporaryFolder).toList(); List<Path> downloadedFiles = Files.walk(temporaryFolder).toList();
logger.info("downloaded file count {}", downloadedFiles.size()); logger.info("downloaded file count {}", downloadedFiles.size() - 2);
for (Path path : downloadedFiles) { for (Path path : downloadedFiles) {
if (Files.isDirectory(path)) if (Files.isDirectory(path))