mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
64959c450d
35f43dfacbadded a system to write resume files for redirects, i.e. directories and playlists that mpv expands. It creates a resume file for each redirect, and for the first redirect only, it writes a resume file for each segment of its path, without even converting it to an absolute path if it's relative. This is incomplete: mpv 'Iron Maiden/1982 The Number of the Beast/8 Hallowed Be Thy Name.mp3' This doesn't save any redirect entry. mpv --directory-mode=recursive 'Iron Maiden', then quit-watch-later on Hallowed Be Thy Name This saves a redirect entry for "Iron Maiden", but not for "1982 The Number of the Beast". It doesn't save redirect entries for the directories above "Iron Maiden" either because "Iron Maiden" isn't converted to an absolute path. In both of these cases mpv --directory-mode=lazy 'Iron Maiden' won't resume from "Hallowed Be Thy Name" because "1982 The Number of the Beast" isn't the first subdirectory and there is no redirect entry for it.503dada42fmade mpv recursively expand subdirectories precisely to fix this, andf266eadf1eadded back an option not to expand them. But if we fix how redirect entries are stored, we can make the superior --directory-mode=lazy (because it's faster and doesn't result in massive playlists) the default, and also ensure that mpv will resume playback even when you quit-watch-later a file without redirects and then play the directories above it. Fix this by always creating redirect entries for all segments of the absolute path of the file, so that both mpv 'Iron Maiden/1982 The Number of the Beast/8 Hallowed Be Thy Name.mp3' and mpv --directory-mode=lazy 'Iron Maiden' will create redirect entries for /$USER /$USER/music /$USER/music/Iron Maiden /$USER/music/Iron Maiden/1982 The Number of the Beast making mpv --directory-mode=lazy "Iron Maiden" resume from "Hallowed Be Thy Name". This commit also makes mpv delete the redirect entries of parent directories when resuming playback, because if for example you have a playlist with all the songs in a discography: 1980 Iron Maiden/1 Prowler.mp3 1980 Iron Maiden/2 Remember Tomorrow.mp3 ... 1981 Killers/1 The Ides of March.mp3 1981 Killers/2 Wrathchild.mp3 ... Now mpv will eventually create redirect entries for every album. If you later decide to play the directories instead and there are 20 albums, you would have to do mpv * 20 times to clear all the redirect entries.
99 lines
3.7 KiB
C
99 lines
3.7 KiB
C
/*
|
|
* Get path to config dir/file.
|
|
*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_PATH_H
|
|
#define MPLAYER_PATH_H
|
|
|
|
#include <stdbool.h>
|
|
#include "misc/bstr.h"
|
|
|
|
struct mpv_global;
|
|
struct MPOpts;
|
|
|
|
void mp_init_paths(struct mpv_global *global, struct MPOpts *opts);
|
|
|
|
// Search for the input filename in several paths. These include user and global
|
|
// config locations by default. Some platforms may implement additional platform
|
|
// related lookups (i.e.: OSX inside an application bundle).
|
|
char *mp_find_config_file(void *talloc_ctx, struct mpv_global *global,
|
|
const char *filename);
|
|
|
|
// Search for local writable user files within a specific kind of user dir
|
|
// as documented in osdep/path.h. This returns a result even if the file does
|
|
// not exist. Calling it with filename="" is equivalent to retrieving the path
|
|
// to the dir.
|
|
char *mp_find_user_file(void *talloc_ctx, struct mpv_global *global,
|
|
const char *type, const char *filename);
|
|
|
|
// Find all instances of the given config file. Paths are returned in order
|
|
// from lowest to highest priority. filename can contain multiple names
|
|
// separated with '|', with the first having highest priority.
|
|
char **mp_find_all_config_files(void *talloc_ctx, struct mpv_global *global,
|
|
const char *filename);
|
|
|
|
// Normally returns a talloc_strdup'ed copy of the path, except for special
|
|
// paths starting with '~'. Used to allow the user explicitly reference a
|
|
// file from the user's home or mpv config directory.
|
|
char *mp_get_user_path(void *talloc_ctx, struct mpv_global *global,
|
|
const char *path);
|
|
|
|
// Return pointer to filename part of path
|
|
|
|
char *mp_basename(const char *path);
|
|
|
|
/* Return file extension, excluding the '.'. If root is not NULL, set it to the
|
|
* part of the path without extension. So: path == root + "." + extension
|
|
* Don't consider it a file extension if the only '.' is the first character.
|
|
* Return NULL if no extension and don't set *root in this case.
|
|
*/
|
|
char *mp_splitext(const char *path, bstr *root);
|
|
|
|
/* Return struct bstr referencing directory part of path, or if that
|
|
* would be empty, ".".
|
|
*/
|
|
struct bstr mp_dirname(const char *path);
|
|
|
|
void mp_path_strip_trailing_separator(char *path);
|
|
|
|
/* Join two path components and return a newly allocated string
|
|
* for the result. '/' is inserted between the components if needed.
|
|
* If p2 is an absolute path then the value of p1 is ignored.
|
|
*/
|
|
char *mp_path_join(void *talloc_ctx, const char *p1, const char *p2);
|
|
char *mp_path_join_bstr(void *talloc_ctx, struct bstr p1, struct bstr p2);
|
|
|
|
// Return whether the path is absolute.
|
|
bool mp_path_is_absolute(struct bstr path);
|
|
|
|
char *mp_getcwd(void *talloc_ctx);
|
|
|
|
char *mp_normalize_path(void *talloc_ctx, const char *path);
|
|
|
|
bool mp_path_exists(const char *path);
|
|
bool mp_path_isdir(const char *path);
|
|
|
|
bool mp_is_url(bstr path);
|
|
|
|
bstr mp_split_proto(bstr path, bstr *out_url);
|
|
|
|
void mp_mkdirp(const char *dir);
|
|
void mp_mk_user_dir(struct mpv_global *global, const char *type, char *subdir);
|
|
|
|
#endif /* MPLAYER_PATH_H */
|