mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 22:12:21 -04:00
Restore ability for add-ons to provide full paths to media (#4054)
* fix #4053 * check if file exist AJT Japanese needs to play files stored in all possible locations on disk * check absolute path * add comment * check if passed name is basename * Add a security note to reduce the chance of a regression * Tweak comment in the non-add-on case
This commit is contained in:
parent
29e3146e1f
commit
3ab8c2294d
1 changed files with 17 additions and 4 deletions
|
@ -38,16 +38,29 @@ class SoundOrVideoTag:
|
||||||
"""Contains the filename inside a [sound:...] tag.
|
"""Contains the filename inside a [sound:...] tag.
|
||||||
|
|
||||||
Video files also use [sound:...].
|
Video files also use [sound:...].
|
||||||
|
|
||||||
|
SECURITY: We should only ever construct this with basename(filename),
|
||||||
|
as passing arbitrary paths to mpv from a shared deck is a security issue.
|
||||||
|
|
||||||
|
Anki add-ons can supply an absolute file path to play any file on disk
|
||||||
|
using the built-in media player.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
filename: str
|
filename: str
|
||||||
|
|
||||||
def path(self, media_folder: str) -> str:
|
def path(self, media_folder: str) -> str:
|
||||||
"Prepend the media folder to the filename."
|
"Prepend the media folder to the filename."
|
||||||
# Ensure filename doesn't reference parent folder
|
if os.path.basename(self.filename) == self.filename:
|
||||||
filename = os.path.basename(self.filename)
|
# Path in the current collection's media folder.
|
||||||
filename = hooks.media_file_filter(filename)
|
# Turn it into a fully-qualified path so mpv can find it, and to
|
||||||
return os.path.join(media_folder, filename)
|
# ensure the filename doesn't get treated like a non-file scheme.
|
||||||
|
head, tail = media_folder, self.filename
|
||||||
|
else:
|
||||||
|
# Add-ons can use absolute paths to play arbitrary files on disk.
|
||||||
|
# Example: sound.av_player.play_tags([SoundOrVideoTag("/path/to/file")])
|
||||||
|
head, tail = os.path.split(os.path.abspath(self.filename))
|
||||||
|
tail = hooks.media_file_filter(tail)
|
||||||
|
return os.path.join(head, tail)
|
||||||
|
|
||||||
|
|
||||||
# note this does not include image tags, which are handled with HTML.
|
# note this does not include image tags, which are handled with HTML.
|
||||||
|
|
Loading…
Reference in a new issue