From 31b41dc3d75c3212f45ca6ba2fb5a47ad5663afd Mon Sep 17 00:00:00 2001 From: vladp Date: Tue, 17 Feb 2026 13:03:47 +0700 Subject: [PATCH] dev delete config --- .../soune/nocopy/service/FileSimilarityService.java | 6 +----- src/main/java/ru/soune/nocopy/util/FileUtil.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index e12dfb6..a8be0cb 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -162,10 +162,6 @@ public class FileSimilarityService { } } - @Autowired - @Lazy - private NoCopyFileService noCopyFileService; - public Page findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable, String authToken) throws Exception { FileEntity fileEntity = fileEntityRepository.findByFileId(fileId); @@ -228,7 +224,7 @@ public class FileSimilarityService { FileProtector.Type fileType = file.getMimeType().equals("document") ? FileProtector.Type.DOC: FileProtector.Type.AUDIO; - NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(path.toFile(), fileType); + NoCopyCheckResult noCopyCheckResult = fileUtil.checkResult(path, fileType); switch (noCopyCheckResult) { case DocumentCheckResult.Success success -> { diff --git a/src/main/java/ru/soune/nocopy/util/FileUtil.java b/src/main/java/ru/soune/nocopy/util/FileUtil.java index 7bfb07b..46c3924 100644 --- a/src/main/java/ru/soune/nocopy/util/FileUtil.java +++ b/src/main/java/ru/soune/nocopy/util/FileUtil.java @@ -1,14 +1,23 @@ package ru.soune.nocopy.util; +import com.vrt.NoCopyFileService; import com.vrt.fileprotection.FileProtector; +import com.vrt.fileprotection.NoCopyCheckResult; import com.vrt.fileprotection.image.ImageLocalSearch; import com.vrt.fileprotection.image.ImageScore; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import ru.soune.nocopy.dto.file.SimilarFileDTO; import ru.soune.nocopy.entity.file.FileEntity; +import java.nio.file.Path; + @Service public class FileUtil { + + @Autowired + private NoCopyFileService noCopyFileService; + public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) { FileProtector.FileInfo fileInfo = new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(), @@ -30,6 +39,10 @@ public class FileUtil { + Long.bitCount(aLo ^ bLo); } + public NoCopyCheckResult checkResult(Path path, FileProtector.Type fileType) { + return noCopyFileService.checkFile(path.toFile(), fileType); + } + private FileProtector.Type determineFileType(String mimeType) { if (mimeType == null) { return FileProtector.Type.IMAGE;