RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

js: utils.get_user_path: make wrapper of expand-path

Browse Source 
When utils.get_user_path was added, the expand-path command didn't
exist. Now it does, so remove the C code, make it a trivial wrapper.

Keep this function for backward compat to not break scripts, but
technically it's not required anymore.
This commit is contained in:
Avi Halachmi (:avih) 2022-02-04 12:44:13 +02:00
parent 5d31c7310c
commit 7849a36beb
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOCS/man/javascript.rst
View File

@ -215,9 +215,9 @@ Additional utilities
``undefined`` if the variable is not defined.
``mp.utils.get_user_path(path)``
Expands (mpv) meta paths like ``~/x``, ``~~/y``, ``~~desktop/z`` etc.
``read_file``, ``write_file``, ``append_file`` and ``require`` already use
this internally.
Trivial wrapper of the ``expand-path`` mpv command, returns a string.
``read_file``, ``write_file``, ``append_file`` and ``require`` already
expand the path internally and accept mpv meta-paths like ``~~desktop/foo``.
``mp.utils.read_file(fname [,max])``
Returns the content of file ``fname`` as string. If ``max`` is provided and

7
player/javascript.c
View File

@ -944,12 +944,6 @@ static void script_join_path(js_State *J, void *af)
js_pushstring(J, mp_path_join(af, js_tostring(J, 1), js_tostring(J, 2)));
}
static void script_get_user_path(js_State *J, void *af)
{
const char *path = js_tostring(J, 1);
js_pushstring(J, mp_get_user_path(af, jctx(J)->mpctx->global, path));
}
// args: is_append, prefixed file name, data (c-str)
static void script__write_file(js_State *J, void *af)
{
@ -1205,7 +1199,6 @@ static const struct fn_entry utils_fns[] = {
FN_ENTRY(file_info, 1),
FN_ENTRY(split_path, 1),
AF_ENTRY(join_path, 2),
AF_ENTRY(get_user_path, 1),
FN_ENTRY(get_env_list, 0),
FN_ENTRY(read_file, 2),

2
player/javascript/defaults.js
View File

@ -674,6 +674,8 @@ mp.get_script_directory = function() { return mp.script_path };
mp.get_time = function() { return mp.get_time_ms() / 1000 };
mp.utils.getcwd = function() { return mp.get_property("working-directory") };
mp.utils.getpid = function() { return mp.get_property_number("pid") }
mp.utils.get_user_path =
function(p) { return mp.command_native(["expand-path", String(p)]) };
mp.get_mouse_pos = function() { return mp.get_property_native("mouse-pos") };
mp.utils.write_file = mp.utils._write_file.bind(null, false);
mp.utils.append_file = mp.utils._write_file.bind(null, true);