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

dev delete config
Test Workflow / test (push) Waiting to run
Details

Browse Source
This commit is contained in:
vladp
2026-02-17 14:42:58 +07:00
parent 77bf7ea886
commit 8de13b410b
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/FileSimilarityService.java
+11 -11
View File
@@ -152,17 +152,17 @@ public class FileSimilarityService {
return duplicates; return duplicates;
} }
public void hasDuplicatesByHash(String path, Long userId, String mimeType) throws Exception { // public void hasDuplicatesByHash(String path, Long userId, String mimeType) throws Exception {
String hash = calculateFileHash(path); // String hash = calculateFileHash(path);
List<FileEntity> fileEntityList = fileEntityRepository.findByUserIdAndMimeType(userId, mimeType); // List<FileEntity> fileEntityList = fileEntityRepository.findByUserIdAndMimeType(userId, mimeType);
//
for (FileEntity file : fileEntityList) { // for (FileEntity file : fileEntityList) {
if (calculateFileHash(file.getFilePath()).equals(hash)) { // if (calculateFileHash(file.getFilePath()).equals(hash)) {
throw new DuplicateImageException("Duplicate", file.getId(), // throw new DuplicateImageException("Duplicate", file.getId(),
file.getUserId()); // file.getUserId());
} // }
} // }
} // }
// public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable, // public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable,
// String authToken) throws Exception { // String authToken) throws Exception {
src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java
+26 -2
View File
@@ -2,6 +2,9 @@ package ru.soune.nocopy.service.file.impl;
import com.vrt.NoCopyFileService; import com.vrt.NoCopyFileService;
import com.vrt.fileprotection.FileProtector; import com.vrt.fileprotection.FileProtector;
import com.vrt.fileprotection.NoCopyCheckResult;
import com.vrt.fileprotection.audio.AudioCheckResult;
import com.vrt.fileprotection.documents.DocumentCheckResult;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -321,8 +324,29 @@ public class FileUploadServiceImpl implements FileUploadService {
if (session.getFileType().startsWith("image")) { if (session.getFileType().startsWith("image")) {
checkForDuplicatesSynchronously(finalFilePath); checkForDuplicatesSynchronously(finalFilePath);
} else if (session.getFileType().startsWith("audio") || session.getFileType().startsWith("document")) { } else if (session.getFileType().startsWith("audio") || session.getFileType().startsWith("document")) {
fileSimilarityService.hasDuplicatesByHash(finalFilePath, session.getUserId(), File file = new File(finalFilePath);
session.getFileType()); FileProtector.Type type = "document".equals(session.getFileType()) ?
FileProtector.Type.DOC : FileProtector.Type.AUDIO;
NoCopyCheckResult checkResult = noCopyFileService.checkFile(file, type);
switch (checkResult) {
case DocumentCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
throw new DuplicateImageException("Duplicate", info.getId(),
Long.valueOf(info.getOwnerId()));
}
case AudioCheckResult.Success success -> {
FileProtector.FileInfo info = success.getInfo();
throw new DuplicateImageException("Duplicate", info.getId(),
Long.valueOf(info.getOwnerId()));
}
case DocumentCheckResult.Failed failed ->
log.warn("Document check failed: {}", failed.getMessage());
case AudioCheckResult.Failed failed ->
log.warn("Audio check failed: {}", failed.getMessage());
default -> log.warn("Unexpected result type: {}", checkResult.getClass().getSimpleName());
}
} }
} }