diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2021-06-10 12:32:28 +0300 |
|---|---|---|
| committer | avih <avih@users.noreply.github.com> | 2021-06-13 22:53:37 +0300 |
| commit | bc9d556f3a890cf5f99e9dced0117e2d8a91ff09 (patch) | |
| tree | 65b149b8d068e17c9b777a689e116430dbe791b0 /player | |
| parent | 03b9f8e32362b4ca8fcf4b14e0008ca3b13e06ce (diff) | |
| download | mpv-bc9d556f3a890cf5f99e9dced0117e2d8a91ff09.tar.bz2 mpv-bc9d556f3a890cf5f99e9dced0117e2d8a91ff09.tar.xz | |
js: add mp.utils.append_file
Also, for consistency with other APIs, mp.utils.{write,append}_file
now return true on success (and still throw on any error).
Diffstat (limited to 'player')
| -rw-r--r-- | player/javascript.c | 22 | ||||
| -rw-r--r-- | player/javascript/defaults.js | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/player/javascript.c b/player/javascript.c index 406a469447..136a5965b9 100644 --- a/player/javascript.c +++ b/player/javascript.c @@ -924,27 +924,31 @@ static void script_get_user_path(js_State *J, void *af) js_pushstring(J, mp_get_user_path(af, jctx(J)->mpctx->global, path)); } -// args: prefixed file name, data (c-str) -static void script_write_file(js_State *J, void *af) +// args: is_append, prefixed file name, data (c-str) +static void script__write_file(js_State *J, void *af) { static const char *prefix = "file://"; - const char *fname = js_tostring(J, 1); - const char *data = js_tostring(J, 2); + bool append = js_toboolean(J, 1); + const char *fname = js_tostring(J, 2); + const char *data = js_tostring(J, 3); + const char *opstr = append ? "append" : "write"; + if (strstr(fname, prefix) != fname) // simple protection for incorrect use js_error(J, "File name must be prefixed with '%s'", prefix); fname += strlen(prefix); fname = mp_get_user_path(af, jctx(J)->mpctx->global, fname); - MP_VERBOSE(jctx(J), "Writing file '%s'\n", fname); + MP_VERBOSE(jctx(J), "%s file '%s'\n", opstr, fname); - FILE *f = fopen(fname, "wb"); + FILE *f = fopen(fname, append ? "ab" : "wb"); if (!f) - js_error(J, "Cannot open file for writing: '%s'", fname); + js_error(J, "Cannot open (%s) file: '%s'", opstr, fname); add_af_file(af, f); int len = strlen(data); // limited by terminating null int wrote = fwrite(data, 1, len, f); if (len != wrote) - js_error(J, "Cannot write to file: '%s'", fname); + js_error(J, "Cannot %s to file: '%s'", opstr, fname); + js_pushboolean(J, 1); // success. doesn't touch last_error } // args: env var name @@ -1179,7 +1183,7 @@ static const struct fn_entry utils_fns[] = { FN_ENTRY(get_env_list, 0), FN_ENTRY(read_file, 2), - AF_ENTRY(write_file, 2), + AF_ENTRY(_write_file, 3), FN_ENTRY(getenv, 1), FN_ENTRY(compile_js, 2), FN_ENTRY(_gc, 1), diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js index c4482c88ce..037f931d94 100644 --- a/player/javascript/defaults.js +++ b/player/javascript/defaults.js @@ -665,6 +665,8 @@ 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.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); mp.dispatch_event = dispatch_event; mp.process_timers = process_timers; mp.notify_idle_observers = notify_idle_observers; |