Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • arkindex/workers/thumbnails
1 result
Show changes
Commits on Source (8)
...@@ -4,7 +4,7 @@ version: 2 ...@@ -4,7 +4,7 @@ version: 2
workers: workers:
- slug: thumbnails-generator - slug: thumbnails-generator
name: Thumbnails Generator name: Thumbnails Generator
type: generator type: Utils
docker: docker:
build: Dockerfile build: Dockerfile
configuration: configuration:
......
...@@ -134,3 +134,4 @@ publish-worker: ...@@ -134,3 +134,4 @@ publish-worker:
- demo - demo
# Publish worker on https://arkindex.teklia.com # Publish worker on https://arkindex.teklia.com
- prod - prod
- elephant
This diff is collapsed.
...@@ -4,6 +4,7 @@ build-backend = "setuptools.build_meta" ...@@ -4,6 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "worker_thumbnails_generator" name = "worker_thumbnails_generator"
license = { file = "LICENSE" }
version = "0.1.0" version = "0.1.0"
description = "Worker to generate thumbnails for Arkindex elements" description = "Worker to generate thumbnails for Arkindex elements"
dynamic = ["dependencies"] dynamic = ["dependencies"]
......
...@@ -175,6 +175,13 @@ def test_process_element_no_images_found(caplog, mock_worker): ...@@ -175,6 +175,13 @@ def test_process_element_no_images_found(caplog, mock_worker):
folder=False, folder=False,
response=[], response=[],
) )
mock_worker.api_client.add_response(
"ListElementChildren",
id=folder.id,
folder=False,
recursive=True,
response=[],
)
mock_worker.process_element(folder) mock_worker.process_element(folder)
......
...@@ -31,15 +31,13 @@ class ThumbnailsGenerator(ElementsWorker): ...@@ -31,15 +31,13 @@ class ThumbnailsGenerator(ElementsWorker):
""" """
List all elements in a folder that could have images and could be used as thumbnails. List all elements in a folder that could have images and could be used as thumbnails.
""" """
# First try with the first page of results returned by a non-recursive list, much faster than recursive # First try with a non-recursive list, much faster than recursive
results = self.list_element_children(folder, folder=False) yield from self.list_element_children(folder, folder=False)
yield from results
# Fallback to going through all of the non-folder elements recursively. # Fallback to going through all of the non-folder elements recursively.
# If there were no results at all, we do not even try to make the other query, # This request may return some elements even though the previous one did not,
# since we already know there will be no results on this one too. # since this folder might only contain folder elements that have non-folder elements.
if results: yield from self.list_element_children(folder, folder=False, recursive=True)
yield from self.list_element_children(folder, folder=False, recursive=True)
def get_first_images(self, folder): def get_first_images(self, folder):
""" """
...@@ -129,7 +127,7 @@ class ThumbnailsGenerator(ElementsWorker): ...@@ -129,7 +127,7 @@ class ThumbnailsGenerator(ElementsWorker):
def main() -> None: def main() -> None:
ThumbnailsGenerator( ThumbnailsGenerator(
description="Worker to generate thumbnails for Arkindex elements" description="Worker to generate thumbnails for Arkindex elements: Utility process"
).run() ).run()
......