This commit is contained in:
@@ -67,19 +67,6 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
List<YandexSearchResponse.ImageResult> allUniqueImages;
|
List<YandexSearchResponse.ImageResult> allUniqueImages;
|
||||||
boolean hasTimeout = false;
|
boolean hasTimeout = false;
|
||||||
|
|
||||||
try {
|
|
||||||
searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image",
|
|
||||||
"visual_matches");
|
|
||||||
log.info("searchResponseYandex OK");
|
|
||||||
allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
|
||||||
searchResponseYandex, "visual_matches");
|
|
||||||
} catch (TimeoutException e) {
|
|
||||||
log.warn("Yandex search timeout for file {}", fileId);
|
|
||||||
hasTimeout = true;
|
|
||||||
} catch (IOException e) {
|
|
||||||
log.error("Yandex search failed for file {}", fileId, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens",
|
searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens",
|
||||||
"exact_matches");
|
"exact_matches");
|
||||||
@@ -93,6 +80,19 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
log.error("Google search failed for file {}", fileId, e);
|
log.error("Google search failed for file {}", fileId, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image",
|
||||||
|
"visual_matches");
|
||||||
|
log.info("searchResponseYandex OK");
|
||||||
|
allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
||||||
|
searchResponseYandex, "visual_matches");
|
||||||
|
} catch (TimeoutException e) {
|
||||||
|
log.warn("Yandex search timeout for file {}", fileId);
|
||||||
|
hasTimeout = true;
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("Yandex search failed for file {}", fileId, e);
|
||||||
|
}
|
||||||
|
|
||||||
allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, allGoogleImages);
|
allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, allGoogleImages);
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
||||||
|
|
||||||
|
|||||||
@@ -49,10 +49,10 @@ public class SearchImageService {
|
|||||||
|
|
||||||
public SearchImageService() {
|
public SearchImageService() {
|
||||||
this.yandexHttpClient = new OkHttpClient.Builder()
|
this.yandexHttpClient = new OkHttpClient.Builder()
|
||||||
.connectTimeout(15, TimeUnit.SECONDS)
|
.connectTimeout(25, TimeUnit.SECONDS)
|
||||||
.writeTimeout(15, TimeUnit.SECONDS)
|
.writeTimeout(25, TimeUnit.SECONDS)
|
||||||
.readTimeout(15, TimeUnit.SECONDS)
|
.readTimeout(25, TimeUnit.SECONDS)
|
||||||
.callTimeout(15, TimeUnit.SECONDS)
|
.callTimeout(25, TimeUnit.SECONDS)
|
||||||
.followRedirects(true)
|
.followRedirects(true)
|
||||||
.followSslRedirects(true)
|
.followSslRedirects(true)
|
||||||
.retryOnConnectionFailure(true)
|
.retryOnConnectionFailure(true)
|
||||||
|
|||||||
Reference in New Issue
Block a user