From 1476509b480a591e7901cd2d59f4f773d227ea9a Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Mon, 20 Apr 2026 18:50:47 +0700 Subject: [PATCH] dev change --- .../java/ru/soune/nocopy/service/ImageHashService.java | 4 +++- .../service/file/impl/FileUploadServiceImpl.java | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/ImageHashService.java b/src/main/java/ru/soune/nocopy/service/ImageHashService.java index 9a97a55..515513d 100644 --- a/src/main/java/ru/soune/nocopy/service/ImageHashService.java +++ b/src/main/java/ru/soune/nocopy/service/ImageHashService.java @@ -26,7 +26,9 @@ public class ImageHashService { private final CloudStorageService cloudStorageService; public Map calculateHash(Path imagePath) throws IOException { - File file = cloudStorageService.readFileFromStorageByPath(imagePath.toString()); +// File file = cloudStorageService.readFileFromStorageByPath(imagePath.toString()); + File file = imagePath.toFile(); + PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file); diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java index fe3b5c5..cdb6b40 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java @@ -390,8 +390,8 @@ public class FileUploadServiceImpl implements FileUploadService { fileSimilarityService.hasDuplicatesByHash(finalFilePath ,session.getFileType(), session.getUserId()); -// File file = new File(finalFilePath); - File file = cloudStorageService.readFileFromStorageByPath(finalFilePath); + File file = new File(finalFilePath); +// File file = cloudStorageService.readFileFromStorageByPath(finalFilePath); if (session.getFileType().startsWith("audio") && !isWavFile(file)) { session.setStatus(UploadStatus.FAILED); @@ -431,8 +431,6 @@ public class FileUploadServiceImpl implements FileUploadService { session.setStatus(UploadStatus.COMPLETED); session.setFilePath(finalFilePath); - notificationService.addNotification(NotificationType.FILE_ADDED_TO_SYSTEM, session.getUserId()); - FileStatus status = findSimilar == 0 ? FileStatus.MODERATION: FileStatus.TEMP; if (status == FileStatus.TEMP) { @@ -447,7 +445,9 @@ public class FileUploadServiceImpl implements FileUploadService { if (status != FileStatus.TEMP) { String fileType = session.getFileType(); - tariffInfoService.writeOffTokens(session.getUserId(), costService.protectFileCost(fileType), OperationType.FILE_UPLOAD); + tariffInfoService.writeOffTokens(session.getUserId(), costService.protectFileCost(fileType), + OperationType.FILE_UPLOAD); + notificationService.addNotification(NotificationType.FILE_ADDED_TO_SYSTEM, session.getUserId()); } if (status != FileStatus.TEMP) {