mirror of
https://github.com/zoriya/Kyoo.git
synced 2025-05-24 02:02:36 -04:00
refactor: use sets to avoid costly loops
This commit is contained in:
parent
8f4aecb236
commit
6992de5e2f
@ -11,12 +11,11 @@ logger = getLogger(__name__)
|
|||||||
|
|
||||||
|
|
||||||
def get_ignore_pattern():
|
def get_ignore_pattern():
|
||||||
|
"""Compile ignore pattern from environment variable."""
|
||||||
try:
|
try:
|
||||||
pattern = os.environ.get("LIBRARY_IGNORE_PATTERN")
|
pattern = os.environ.get("LIBRARY_IGNORE_PATTERN")
|
||||||
if pattern:
|
return re.compile(pattern) if pattern else None
|
||||||
return re.compile(pattern)
|
except re.error as e:
|
||||||
return None
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Invalid ignore pattern. Ignoring. Error: {e}")
|
logger.error(f"Invalid ignore pattern. Ignoring. Error: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@ -25,11 +24,14 @@ async def scan(
|
|||||||
path_: Optional[str], publisher: Publisher, client: KyooClient, remove_deleted=False
|
path_: Optional[str], publisher: Publisher, client: KyooClient, remove_deleted=False
|
||||||
):
|
):
|
||||||
path = path_ or os.environ.get("SCANNER_LIBRARY_ROOT", "/video")
|
path = path_ or os.environ.get("SCANNER_LIBRARY_ROOT", "/video")
|
||||||
logger.info("Starting the scan. It can take some time...")
|
logger.info("Starting scan at %s. This may take some time...", path)
|
||||||
ignore_pattern = get_ignore_pattern()
|
|
||||||
|
|
||||||
registered = await client.get_registered_paths()
|
ignore_pattern = get_ignore_pattern()
|
||||||
videos = []
|
if ignore_pattern:
|
||||||
|
logger.info(f"Applying ignore pattern: {ignore_pattern}")
|
||||||
|
|
||||||
|
registered = set(await client.get_registered_paths())
|
||||||
|
videos = set()
|
||||||
|
|
||||||
for dirpath, dirnames, files in os.walk(path):
|
for dirpath, dirnames, files in os.walk(path):
|
||||||
# Skip directories with a `.ignore` file
|
# Skip directories with a `.ignore` file
|
||||||
@ -42,23 +44,26 @@ async def scan(
|
|||||||
# Apply ignore pattern, if any
|
# Apply ignore pattern, if any
|
||||||
if ignore_pattern and ignore_pattern.match(file_path):
|
if ignore_pattern and ignore_pattern.match(file_path):
|
||||||
continue
|
continue
|
||||||
videos.append(file_path)
|
videos.add(file_path)
|
||||||
|
|
||||||
to_register = [p for p in videos if p not in registered]
|
to_register = videos - registered
|
||||||
|
to_delete = registered - videos if remove_deleted else set()
|
||||||
|
|
||||||
|
if to_register:
|
||||||
|
logger.info("Found %d new files to register.", len(to_register))
|
||||||
|
await asyncio.gather(*[publisher.add(path) for path in to_register])
|
||||||
|
|
||||||
|
if to_delete:
|
||||||
|
logger.info("Removing %d stale files.", len(to_delete))
|
||||||
|
await asyncio.gather(*[publisher.delete(path) for path in to_delete])
|
||||||
|
|
||||||
if remove_deleted:
|
if remove_deleted:
|
||||||
deleted = [x for x in registered if x not in videos]
|
issues = set(await client.get_issues())
|
||||||
logger.info("Found %d stale files to remove.", len(deleted))
|
issues_to_delete = issues - videos
|
||||||
if len(deleted) != len(registered):
|
if issues_to_delete:
|
||||||
await asyncio.gather(*map(publisher.delete, deleted))
|
logger.info("Removing %d stale issues.", len(issues_to_delete))
|
||||||
elif len(deleted) > 0:
|
await asyncio.gather(
|
||||||
logger.warning("All video files are unavailable. Check your disks.")
|
*[client.delete_issue(issue) for issue in issues_to_delete]
|
||||||
|
)
|
||||||
|
|
||||||
issues = await client.get_issues()
|
|
||||||
for x in issues:
|
|
||||||
if x not in videos:
|
|
||||||
await client.delete_issue(x)
|
|
||||||
|
|
||||||
logger.info("Found %d new files (counting non-video files)", len(to_register))
|
|
||||||
await asyncio.gather(*map(publisher.add, to_register))
|
|
||||||
logger.info("Scan finished for %s.", path)
|
logger.info("Scan finished for %s.", path)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user