diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java index 09b6243..29435a6 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -1,11 +1,7 @@ package ru.soune.nocopy.controller; -import com.vrt.NoCopyFileService; -import com.vrt.fileprotection.FileProtector; -import com.vrt.fileprotection.NoCopyCheckResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Lazy; import org.springframework.core.io.FileSystemResource; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -24,7 +20,6 @@ import ru.soune.nocopy.dto.file.*; import ru.soune.nocopy.dto.register.RegAnswer; import ru.soune.nocopy.entity.file.FileEntity; import ru.soune.nocopy.entity.file.FileStatus; -import ru.soune.nocopy.entity.file.ProtectionStatus; import ru.soune.nocopy.entity.file.UploadStatus; import ru.soune.nocopy.entity.user.AuthToken; import ru.soune.nocopy.exception.*; @@ -38,7 +33,6 @@ import ru.soune.nocopy.service.file.FileEntityService; import ru.soune.nocopy.service.file.FileUploadService; import ru.soune.nocopy.util.FileUtil; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -66,9 +60,6 @@ public class ApiController { private final FileEntityRepository fileEntityRepository; - @Lazy - private final NoCopyFileService noCopyFileService; - private final FileUtil fileUtil; private final ProtectionsLimitService protectionsLimitService; @@ -386,44 +377,44 @@ public class ApiController { } } - @GetMapping("/protect/{fileId}") - public ResponseEntity protect( @PathVariable(required = false) String fileId) { - Optional optionalFileEntity = fileEntityRepository.findById(fileId); - - if (!optionalFileEntity.isPresent()) { - return ResponseEntity.notFound().build(); - } - FileEntity fileEntity = optionalFileEntity.get(); - FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity); - - noCopyFileService.addFile(fileInfo); - - fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING); - fileEntityRepository.save(fileEntity); - - return ResponseEntity.ok().build(); - } - - @GetMapping("/check/{fileId}/{type}") - public ResponseEntity check(@PathVariable(required = false) String fileId, - @PathVariable(required = false) String type) { - Optional optionalFileEntity = fileEntityRepository.findById(fileId); - - if (!optionalFileEntity.isPresent()) { - return ResponseEntity.notFound().build(); - } - - FileEntity fileEntity = optionalFileEntity.get(); - - Path path = Paths.get(fileEntity.getProtectedFilePath()); - - File file = path.toFile(); - - NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file, - FileProtector.Type.valueOf(type.toUpperCase())); - - return ResponseEntity.ok().body(noCopyCheckResult); - } +// @GetMapping("/protect/{fileId}") +// public ResponseEntity protect( @PathVariable(required = false) String fileId) { +// Optional optionalFileEntity = fileEntityRepository.findById(fileId); +// +// if (!optionalFileEntity.isPresent()) { +// return ResponseEntity.notFound().build(); +// } +// FileEntity fileEntity = optionalFileEntity.get(); +// FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity); +// +// noCopyFileService.addFile(fileInfo); +// +// fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING); +// fileEntityRepository.save(fileEntity); +// +// return ResponseEntity.ok().build(); +// } +// +// @GetMapping("/check/{fileId}/{type}") +// public ResponseEntity check(@PathVariable(required = false) String fileId, +// @PathVariable(required = false) String type) { +// Optional optionalFileEntity = fileEntityRepository.findById(fileId); +// +// if (!optionalFileEntity.isPresent()) { +// return ResponseEntity.notFound().build(); +// } +// +// FileEntity fileEntity = optionalFileEntity.get(); +// +// Path path = Paths.get(fileEntity.getProtectedFilePath()); +// +// File file = path.toFile(); +// +// NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file, +// FileProtector.Type.valueOf(type.toUpperCase())); +// +// return ResponseEntity.ok().body(noCopyCheckResult); +// } @GetMapping("/check/file_stats") public ResponseEntity checkFileProtectStats(@RequestHeader("Authorization") String tokenHeader) { diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index 911753d..2cf7a5c 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -10,7 +10,6 @@ import com.vrt.fileprotection.image.phash.PerceptualHashHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.hibernate.validator.internal.util.stereotypes.Lazy; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl;