misc/path_utils: make mp_basename() return full URLs

When the path is a URL, use the whole path as basename. The dirname will
be "." in this case.

This simplifies various checks throughout the codebase. In particular,
it avoids returning an empty string for URLs ending with /.

The filename property will return full URLs, which is desirable because
the domain and path segments before the last are useful information.
This fixes half of mpv-player#10975. The empty string check in
mp_property_filename() can be removed because it only happened with the
basename of URLs ending with /. mp_property_filename() will not be
called with directories with trailing slashes because mpv expands them
immediately when they are the current playlist entry; I tested it by
observing filename. Also mpv-player#16896 will prevent directories with trailing
slashes anyway.

This also fixes the issue described in mpv-player#17015 of %f in
--screenshot-template being evaluated to an empty string for URLs ending
with /, which can inadvertently make it use an absolute path.

Alternative to mpv-player#16932 and mpv-player#17021.

Author: guidocella

misc/path_utils.c

@@ -41,17 +41,18 @@
 
 char *mp_basename(const char *path)
 {
+    if (mp_is_url(bstr0(path)))
+        return (char *)path;
+
     char *s;
 
 #if HAVE_DOS_PATHS
-    if (!mp_is_url(bstr0(path))) {
-        s = strrchr(path, '\\');
-        if (s)
-            path = s + 1;
-        s = strrchr(path, ':');
-        if (s)
-            path = s + 1;
-    }
+    s = strrchr(path, '\\');
+    if (s)
+        path = s + 1;
+    s = strrchr(path, ':');
+    if (s)
+        path = s + 1;
 #endif
     s = strrchr(path, '/');
     return s ? s + 1 : (char *)path;

player/command.c

@@ -527,8 +527,6 @@ static int mp_property_filename(void *ctx, struct m_property *prop,
     if (mp_is_url(bstr0(filename)))
         mp_url_unescape_inplace(filename);
     char *f = (char *)mp_basename(filename);
-    if (!f[0])
-        f = filename;
     if (action == M_PROPERTY_KEY_ACTION) {
         struct m_property_action_arg *ka = arg;
         if (strcmp(ka->key, "no-ext") == 0) {
@@ -3508,12 +3506,9 @@ static int mp_property_playlist(void *ctx, struct m_property *prop,
             const char *reset = pl->current == e ? get_style_reset(mpctx) : "";
             char *p = e->title;
             if (!p || mpctx->opts->playlist_entry_name > 0) {
-                p = e->filename;
-                if (!mp_is_url(bstr0(p))) {
-                    char *s = mp_basename(e->filename);
-                    if (s[0])
-                        p = s;
-                }
+                p = mp_basename(e->filename);
+                if (!p[0])
+                    p = e->filename;
             }
             if (!e->title || p == e->title || mpctx->opts->playlist_entry_name == 1) {
                 res = talloc_asprintf_append(res, "%s%s\n", p, reset);

player/configfiles.c

@@ -215,9 +215,7 @@ static char *mp_get_playback_resume_config_filename(struct MPContext *mpctx,
     char *res = NULL;
     void *tmp = talloc_new(NULL);
     const char *path = NULL;
-    if (mp_is_url(bstr0(fname))) {
-        path = fname;
-    } else if (opts->ignore_path_in_watch_later_config) {
+    if (opts->ignore_path_in_watch_later_config) {
         path = mp_basename(fname);
     } else {
         path = mp_normalize_path(tmp, fname);
@@ -255,7 +253,7 @@ static bool needs_config_quoting(const char *s)
 
 static void write_filename(struct MPContext *mpctx, FILE *file, char *filename)
 {
-    if (mpctx->opts->ignore_path_in_watch_later_config && !mp_is_url(bstr0(filename)))
+    if (mpctx->opts->ignore_path_in_watch_later_config)
         filename = mp_basename(filename);
 
     if (mpctx->opts->write_filename_in_watch_later_config) {
@@ -287,7 +285,7 @@ static void write_redirect(struct MPContext *mpctx, char *path)
 
 static void write_redirects_for_parent_dirs(struct MPContext *mpctx, char *path)
 {
-    if (mp_is_url(bstr0(path)) || mpctx->opts->ignore_path_in_watch_later_config)
+    if (mpctx->opts->ignore_path_in_watch_later_config)
         return;
 
     // Write redirect entries for the file's parent directories to allow
@@ -412,7 +410,7 @@ void mp_delete_watch_later_conf(struct MPContext *mpctx, const char *file)
     unlink(fname);
     talloc_free(fname);
 
-    if (mp_is_url(bstr0(path)) || mpctx->opts->ignore_path_in_watch_later_config)
+    if (mpctx->opts->ignore_path_in_watch_later_config)
         goto exit;
 
     bstr dir = mp_dirname(path);

player/lua/select.lua

@@ -49,11 +49,8 @@ mp.add_key_binding(nil, "select-playlist", function ()
     for i, entry in ipairs(mp.get_property_native("playlist")) do
         playlist[i] = entry.title
         if not playlist[i] or show ~= "title" then
-            playlist[i] = entry.filename
-            if not playlist[i]:find("://") then
-                playlist[i] = select(2, utils.split_path(
-                    playlist[i]:gsub(trailing_slash_pattern, "")))
-            end
+            playlist[i] = select(2, utils.split_path(
+                entry.filename:gsub(trailing_slash_pattern, "")))
         end
         if entry.title and show == "both" then
             playlist[i] = string.format("%s (%s)", entry.title, playlist[i])