Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: thumbnail generation for URI string containing spaces #6698

Merged
merged 1 commit into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@

import java.net.URI;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import reactor.core.publisher.Mono;
import run.halo.app.core.attachment.ThumbnailService;
import run.halo.app.core.attachment.ThumbnailSize;
import run.halo.app.theme.finders.Finder;
import run.halo.app.theme.finders.ThumbnailFinder;

@Slf4j
@Finder("thumbnail")
@RequiredArgsConstructor
public class ThumbnailFinderImpl implements ThumbnailFinder {
private final ThumbnailService thumbnailService;

@Override
public Mono<String> gen(String uriStr, String size) {
return thumbnailService.generate(URI.create(uriStr), ThumbnailSize.fromName(size))
return Mono.fromSupplier(() -> URI.create(uriStr))
.flatMap(uri -> thumbnailService.generate(uri, ThumbnailSize.fromName(size)))
.map(URI::toString)
.onErrorResume(Throwable.class, e -> {
log.debug("Failed to generate thumbnail for [{}], error: [{}]", uriStr,
e.getMessage());
return Mono.just(uriStr);
})
.defaultIfEmpty(uriStr);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package run.halo.app.theme.finders.impl;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.net.URI;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import run.halo.app.core.attachment.ThumbnailService;

/**
* Tests for {@link ThumbnailFinderImpl}.
*
* @author guqing
* @since 2.20.0
*/
@ExtendWith(MockitoExtension.class)
class ThumbnailFinderImplTest {

@Mock
ThumbnailService thumbnailService;

@InjectMocks
ThumbnailFinderImpl thumbnailFinder;

@Test
void shouldNotGenWhenUriIsInvalid() {
thumbnailFinder.gen("invalid uri", "l")
.as(StepVerifier::create)
.expectNext("invalid uri")
.verifyComplete();

verify(thumbnailService, times(0)).generate(any(), any());
}

@Test
void shouldGenWhenUriIsValid() {
when(thumbnailService.generate(any(), any()))
.thenReturn(Mono.just(URI.create("/test-thumb.jpg")));
thumbnailFinder.gen("/test.jpg", "l")
.as(StepVerifier::create)
.expectNext("/test-thumb.jpg")
.verifyComplete();

verify(thumbnailService).generate(any(), any());
}
}
Loading