Caching file dict functions.

This commit is contained in:
Roland 2023-02-14 13:15:49 -07:00
parent 71654841bd
commit 7190ac2238
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 10 additions and 3 deletions

View file

@ -9,6 +9,7 @@ import subprocess
from pathlib import Path
from typing import List, Tuple, Union, Dict
import cachetools.func
import psycopg2
from sqlalchemy.orm import Session
@ -40,6 +41,7 @@ __all__ = ['list_directories_contents', 'delete_file', 'split_path_stem_and_suff
'split_file_name_words']
@cachetools.func.ttl_cache(1000, 30.0)
def _get_file_dict(file: pathlib.Path) -> Dict:
media_directory = get_media_directory()
return dict(
@ -49,7 +51,8 @@ def _get_file_dict(file: pathlib.Path) -> Dict:
)
def __get_directory_dict(directory: pathlib.Path) -> Dict:
@cachetools.func.ttl_cache(1000, 30.0)
def _get_directory_dict(directory: pathlib.Path) -> Dict:
media_directory = get_media_directory()
return dict(
path=f'{directory.relative_to(media_directory)}/',
@ -58,14 +61,14 @@ def __get_directory_dict(directory: pathlib.Path) -> Dict:
def _get_recursive_directory_dict(directory: pathlib.Path, directories: List[pathlib.Path]) -> Dict:
d = __get_directory_dict(directory)
d = _get_directory_dict(directory)
if directory in directories:
children = dict()
for path in directory.iterdir():
if path.is_dir() and path in directories:
children[f'{path.name}/'] = _get_recursive_directory_dict(path, directories)
elif path.is_dir():
children[f'{path.name}/'] = __get_directory_dict(path)
children[f'{path.name}/'] = _get_directory_dict(path)
else:
children[path.name] = _get_file_dict(path)
d['children'] = children

View file

@ -9,6 +9,7 @@ from wrolpi.errors import API_ERRORS, WROLModeEnabled
from wrolpi.files.models import File
from wrolpi.test.common import assert_dict_contains
from wrolpi.vars import PROJECT_DIR
from wrolpi.files import lib as files_lib
def test_list_files_api(test_client, make_files_structure, test_directory):
@ -31,6 +32,9 @@ def test_list_files_api(test_client, make_files_structure, test_directory):
# The first dict is the media directory.
children = response.json['files']
assert children == expected_files
# Clear caches before next call.
files_lib._get_file_dict.cache_clear()
files_lib._get_directory_dict.cache_clear()
# Requesting no directories results in the top-level results.
expected = {