From a1669826b53d0a31ec88aface24f0cbfb9671290 Mon Sep 17 00:00:00 2001 From: vladp Date: Mon, 16 Mar 2026 15:35:08 +0700 Subject: [PATCH] dev add check count for all type --- .../soune/nocopy/handler/ImageFoundRequestHandler.java | 8 -------- .../soune/nocopy/service/search/SearchImageService.java | 9 +++++++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java index 147698f..449af20 100644 --- a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java @@ -60,9 +60,6 @@ public class ImageFoundRequestHandler implements RequestHandler { try { searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens", "exact_matches"); - log.info("searchResponseGoogle OK"); - log.info("searchResponseGoogle OK"); - log.info("searchResponseGoogle OK"); log.info("searchResponseGoogle OK,{}", searchResponseGoogle); allGoogleImages = searchImageService.getAllImagesWithoutPagination( searchResponseGoogle, "exact_matches"); @@ -91,11 +88,6 @@ public class ImageFoundRequestHandler implements RequestHandler { // allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, 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()); tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH); checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType()); diff --git a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java index 1c89488..a6da0dd 100644 --- a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java +++ b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java @@ -169,8 +169,13 @@ public class SearchImageService { if ("exact_matches".equals(findType)) { JsonNode thumbnail = match.path("thumbnail"); - if (!thumbnail.isMissingNode() && thumbnail.asText().startsWith("data:image")) { - result.setUrl(thumbnail.asText()); + if (!thumbnail.isMissingNode()) { + String thumbnailUrl = thumbnail.asText(); + if (thumbnailUrl.startsWith("data:image")) { + result.setUrl(thumbnailUrl); + } else if (!thumbnailUrl.isBlank()) { + result.setUrl(thumbnailUrl); + } } JsonNode imageNode = match.path("image");