This commit is contained in:
@@ -60,9 +60,6 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
try {
|
try {
|
||||||
searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens",
|
searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens",
|
||||||
"exact_matches");
|
"exact_matches");
|
||||||
log.info("searchResponseGoogle OK");
|
|
||||||
log.info("searchResponseGoogle OK");
|
|
||||||
log.info("searchResponseGoogle OK");
|
|
||||||
log.info("searchResponseGoogle OK,{}", searchResponseGoogle);
|
log.info("searchResponseGoogle OK,{}", searchResponseGoogle);
|
||||||
allGoogleImages = searchImageService.getAllImagesWithoutPagination(
|
allGoogleImages = searchImageService.getAllImagesWithoutPagination(
|
||||||
searchResponseGoogle, "exact_matches");
|
searchResponseGoogle, "exact_matches");
|
||||||
@@ -91,11 +88,6 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
// allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, allGoogleImages);
|
// allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, allGoogleImages);
|
||||||
allUniqueImages = allGoogleImages;
|
allUniqueImages = allGoogleImages;
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
|
||||||
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
|
|
||||||
|
|
||||||
tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH);
|
tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH);
|
||||||
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
|
||||||
|
|||||||
@@ -169,8 +169,13 @@ public class SearchImageService {
|
|||||||
|
|
||||||
if ("exact_matches".equals(findType)) {
|
if ("exact_matches".equals(findType)) {
|
||||||
JsonNode thumbnail = match.path("thumbnail");
|
JsonNode thumbnail = match.path("thumbnail");
|
||||||
if (!thumbnail.isMissingNode() && thumbnail.asText().startsWith("data:image")) {
|
if (!thumbnail.isMissingNode()) {
|
||||||
result.setUrl(thumbnail.asText());
|
String thumbnailUrl = thumbnail.asText();
|
||||||
|
if (thumbnailUrl.startsWith("data:image")) {
|
||||||
|
result.setUrl(thumbnailUrl);
|
||||||
|
} else if (!thumbnailUrl.isBlank()) {
|
||||||
|
result.setUrl(thumbnailUrl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
JsonNode imageNode = match.path("image");
|
JsonNode imageNode = match.path("image");
|
||||||
|
|||||||
Reference in New Issue
Block a user