store normalized playlist filenames #16896
Open
+51
−108
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guidocella
force-pushed
the
normalize-playlist
branch
3 times, most recently
from
fdcea13 to
06e99db
Compare
|
Download the artifacts for this pull request: Windows |
guidocella
force-pushed
the
normalize-playlist
branch
from
06e99db to
019cbe1
Compare
Member
|
Does all directory open modes work? They depend on matching filename between playlists. |
Contributor
Author
|
I'm not sure if you mean What breaks is m3u files with relative paths in a different directory (while EDL files work). ytdl_hook URLs work. #15165 is the opposite, ytdl_hook URLs break but m3u files work.
So we need to fix 1 of the 2 to simplify all the code. |
guidocella
force-pushed
the
normalize-playlist
branch
from
019cbe1 to
52ebd33
Compare
Contributor
Author
|
Fixed playlist files |
guidocella
force-pushed
the
normalize-playlist
branch
from
52ebd33 to
24a2bfb
Compare
Currently entries in playlist files like m3u are first added to the playlist, and then if they were relative paths the playlist file's dirname is prepended to them. Change it to directly add entries with the correct path. This will be needed to normalize playlist entries as soon as they are added, else normalization would prepend the working directory to entries with relative paths. demux_cue, demux_edl and demux_mkv_timeline don't need to be modified to work with the next commit.
This normalizes the playlist/N/filename sub-property, making it consistent with path. As a consequence playlist-path and stream-path are also normalized. This will allow simplifying the code by not normalizing playlist filenames in several places, similar to 23b57e9 for tracks.
guidocella
force-pushed
the
normalize-playlist
branch
from
24a2bfb to
dce8b88
Compare
Since the previous commit normalized playlist filenames when they are stored, the code normalizing them can be simplified back to how it was before implement normalization.
This reverts commit ee05804. Only the select.lua part since osc.lua list formatting was removed. Since playlist/N/filename is now normalized, it is never going to have trailing slashes so there is no need to strip them.
guidocella
force-pushed
the
normalize-playlist
branch
from
dce8b88 to
c4e4d2c
Compare
guidocella
added a commit
to guidocella/mpv
that referenced
this pull request
Nov 7, 2025
When the path is a URL, use the whole path as basename. The dirname will be "." in this case. This simplifies various checks throughout the codebase. In particular, it avoids returning an empty string for URLs ending with /. The filename property will return full URLs, which is desirable because the domain and path segments before the last are useful information. This fixes half of mpv-player#10975. The empty string check in mp_property_filename() can be removed because it only happened with the basename of URLs ending with /. mp_property_filename() will not be called with directories with trailing slashes because mpv expands them immediately when they are the current playlist entry; I tested it by observing filename. Also mpv-player#16896 will prevent directories with trailing slashes anyway. This also fixes the issue described in mpv-player#17015 of %f in --screenshot-template being evaluated to an empty string for URLs ending with /, which can inadvertently make it use an absolute path. Alternative to mpv-player#16932 and mpv-player#17021.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
demux_playlist: add base paths when adding playlist entries
Currently entries in playlist files like m3u are first added to the playlist, and then if they were relative paths the playlist file's dirname is prepended to them.
Change it to directly add entries with the correct path. This will be needed to normalize playlist entries as soon as they are added, else normalization would prepend the working directory to entries with relative paths.
demux_cue, demux_edl and demux_mkv_timeline don't need to be modified to work with the next commit.
common/playlist: store normalized playlist filenames
This normalizes the playlist/N/filename sub-property, making it consistent with path. As a consequence playlist-path and stream-path are also normalized.
This will allow simplifying the code by not normalizing playlist filenames in several places, similar to 23b57e9 for tracks.
various: don't normalize playlist filenames again
Since the previous commit normalized playlist filenames when they are stored, the code normalizing them can be simplified back to how it was before implement normalization.
Revert "{osc,select}.lua: show playlist entries with trailing /"
This reverts commit ee05804. Only the select.lua part since osc.lua list formatting was removed.
Since playlist/N/filename is now normalized, it is never going to have trailing slashes so there is no need to strip them.
Depends on #16892