player: add current-watch-history-path property

Will be used next commit.

Author: Dudemanguy

DOCS/interface-changes/watch-history-path.txt

@@ -0,0 +1,2 @@
+change `--watch-history-path` to be unset by default
+use the `current-watch-history-path` property to get the path instead

DOCS/man/input.rst

@@ -3880,6 +3880,11 @@ Property list
     The working directory of the mpv process. Can be useful for JSON IPC users,
     because the command line player usually works with relative paths.
 
+``current-watch-history-path``
+    The path in which the watch history file is stored. This will return the
+    value of ``--watch-history-path`` or the default path if
+    ``--watch-history-path`` has not been set with tilde placeholders expanded.
+
 ``current-watch-later-dir``
     The directory in which watch later config files are stored. This returns
     ``--watch-later-dir``, or the default directory if ``--watch-later-dir`` has

player/command.c

@@ -3632,6 +3632,16 @@ static int mp_property_cwd(void *ctx, struct m_property *prop,
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
+static int mp_property_current_watch_history_path(void *ctx, struct m_property *prop,
+                                                  int action, void *arg)
+{
+    MPContext *mpctx = ctx;
+    char *path = mp_get_watch_history_path(NULL, mpctx);
+    int r = m_property_strdup_ro(action, arg, path);
+    talloc_free(path);
+    return r;
+}
+
 static int mp_property_current_watch_later_dir(void *ctx, struct m_property *prop,
                                                int action, void *arg)
 {
@@ -4519,6 +4529,7 @@ static const struct m_property mp_properties_base[] = {
     {"ambient-light", mp_property_ambient_light},
 
     {"working-directory", mp_property_cwd},
+    {"current-watch-history-path", mp_property_current_watch_history_path},
     {"current-watch-later-dir", mp_property_current_watch_later_dir},
 
     {"protocol-list", mp_property_protocols},

player/configfiles.c

@@ -197,6 +197,17 @@ static bool copy_mtime(const char *f1, const char *f2)
     return true;
 }
 
+char *mp_get_watch_history_path(void *talloc_ctx, struct MPContext *mpctx)
+{
+    char *history_path = mpctx->opts->watch_history_path;
+    if (history_path && history_path[0]) {
+        history_path = talloc_strdup(talloc_ctx, history_path);
+    } else {
+        history_path = mp_find_user_file(talloc_ctx, mpctx->log, "state", "watch_history.jsonl");
+    }
+    return history_path;
+}
+
 char *mp_get_playback_resume_dir(struct MPContext *mpctx)
 {
     char *wl_dir = mpctx->opts->watch_later_dir;

player/core.h

@@ -513,6 +513,7 @@ void audio_start_ao(struct MPContext *mpctx);
 void mp_parse_cfgfiles(struct MPContext *mpctx);
 void mp_load_auto_profiles(struct MPContext *mpctx);
 bool mp_load_playback_resume(struct MPContext *mpctx, const char *file);
+char *mp_get_watch_history_path(void *talloc_ctx, struct MPContext *mpctx);
 char *mp_get_playback_resume_dir(struct MPContext *mpctx);
 void mp_write_watch_later_conf(struct MPContext *mpctx);
 void mp_delete_watch_later_conf(struct MPContext *mpctx, const char *file);

player/loadfile.c

@@ -1545,9 +1545,7 @@ static void append_to_watch_history(struct MPContext *mpctx)
         return;
 
     void *ctx = talloc_new(NULL);
-    char *history_path = mpctx->opts->watch_history_path;
-    if (!history_path || !history_path[0])
-        history_path = mp_find_user_file(ctx, mpctx->log, "state", "watch_history.jsonl");
+    char *history_path = mp_get_watch_history_path(NULL, mpctx);
     char *history_path_dir = bstrto0(ctx, mp_dirname(history_path));
     mp_mkdirp(history_path_dir);