diff --git a/pom.xml b/pom.xml
index 7e96b67..92d58ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
3.2.3
2.8.5
2024.08.29
- 2.0.7
+ 2.0.8
51
diff --git a/src/main/java/com/bivashy/backend/composer/dto/importing/BaseTrackProgress.java b/src/main/java/com/bivashy/backend/composer/dto/importing/BaseTrackProgress.java
index 95a1e44..eaa5054 100644
--- a/src/main/java/com/bivashy/backend/composer/dto/importing/BaseTrackProgress.java
+++ b/src/main/java/com/bivashy/backend/composer/dto/importing/BaseTrackProgress.java
@@ -31,7 +31,7 @@ public abstract class BaseTrackProgress {
return id;
}
- public Long getTimestamp() {
+ public long getTimestamp() {
return timestamp;
}
diff --git a/src/main/java/com/bivashy/backend/composer/dto/importing/PlaylistProgress.java b/src/main/java/com/bivashy/backend/composer/dto/importing/PlaylistProgress.java
index 7d90293..21ecaff 100644
--- a/src/main/java/com/bivashy/backend/composer/dto/importing/PlaylistProgress.java
+++ b/src/main/java/com/bivashy/backend/composer/dto/importing/PlaylistProgress.java
@@ -4,17 +4,19 @@ public class PlaylistProgress extends BaseTrackProgress {
private String ytdlnStdout;
private int overallProgress;
private int trackCount;
+ private String playlistTitle;
private ProgressStatus status;
PlaylistProgress() {
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);
this.setType(ProgressEntryType.PLAYLIST);
this.status = ProgressStatus.LOADING;
this.trackCount = trackCount;
+ this.playlistTitle = playlistTitle;
}
public String getYtdlnStdout() {
@@ -45,4 +47,8 @@ public class PlaylistProgress extends BaseTrackProgress {
return trackCount;
}
+ public String getPlaylistTitle() {
+ return playlistTitle;
+ }
+
}
diff --git a/src/main/java/com/bivashy/backend/composer/service/YoutubeTrackService.java b/src/main/java/com/bivashy/backend/composer/service/YoutubeTrackService.java
index a4a6637..047378a 100644
--- a/src/main/java/com/bivashy/backend/composer/service/YoutubeTrackService.java
+++ b/src/main/java/com/bivashy/backend/composer/service/YoutubeTrackService.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Stream;
@@ -136,8 +137,14 @@ public class YoutubeTrackService {
ytDlpRequest.setOption("audio-format", "best");
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,
- videoInfos.size());
+ videoInfos.size(), playlistTitle);
redisProgressService.saveProgress(playlistProgress);
var response = YtDlp.execute(ytDlpRequest, (downloadProgress, ignored) -> {
@@ -162,7 +169,7 @@ public class YoutubeTrackService {
try (Stream pathStream = Files.walk(temporaryFolder)) {
List downloadedFiles = Files.walk(temporaryFolder).toList();
- logger.info("downloaded file count {}", downloadedFiles.size());
+ logger.info("downloaded file count {}", downloadedFiles.size() - 2);
for (Path path : downloadedFiles) {
if (Files.isDirectory(path))