danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[BUG] Fix merge_playlist ordering (#136)

Browse source
This commit is contained in:
Jesse Bannon 2022-07-31 23:23:13 -07:00 committed by GitHub
parent 23fce80db1
commit 258b519f85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ytdl_sub/downloaders/youtube/merge_playlist.py
View file

@ -74,7 +74,6 @@ class YoutubeMergePlaylistDownloader(
ytdl_options: ytdl_options:
ignoreerrors: True # ignore errors like hidden videos, age restriction, etc ignoreerrors: True # ignore errors like hidden videos, age restriction, etc
playlistreverse: True # Sort the playlist so it begins with the first entry
postprocessors: postprocessors:
# Convert the videos to mkv format # Convert the videos to mkv format
- key: "FFmpegVideoConvertor" - key: "FFmpegVideoConvertor"
@ -87,7 +86,6 @@ class YoutubeMergePlaylistDownloader(
return dict( return dict(
super().ytdl_option_defaults(), super().ytdl_option_defaults(),
**{ **{
"playlistreverse": True,
"postprocessors": [ "postprocessors": [
{ {
"key": "FFmpegVideoConvertor", "key": "FFmpegVideoConvertor",

6
tests/e2e/resources/transaction_log_summaries/youtube/test_merge_playlist.txt
View file

@ -3,9 +3,9 @@ Files created in '{output_directory}'
JMC - Jesse's Minecraft Server-thumb.jpg JMC - Jesse's Minecraft Server-thumb.jpg
JMC - Jesse's Minecraft Server.mkv JMC - Jesse's Minecraft Server.mkv
Timestamps of playlist videos in the merged file: Timestamps of playlist videos in the merged file:
0:00: Jesse's Minecraft Server [Trailer - Feb.1] 0:00: Jesse's Minecraft Server [Trailer - Mar.21]
5:23: Jesse's Minecraft Server [Trailer - Feb.27] 5:00: Jesse's Minecraft Server [Trailer - Feb.27]
9:23: Jesse's Minecraft Server [Trailer - Mar.21] 9:00: Jesse's Minecraft Server [Trailer - Feb.1]
JMC - Jesse's Minecraft Server.nfo JMC - Jesse's Minecraft Server.nfo
NFO tags: NFO tags:
musicvideo: musicvideo:

2
tests/e2e/youtube/test_merge_playlist.py
View file

@ -69,7 +69,7 @@ def expected_playlist_download():
return ExpectedDownloads( return ExpectedDownloads(
expected_downloads=[ expected_downloads=[
ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server-thumb.jpg"), md5="a3f1910f9c51f6442f845a528e190829"), ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server-thumb.jpg"), md5="a3f1910f9c51f6442f845a528e190829"),
ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server.mkv"), md5=["6053c47a8690519b0a33c13fa4b01ac0", "3ab42b3e6be0a44deb3a9a28e6ebaf16"]), ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server.mkv")), # not bitexact TODO: check size
ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server.nfo"), md5="10df5dcdb65ab18ecf21b3503c77e48b"), ExpectedDownloadFile(path=Path("JMC - Jesse's Minecraft Server.nfo"), md5="10df5dcdb65ab18ecf21b3503c77e48b"),
] ]
) )