backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev add check count for all type
Test Workflow / test (push) Successful in 4s
Details

Browse Source
This commit is contained in:
vladp
2026-03-16 15:03:02 +07:00
parent 3a478f9195
commit 0f7079d118
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java
+19 -18
View File
@@ -70,21 +70,24 @@ public class ImageFoundRequestHandler implements RequestHandler {
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);
// }
/*
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);
// log.info("allUniqueImages OK: {} images", allUniqueImages.size());
allUniqueImages = allGoogleImages;
log.info("allUniqueImages OK: {} images", allUniqueImages.size());
tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH);
checkCounterService.incrementCheckCount(fileEntity.getUserId(), fileEntity.getMimeType());
@@ -92,17 +95,15 @@ public class ImageFoundRequestHandler implements RequestHandler {
int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
int pageSize = 5;
// List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
// pageSize * 2);
List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allGoogleImages, page,
List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
pageSize * 2);
YandexSearchResponse finalResponse = new YandexSearchResponse();
finalResponse.setImages(pagedResults);
finalResponse.setPage(page);
finalResponse.setPageSize(pageSize * 2);
finalResponse.setTotalResults(allGoogleImages.size());
finalResponse.setTotalPages((int) Math.ceil((double) allGoogleImages.size() / (pageSize * 2)));
finalResponse.setTotalResults(allUniqueImages.size());
finalResponse.setTotalPages((int) Math.ceil((double) allUniqueImages.size() / (pageSize * 2)));
String message = hasTimeout ? "Search completed (partial)" : MessageCode.SUCCESS.getDescription();
src/main/java/ru/soune/nocopy/service/search/SearchImageService.java
+4 -4
View File
@@ -202,10 +202,10 @@ public class SearchImageService {
uniqueByUrl.putIfAbsent(normalizedUrl, image);
}
// for (YandexSearchResponse.ImageResult image : yandexImages) {
// String normalizedUrl = normalizeUrl(image.getUrl());
// uniqueByUrl.putIfAbsent(normalizedUrl, image);
// }
for (YandexSearchResponse.ImageResult image : yandexImages) {
String normalizedUrl = normalizeUrl(image.getUrl());
uniqueByUrl.putIfAbsent(normalizedUrl, image);
}
return new ArrayList<>(uniqueByUrl.values());
}