From e06f846c8cdce3c4a7035e5d0467c46654368326 Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 3 May 2023 13:05:57 -0600 Subject: [PATCH] Updating function names to match their functionality. --- modules/archive/lib.py | 2 +- modules/videos/channel/lib.py | 2 +- wrolpi/files/api.py | 11 ++++++----- wrolpi/files/lib.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/archive/lib.py b/modules/archive/lib.py index 54b66adf..6a016fce 100644 --- a/modules/archive/lib.py +++ b/modules/archive/lib.py @@ -444,7 +444,7 @@ def search_archives(search_str: str, domain: str, limit: int, offset: int, order @optional_session -def search_domains_by_directory(name: str, limit: int = 5, session: Session = None) -> List[Domain]: +def search_domains_by_name(name: str, limit: int = 5, session: Session = None) -> List[Domain]: domains = session.query(Domain) \ .filter(Domain.domain.ilike(f'%{name}%')) \ .order_by(asc(Domain.domain)) \ diff --git a/modules/videos/channel/lib.py b/modules/videos/channel/lib.py index aa944d3b..71e81d68 100644 --- a/modules/videos/channel/lib.py +++ b/modules/videos/channel/lib.py @@ -199,7 +199,7 @@ def download_channel(id_: int): @optional_session -def search_channels_by_directory(name: str, limit: int = 5, session: Session = None) -> List[Channel]: +def search_channels_by_name(name: str, limit: int = 5, session: Session = None) -> List[Channel]: channels = session.query(Channel) \ .filter(Channel.name.ilike(f'%{name}%')) \ .order_by(asc(Channel.name)) \ diff --git a/wrolpi/files/api.py b/wrolpi/files/api.py index 9701ed26..876c9e91 100644 --- a/wrolpi/files/api.py +++ b/wrolpi/files/api.py @@ -126,17 +126,18 @@ async def post_search_directories(_, body: schema.DirectoriesSearchRequest): return response.empty() from modules.videos.channel import lib as channels_lib - channel_directories = channels_lib.search_channels_by_directory(name=body.name) - channel_directories = [dict(path=i.directory, name=i.name) for i in channel_directories] + channels = channels_lib.search_channels_by_name(name=body.name) + channel_directories = [dict(path=i.directory, name=i.name) for i in channels] channel_paths = [i['path'] for i in channel_directories] from modules.archive import lib as archives_lib - domain_directories = archives_lib.search_domains_by_directory(name=body.name) - domain_directories = [dict(path=i.directory, domain=i.domain) for i in domain_directories] + domains = archives_lib.search_domains_by_name(name=body.name) + domain_directories = [dict(path=i.directory, domain=i.domain) for i in domains] domain_paths = [i['path'] for i in domain_directories] + # Get all directories that match but do not contain the above directories. from wrolpi.files.models import Directory - directories: List[Directory] = await lib.search_directories( + directories: List[Directory] = await lib.search_directories_by_name( name=body.name, excluded=list(map(str, channel_paths + domain_paths))) diff --git a/wrolpi/files/lib.py b/wrolpi/files/lib.py index 0b19c11f..07e05d23 100644 --- a/wrolpi/files/lib.py +++ b/wrolpi/files/lib.py @@ -590,7 +590,7 @@ async def upsert_directories(parent_directories, directories): @optional_session -async def search_directories(name: str, excluded: List[str] = None, limit: int = 20, session: Session = None) \ +async def search_directories_by_name(name: str, excluded: List[str] = None, limit: int = 20, session: Session = None) \ -> List[Directory]: """Find the Directories whose names contain the `name` string.""" excluded = excluded or []