This commit is contained in:
@@ -50,7 +50,7 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
Map.of("fileId",fileId)));
|
Map.of("fileId",fileId)));
|
||||||
});
|
});
|
||||||
|
|
||||||
String searchResponseYandex;
|
// String searchResponseYandex;
|
||||||
String searchResponseGoogle;
|
String searchResponseGoogle;
|
||||||
List<YandexSearchResponse.ImageResult> allYandexImages = new ArrayList<>();
|
List<YandexSearchResponse.ImageResult> allYandexImages = new ArrayList<>();
|
||||||
List<YandexSearchResponse.ImageResult> allGoogleImages = new ArrayList<>();
|
List<YandexSearchResponse.ImageResult> allGoogleImages = new ArrayList<>();
|
||||||
@@ -70,18 +70,18 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
log.error("Google search failed for file {}", fileId, e);
|
log.error("Google search failed for file {}", fileId, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
// try {
|
||||||
searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image",
|
// searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image",
|
||||||
"visual_matches");
|
// "visual_matches");
|
||||||
log.info("searchResponseYandex OK");
|
// log.info("searchResponseYandex OK");
|
||||||
allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
// allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
||||||
searchResponseYandex, "visual_matches");
|
// searchResponseYandex, "visual_matches");
|
||||||
} catch (TimeoutException e) {
|
// } catch (TimeoutException e) {
|
||||||
log.warn("Yandex search timeout for file {}", fileId);
|
// log.warn("Yandex search timeout for file {}", fileId);
|
||||||
hasTimeout = true;
|
// hasTimeout = true;
|
||||||
} catch (IOException e) {
|
// } catch (IOException e) {
|
||||||
log.error("Yandex search failed for file {}", fileId, 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());
|
||||||
|
|||||||
@@ -202,10 +202,10 @@ public class SearchImageService {
|
|||||||
uniqueByUrl.putIfAbsent(normalizedUrl, image);
|
uniqueByUrl.putIfAbsent(normalizedUrl, image);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (YandexSearchResponse.ImageResult image : yandexImages) {
|
// for (YandexSearchResponse.ImageResult image : yandexImages) {
|
||||||
String normalizedUrl = normalizeUrl(image.getUrl());
|
// String normalizedUrl = normalizeUrl(image.getUrl());
|
||||||
uniqueByUrl.putIfAbsent(normalizedUrl, image);
|
// uniqueByUrl.putIfAbsent(normalizedUrl, image);
|
||||||
}
|
// }
|
||||||
|
|
||||||
return new ArrayList<>(uniqueByUrl.values());
|
return new ArrayList<>(uniqueByUrl.values());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user