@@ -47,6 +47,8 @@ public class FileSimilarityService {
|
||||
|
||||
private final FileEntityRepository fileEntityRepository;
|
||||
|
||||
private final NoCopyFileService noCopyFileService;
|
||||
|
||||
@Value("${server.baseurl}")
|
||||
private String baseUrl;
|
||||
|
||||
@@ -224,7 +226,7 @@ public class FileSimilarityService {
|
||||
FileProtector.Type fileType = file.getMimeType().equals("document") ? FileProtector.Type.DOC:
|
||||
FileProtector.Type.AUDIO;
|
||||
|
||||
NoCopyCheckResult noCopyCheckResult = fileUtil.checkResult(path, fileType);
|
||||
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(path.toFile(), fileType);
|
||||
|
||||
switch (noCopyCheckResult) {
|
||||
case DocumentCheckResult.Success success -> {
|
||||
|
||||
@@ -1,25 +1,15 @@
|
||||
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.context.annotation.Lazy;
|
||||
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
|
||||
@Lazy
|
||||
private NoCopyFileService noCopyFileService;
|
||||
|
||||
public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) {
|
||||
FileProtector.FileInfo fileInfo =
|
||||
new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(),
|
||||
@@ -41,10 +31,6 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user