2016-01-06 21:26:29 -07:00
|
|
|
# Copyright 2014-2016 OpenMarket Ltd
|
2021-01-15 08:57:37 -07:00
|
|
|
# Copyright 2020-2021 The Matrix.org Foundation C.I.C.
|
2014-12-02 08:09:51 -07:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
2018-07-09 00:09:20 -06:00
|
|
|
import functools
|
2014-12-02 08:09:51 -07:00
|
|
|
import os
|
2017-09-28 05:52:51 -06:00
|
|
|
import re
|
2021-11-19 06:39:15 -07:00
|
|
|
import string
|
|
|
|
from typing import Any, Callable, List, TypeVar, Union, cast
|
2017-09-28 05:52:51 -06:00
|
|
|
|
|
|
|
NEW_FORMAT_ID_RE = re.compile(r"^\d\d\d\d-\d\d-\d\d")
|
2014-12-02 08:09:51 -07:00
|
|
|
|
|
|
|
|
2021-10-12 11:19:21 -06:00
|
|
|
F = TypeVar("F", bound=Callable[..., str])
|
|
|
|
|
|
|
|
|
|
|
|
def _wrap_in_base_path(func: F) -> F:
|
2017-10-12 10:31:24 -06:00
|
|
|
"""Takes a function that returns a relative path and turns it into an
|
|
|
|
absolute path based on the location of the primary media store
|
|
|
|
"""
|
2019-06-20 03:32:02 -06:00
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
@functools.wraps(func)
|
2021-09-15 06:45:32 -06:00
|
|
|
def _wrapped(self: "MediaFilePaths", *args: Any, **kwargs: Any) -> str:
|
2017-10-12 10:31:24 -06:00
|
|
|
path = func(self, *args, **kwargs)
|
2017-10-13 04:42:07 -06:00
|
|
|
return os.path.join(self.base_path, path)
|
2017-10-12 10:31:24 -06:00
|
|
|
|
2021-10-12 11:19:21 -06:00
|
|
|
return cast(F, _wrapped)
|
2017-10-12 10:31:24 -06:00
|
|
|
|
|
|
|
|
2021-11-19 06:39:15 -07:00
|
|
|
GetPathMethod = TypeVar(
|
|
|
|
"GetPathMethod", bound=Union[Callable[..., str], Callable[..., List[str]]]
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
def _wrap_with_jail_check(relative: bool) -> Callable[[GetPathMethod], GetPathMethod]:
|
2021-11-19 06:39:15 -07:00
|
|
|
"""Wraps a path-returning method to check that the returned path(s) do not escape
|
|
|
|
the media store directory.
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
The path-returning method may return either a single path, or a list of paths.
|
|
|
|
|
2021-11-19 06:39:15 -07:00
|
|
|
The check is not expected to ever fail, unless `func` is missing a call to
|
|
|
|
`_validate_path_component`, or `_validate_path_component` is buggy.
|
|
|
|
|
|
|
|
Args:
|
2021-12-02 09:05:24 -07:00
|
|
|
relative: A boolean indicating whether the wrapped method returns paths relative
|
|
|
|
to the media store directory.
|
2021-11-19 06:39:15 -07:00
|
|
|
|
|
|
|
Returns:
|
2021-12-02 09:05:24 -07:00
|
|
|
A method which will wrap a path-returning method, adding a check to ensure that
|
|
|
|
the returned path(s) lie within the media store directory. The check will raise
|
|
|
|
a `ValueError` if it fails.
|
2021-11-19 06:39:15 -07:00
|
|
|
"""
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
def _wrap_with_jail_check_inner(func: GetPathMethod) -> GetPathMethod:
|
|
|
|
@functools.wraps(func)
|
|
|
|
def _wrapped(
|
|
|
|
self: "MediaFilePaths", *args: Any, **kwargs: Any
|
|
|
|
) -> Union[str, List[str]]:
|
|
|
|
path_or_paths = func(self, *args, **kwargs)
|
|
|
|
|
|
|
|
if isinstance(path_or_paths, list):
|
|
|
|
paths_to_check = path_or_paths
|
|
|
|
else:
|
|
|
|
paths_to_check = [path_or_paths]
|
|
|
|
|
|
|
|
for path in paths_to_check:
|
|
|
|
# Construct the path that will ultimately be used.
|
|
|
|
# We cannot guess whether `path` is relative to the media store
|
|
|
|
# directory, since the media store directory may itself be a relative
|
|
|
|
# path.
|
|
|
|
if relative:
|
|
|
|
path = os.path.join(self.base_path, path)
|
|
|
|
normalized_path = os.path.normpath(path)
|
|
|
|
|
|
|
|
# Now that `normpath` has eliminated `../`s and `./`s from the path,
|
|
|
|
# `os.path.commonpath` can be used to check whether it lies within the
|
|
|
|
# media store directory.
|
|
|
|
if (
|
|
|
|
os.path.commonpath([normalized_path, self.normalized_base_path])
|
|
|
|
!= self.normalized_base_path
|
|
|
|
):
|
|
|
|
# The path resolves to outside the media store directory,
|
|
|
|
# or `self.base_path` is `.`, which is an unlikely configuration.
|
|
|
|
raise ValueError(f"Invalid media store path: {path!r}")
|
|
|
|
|
|
|
|
# Note that `os.path.normpath`/`abspath` has a subtle caveat:
|
|
|
|
# `a/b/c/../c` will normalize to `a/b/c`, but the former refers to a
|
|
|
|
# different path if `a/b/c` is a symlink. That is, the check above is
|
|
|
|
# not perfect and may allow a certain restricted subset of untrustworthy
|
|
|
|
# paths through. Since the check above is secondary to the main
|
|
|
|
# `_validate_path_component` checks, it's less important for it to be
|
|
|
|
# perfect.
|
|
|
|
#
|
|
|
|
# As an alternative, `os.path.realpath` will resolve symlinks, but
|
|
|
|
# proves problematic if there are symlinks inside the media store.
|
|
|
|
# eg. if `url_store/` is symlinked to elsewhere, its canonical path
|
|
|
|
# won't match that of the main media store directory.
|
|
|
|
|
|
|
|
return path_or_paths
|
|
|
|
|
|
|
|
return cast(GetPathMethod, _wrapped)
|
|
|
|
|
|
|
|
return _wrap_with_jail_check_inner
|
2021-11-19 06:39:15 -07:00
|
|
|
|
|
|
|
|
|
|
|
ALLOWED_CHARACTERS = set(
|
|
|
|
string.ascii_letters
|
|
|
|
+ string.digits
|
|
|
|
+ "_-"
|
|
|
|
+ ".[]:" # Domain names, IPv6 addresses and ports in server names
|
|
|
|
)
|
|
|
|
FORBIDDEN_NAMES = {
|
|
|
|
"",
|
|
|
|
os.path.curdir, # "." for the current platform
|
|
|
|
os.path.pardir, # ".." for the current platform
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
def _validate_path_component(name: str) -> str:
|
|
|
|
"""Checks that the given string can be safely used as a path component
|
|
|
|
|
|
|
|
Args:
|
|
|
|
name: The path component to check.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
The path component if valid.
|
|
|
|
|
|
|
|
Raises:
|
|
|
|
ValueError: If `name` cannot be safely used as a path component.
|
|
|
|
"""
|
|
|
|
if not ALLOWED_CHARACTERS.issuperset(name) or name in FORBIDDEN_NAMES:
|
|
|
|
raise ValueError(f"Invalid path component: {name!r}")
|
|
|
|
|
|
|
|
return name
|
|
|
|
|
|
|
|
|
2020-09-04 04:54:56 -06:00
|
|
|
class MediaFilePaths:
|
2017-10-12 10:31:24 -06:00
|
|
|
"""Describes where files are stored on disk.
|
2014-12-02 08:09:51 -07:00
|
|
|
|
2017-10-12 11:16:25 -06:00
|
|
|
Most of the functions have a `*_rel` variant which returns a file path that
|
2017-10-12 10:31:24 -06:00
|
|
|
is relative to the base media store path. This is mainly used when we want
|
|
|
|
to write to the backup media store (when one is configured)
|
|
|
|
"""
|
2014-12-02 08:09:51 -07:00
|
|
|
|
2021-01-15 08:57:37 -07:00
|
|
|
def __init__(self, primary_base_path: str):
|
2017-10-13 04:42:07 -06:00
|
|
|
self.base_path = primary_base_path
|
2021-12-02 09:05:24 -07:00
|
|
|
self.normalized_base_path = os.path.normpath(self.base_path)
|
2021-11-19 06:39:15 -07:00
|
|
|
|
|
|
|
# Refuse to initialize if paths cannot be validated correctly for the current
|
|
|
|
# platform.
|
|
|
|
assert os.path.sep not in ALLOWED_CHARACTERS
|
|
|
|
assert os.path.altsep not in ALLOWED_CHARACTERS
|
|
|
|
# On Windows, paths have all sorts of weirdness which `_validate_path_component`
|
|
|
|
# does not consider. In any case, the remote media store can't work correctly
|
|
|
|
# for certain homeservers there, since ":"s aren't allowed in paths.
|
|
|
|
assert os.name == "posix"
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-01-15 08:57:37 -07:00
|
|
|
def local_media_filepath_rel(self, media_id: str) -> str:
|
2021-11-19 06:39:15 -07:00
|
|
|
return os.path.join(
|
|
|
|
"local_content",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
|
|
|
)
|
2014-12-02 08:09:51 -07:00
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
local_media_filepath = _wrap_in_base_path(local_media_filepath_rel)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-01-15 08:57:37 -07:00
|
|
|
def local_media_thumbnail_rel(
|
|
|
|
self, media_id: str, width: int, height: int, content_type: str, method: str
|
|
|
|
) -> str:
|
2014-12-02 08:09:51 -07:00
|
|
|
top_level_type, sub_type = content_type.split("/")
|
2014-12-10 07:46:55 -07:00
|
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
2014-12-02 08:09:51 -07:00
|
|
|
return os.path.join(
|
2021-11-19 06:39:15 -07:00
|
|
|
"local_thumbnails",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
|
|
|
_validate_path_component(file_name),
|
2014-12-02 08:09:51 -07:00
|
|
|
)
|
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
local_media_thumbnail = _wrap_in_base_path(local_media_thumbnail_rel)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=False)
|
2020-10-26 11:02:28 -06:00
|
|
|
def local_media_thumbnail_dir(self, media_id: str) -> str:
|
|
|
|
"""
|
|
|
|
Retrieve the local store path of thumbnails of a given media_id
|
|
|
|
|
|
|
|
Args:
|
|
|
|
media_id: The media ID to query.
|
|
|
|
Returns:
|
|
|
|
Path of local_thumbnails from media_id
|
|
|
|
"""
|
|
|
|
return os.path.join(
|
|
|
|
self.base_path,
|
|
|
|
"local_thumbnails",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
2020-10-26 11:02:28 -06:00
|
|
|
)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-01-15 08:57:37 -07:00
|
|
|
def remote_media_filepath_rel(self, server_name: str, file_id: str) -> str:
|
2014-12-02 08:09:51 -07:00
|
|
|
return os.path.join(
|
2021-11-19 06:39:15 -07:00
|
|
|
"remote_content",
|
|
|
|
_validate_path_component(server_name),
|
|
|
|
_validate_path_component(file_id[0:2]),
|
|
|
|
_validate_path_component(file_id[2:4]),
|
|
|
|
_validate_path_component(file_id[4:]),
|
2014-12-02 08:09:51 -07:00
|
|
|
)
|
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
remote_media_filepath = _wrap_in_base_path(remote_media_filepath_rel)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2017-10-12 10:31:24 -06:00
|
|
|
def remote_media_thumbnail_rel(
|
2021-01-15 08:57:37 -07:00
|
|
|
self,
|
|
|
|
server_name: str,
|
|
|
|
file_id: str,
|
|
|
|
width: int,
|
|
|
|
height: int,
|
|
|
|
content_type: str,
|
|
|
|
method: str,
|
|
|
|
) -> str:
|
2014-12-02 08:09:51 -07:00
|
|
|
top_level_type, sub_type = content_type.split("/")
|
2020-09-08 10:19:50 -06:00
|
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
2014-12-02 08:09:51 -07:00
|
|
|
return os.path.join(
|
2017-10-12 10:31:24 -06:00
|
|
|
"remote_thumbnail",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(server_name),
|
|
|
|
_validate_path_component(file_id[0:2]),
|
|
|
|
_validate_path_component(file_id[2:4]),
|
|
|
|
_validate_path_component(file_id[4:]),
|
|
|
|
_validate_path_component(file_name),
|
2014-12-02 08:09:51 -07:00
|
|
|
)
|
2016-06-29 07:57:59 -06:00
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
remote_media_thumbnail = _wrap_in_base_path(remote_media_thumbnail_rel)
|
|
|
|
|
2020-09-08 10:19:50 -06:00
|
|
|
# Legacy path that was used to store thumbnails previously.
|
|
|
|
# Should be removed after some time, when most of the thumbnails are stored
|
|
|
|
# using the new path.
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2020-09-08 10:19:50 -06:00
|
|
|
def remote_media_thumbnail_rel_legacy(
|
2021-01-15 08:57:37 -07:00
|
|
|
self, server_name: str, file_id: str, width: int, height: int, content_type: str
|
2021-09-15 06:45:32 -06:00
|
|
|
) -> str:
|
2020-09-08 10:19:50 -06:00
|
|
|
top_level_type, sub_type = content_type.split("/")
|
|
|
|
file_name = "%i-%i-%s-%s" % (width, height, top_level_type, sub_type)
|
|
|
|
return os.path.join(
|
|
|
|
"remote_thumbnail",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(server_name),
|
|
|
|
_validate_path_component(file_id[0:2]),
|
|
|
|
_validate_path_component(file_id[2:4]),
|
|
|
|
_validate_path_component(file_id[4:]),
|
|
|
|
_validate_path_component(file_name),
|
2020-09-08 10:19:50 -06:00
|
|
|
)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=False)
|
2021-01-15 08:57:37 -07:00
|
|
|
def remote_media_thumbnail_dir(self, server_name: str, file_id: str) -> str:
|
2016-06-29 07:57:59 -06:00
|
|
|
return os.path.join(
|
2017-10-13 04:42:07 -06:00
|
|
|
self.base_path,
|
|
|
|
"remote_thumbnail",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(server_name),
|
|
|
|
_validate_path_component(file_id[0:2]),
|
|
|
|
_validate_path_component(file_id[2:4]),
|
|
|
|
_validate_path_component(file_id[4:]),
|
2016-06-29 07:57:59 -06:00
|
|
|
)
|
2017-06-23 04:14:11 -06:00
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-01-15 08:57:37 -07:00
|
|
|
def url_cache_filepath_rel(self, media_id: str) -> str:
|
2017-09-28 05:52:51 -06:00
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
2021-11-19 06:39:15 -07:00
|
|
|
return os.path.join(
|
|
|
|
"url_cache",
|
|
|
|
_validate_path_component(media_id[:10]),
|
|
|
|
_validate_path_component(media_id[11:]),
|
|
|
|
)
|
2017-09-28 05:52:51 -06:00
|
|
|
else:
|
2021-11-19 06:39:15 -07:00
|
|
|
return os.path.join(
|
|
|
|
"url_cache",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
|
|
|
)
|
2017-06-23 04:14:11 -06:00
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
url_cache_filepath = _wrap_in_base_path(url_cache_filepath_rel)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=False)
|
2021-01-15 08:57:37 -07:00
|
|
|
def url_cache_filepath_dirs_to_delete(self, media_id: str) -> List[str]:
|
2017-09-28 05:18:06 -06:00
|
|
|
"The dirs to try and remove if we delete the media_id file"
|
2017-09-28 05:52:51 -06:00
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
2021-11-19 06:39:15 -07:00
|
|
|
return [
|
|
|
|
os.path.join(
|
|
|
|
self.base_path, "url_cache", _validate_path_component(media_id[:10])
|
|
|
|
)
|
|
|
|
]
|
2017-09-28 05:52:51 -06:00
|
|
|
else:
|
|
|
|
return [
|
2021-11-19 06:39:15 -07:00
|
|
|
os.path.join(
|
|
|
|
self.base_path,
|
|
|
|
"url_cache",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
),
|
|
|
|
os.path.join(
|
|
|
|
self.base_path, "url_cache", _validate_path_component(media_id[0:2])
|
|
|
|
),
|
2017-09-28 05:52:51 -06:00
|
|
|
]
|
2017-09-28 05:18:06 -06:00
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-01-15 08:57:37 -07:00
|
|
|
def url_cache_thumbnail_rel(
|
|
|
|
self, media_id: str, width: int, height: int, content_type: str, method: str
|
|
|
|
) -> str:
|
2017-09-28 05:18:06 -06:00
|
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
|
|
|
2017-06-23 04:14:11 -06:00
|
|
|
top_level_type, sub_type = content_type.split("/")
|
|
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
2017-09-28 05:18:06 -06:00
|
|
|
|
2017-09-28 05:52:51 -06:00
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
|
|
return os.path.join(
|
2021-11-19 06:39:15 -07:00
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[:10]),
|
|
|
|
_validate_path_component(media_id[11:]),
|
|
|
|
_validate_path_component(file_name),
|
2017-09-28 05:52:51 -06:00
|
|
|
)
|
|
|
|
else:
|
|
|
|
return os.path.join(
|
2017-10-12 10:31:24 -06:00
|
|
|
"url_cache_thumbnails",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
|
|
|
_validate_path_component(file_name),
|
2017-09-28 05:52:51 -06:00
|
|
|
)
|
2017-09-28 05:18:06 -06:00
|
|
|
|
2017-10-12 10:31:24 -06:00
|
|
|
url_cache_thumbnail = _wrap_in_base_path(url_cache_thumbnail_rel)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=True)
|
2021-09-27 05:55:27 -06:00
|
|
|
def url_cache_thumbnail_directory_rel(self, media_id: str) -> str:
|
2017-09-28 05:18:06 -06:00
|
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
|
|
|
2017-09-28 05:52:51 -06:00
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
2021-11-19 06:39:15 -07:00
|
|
|
return os.path.join(
|
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[:10]),
|
|
|
|
_validate_path_component(media_id[11:]),
|
|
|
|
)
|
2017-09-28 05:52:51 -06:00
|
|
|
else:
|
|
|
|
return os.path.join(
|
2017-10-13 04:42:07 -06:00
|
|
|
"url_cache_thumbnails",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
2017-09-28 05:52:51 -06:00
|
|
|
)
|
2017-09-28 05:18:06 -06:00
|
|
|
|
2021-09-27 05:55:27 -06:00
|
|
|
url_cache_thumbnail_directory = _wrap_in_base_path(
|
|
|
|
url_cache_thumbnail_directory_rel
|
|
|
|
)
|
|
|
|
|
2021-12-02 09:05:24 -07:00
|
|
|
@_wrap_with_jail_check(relative=False)
|
2021-01-15 08:57:37 -07:00
|
|
|
def url_cache_thumbnail_dirs_to_delete(self, media_id: str) -> List[str]:
|
2017-09-28 05:18:06 -06:00
|
|
|
"The dirs to try and remove if we delete the media_id thumbnails"
|
|
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
2017-09-28 05:52:51 -06:00
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
|
|
return [
|
|
|
|
os.path.join(
|
2021-11-19 06:39:15 -07:00
|
|
|
self.base_path,
|
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[:10]),
|
|
|
|
_validate_path_component(media_id[11:]),
|
|
|
|
),
|
|
|
|
os.path.join(
|
|
|
|
self.base_path,
|
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[:10]),
|
2017-09-28 05:52:51 -06:00
|
|
|
),
|
|
|
|
]
|
|
|
|
else:
|
|
|
|
return [
|
|
|
|
os.path.join(
|
2017-10-13 04:42:07 -06:00
|
|
|
self.base_path,
|
|
|
|
"url_cache_thumbnails",
|
2021-11-19 06:39:15 -07:00
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
_validate_path_component(media_id[4:]),
|
2017-09-28 05:52:51 -06:00
|
|
|
),
|
|
|
|
os.path.join(
|
2021-11-19 06:39:15 -07:00
|
|
|
self.base_path,
|
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
|
|
|
_validate_path_component(media_id[2:4]),
|
|
|
|
),
|
|
|
|
os.path.join(
|
|
|
|
self.base_path,
|
|
|
|
"url_cache_thumbnails",
|
|
|
|
_validate_path_component(media_id[0:2]),
|
2017-09-28 05:52:51 -06:00
|
|
|
),
|
|
|
|
]
|