mirror of https://gitlab.com/openlp/openlp.git
Fall back on the file name if there is no hash
This commit is contained in:
parent
b298454d17
commit
80f0d19393
|
@ -347,7 +347,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||
:rtype: Path
|
||||
"""
|
||||
ext = image.file_path.suffix.lower()
|
||||
return self.service_path / '{name:s}{ext}'.format(name=image.file_hash, ext=ext)
|
||||
return self.service_path / '{name:s}{ext}'.format(name=image.file_hash or image.file_path.stem, ext=ext)
|
||||
|
||||
def load_full_list(self, images, initial_load=False, open_group=None):
|
||||
"""
|
||||
|
|
|
@ -378,3 +378,33 @@ def test_validate_and_load_group(mocked_load_list, media_item):
|
|||
# the directory should have been saved to the settings
|
||||
mocked_load_list.assert_called_once_with(file_list, 'group')
|
||||
Registry().get('settings').setValue.assert_called_once_with(ANY, Path('path1'))
|
||||
|
||||
|
||||
def test_generate_thumbnail_path_hash(media_item):
|
||||
"""
|
||||
Test that the thumbnail path is correctly generated with the file hash
|
||||
"""
|
||||
# GIVEN: A media item and an Image object
|
||||
mocked_image = MagicMock(file_path=Path('myimage.jpg'), file_hash='c3986a0bd8e1ec9da406df142950c67e7d435410')
|
||||
media_item.service_path = Path('.')
|
||||
|
||||
# WHEN: generate_thumbnail_path() is called
|
||||
result = media_item.generate_thumbnail_path(mocked_image)
|
||||
|
||||
# THEN: The path should be correct
|
||||
assert result == Path('.') / 'c3986a0bd8e1ec9da406df142950c67e7d435410.jpg'
|
||||
|
||||
|
||||
def test_generate_thumbnail_path_filename(media_item):
|
||||
"""
|
||||
Test that the thumbnail path is correctly generated with the file name
|
||||
"""
|
||||
# GIVEN: A media item and an Image object
|
||||
mocked_image = MagicMock(file_path=Path('myimage.jpg'), file_hash=None)
|
||||
media_item.service_path = Path('.')
|
||||
|
||||
# WHEN: generate_thumbnail_path() is called
|
||||
result = media_item.generate_thumbnail_path(mocked_image)
|
||||
|
||||
# THEN: The path should be correct
|
||||
assert result == Path('.') / 'myimage.jpg'
|
||||
|
|
Loading…
Reference in New Issue