Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

command: normalize paths for path and track-list/N/external-filename

Browse Source 
It's better for API users to actually get predictable results.
This commit is contained in:
Dudemanguy
2025-01-30 14:32:49 -06:00
parent 02c0b346eb
commit 38ad1ed03b
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DOCS/interface-changes/property-paths.txt Normal file
View File

@@ -0,0 +1 @@
the `path` and `track-list/N/external-filename` properties now always return a full, absolute path

5
DOCS/man/input.rst
View File

@@ -2109,10 +2109,7 @@ Property list
Process-id of mpv. Process-id of mpv.
``path`` ``path``
Full path of the currently played file. Usually this is exactly the same Full absolute path of the currently played file.
string you pass on the mpv command line or the ``loadfile`` command, even
if it's a relative path. If you expect an absolute path, you will have to
determine it yourself, for example by using the ``normalize-path`` command.
``stream-open-filename`` ``stream-open-filename``
The full path to the currently played media. This is different from The full path to the currently played media. This is different from

13
player/command.c
View File

@@ -507,7 +507,10 @@ static int mp_property_path(void *ctx, struct m_property *prop,
MPContext *mpctx = ctx; MPContext *mpctx = ctx;
if (!mpctx->filename) if (!mpctx->filename)
return M_PROPERTY_UNAVAILABLE; return M_PROPERTY_UNAVAILABLE;
return m_property_strdup_ro(action, arg, mpctx->filename); char *path = mp_normalize_path(NULL, mpctx->filename);
int r = m_property_strdup_ro(action, arg, path);
talloc_free(path);
return r;
} }
static int mp_property_filename(void *ctx, struct m_property *prop, static int mp_property_filename(void *ctx, struct m_property *prop,
@@ -1997,6 +2000,9 @@ static int get_track_entry(int item, int action, void *arg, void *ctx)
struct MPContext *mpctx = ctx; struct MPContext *mpctx = ctx;
struct track *track = mpctx->tracks[item]; struct track *track = mpctx->tracks[item];
char *external_filename = mp_normalize_user_path(NULL, mpctx->global,
track->external_filename);
struct mp_codec_params p = struct mp_codec_params p =
track->stream ? *track->stream->codec : (struct mp_codec_params){0}; track->stream ? *track->stream->codec : (struct mp_codec_params){0};
@@ -2048,8 +2054,8 @@ static int get_track_entry(int item, int action, void *arg, void *ctx)
{"external", SUB_PROP_BOOL(track->is_external)}, {"external", SUB_PROP_BOOL(track->is_external)},
{"selected", SUB_PROP_BOOL(track->selected)}, {"selected", SUB_PROP_BOOL(track->selected)},
{"main-selection", SUB_PROP_INT(order), .unavailable = order < 0}, {"main-selection", SUB_PROP_INT(order), .unavailable = order < 0},
{"external-filename", SUB_PROP_STR(track->external_filename), {"external-filename", SUB_PROP_STR(external_filename),
.unavailable = !track->external_filename}, .unavailable = !external_filename},
{"ff-index", SUB_PROP_INT(track->ff_index)}, {"ff-index", SUB_PROP_INT(track->ff_index)},
{"hls-bitrate", SUB_PROP_INT(track->hls_bitrate), {"hls-bitrate", SUB_PROP_INT(track->hls_bitrate),
.unavailable = !track->hls_bitrate}, .unavailable = !track->hls_bitrate},
@@ -2123,6 +2129,7 @@ static int get_track_entry(int item, int action, void *arg, void *ctx)
} }
done: done:
talloc_free(external_filename);
talloc_free(tag_list); talloc_free(tag_list);
return ret; return ret;
} }