RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

js: ~~/init.js: use mp.find_config_file 

The problem with the previous code - which used mp.get_user_path, is
that it returns a path even with --no-config, and even if the file
doesn't exist.

This is why we tested the "config" property, and also used
mp.utils.file_info to check that the file exists.

mp.find_config_file doesn't return a path with no-cofig and doesn't
return a path if the file doesn't exists. It's simpler and better.
This commit is contained in:
Avi Halachmi (:avih) 2021-10-31 01:08:08 +03:00 committed by sfan5
parent 3ea1f8e80a
commit f6b834a2fc
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
player/javascript/defaults.js
View File

@ -771,14 +771,10 @@ g.mp_event_loop = function mp_event_loop() {
// let the user extend us, e.g. by adding items to mp.module_paths
if (mp.get_property_bool("config")) { // --no-config disables custom init
// file_info doesn't expand meta-paths (other file functions do)
var file_info = mp.utils.file_info, user_path = mp.utils.get_user_path;
if (file_info(user_path("~~/init.js")))
require("~~/init");
else if (file_info(user_path("~~/.init.js")))
mp.msg.warn("Config file ~~/.init.js is ignored. Use ~~/init.js");
}
var initjs = mp.find_config_file("init.js"); // ~~/init.js
if (initjs)
require(initjs.slice(0, -3)); // remove ".js"
else if ((initjs = mp.find_config_file(".init.js")))
mp.msg.warn("Use init.js instead of .init.js (ignoring " + initjs + ")");
})(this)