@@ -26,7 +26,9 @@ public class ImageHashService {
|
|||||||
private final CloudStorageService cloudStorageService;
|
private final CloudStorageService cloudStorageService;
|
||||||
|
|
||||||
public Map<String, Long> calculateHash(Path imagePath) throws IOException {
|
public Map<String, Long> 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);
|
PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);
|
||||||
|
|
||||||
|
|||||||
@@ -390,8 +390,8 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
fileSimilarityService.hasDuplicatesByHash(finalFilePath ,session.getFileType(),
|
fileSimilarityService.hasDuplicatesByHash(finalFilePath ,session.getFileType(),
|
||||||
session.getUserId());
|
session.getUserId());
|
||||||
|
|
||||||
// File file = new File(finalFilePath);
|
File file = new File(finalFilePath);
|
||||||
File file = cloudStorageService.readFileFromStorageByPath(finalFilePath);
|
// File file = cloudStorageService.readFileFromStorageByPath(finalFilePath);
|
||||||
|
|
||||||
if (session.getFileType().startsWith("audio") && !isWavFile(file)) {
|
if (session.getFileType().startsWith("audio") && !isWavFile(file)) {
|
||||||
session.setStatus(UploadStatus.FAILED);
|
session.setStatus(UploadStatus.FAILED);
|
||||||
@@ -431,8 +431,6 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
session.setStatus(UploadStatus.COMPLETED);
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
session.setFilePath(finalFilePath);
|
session.setFilePath(finalFilePath);
|
||||||
|
|
||||||
notificationService.addNotification(NotificationType.FILE_ADDED_TO_SYSTEM, session.getUserId());
|
|
||||||
|
|
||||||
FileStatus status = findSimilar == 0 ? FileStatus.MODERATION: FileStatus.TEMP;
|
FileStatus status = findSimilar == 0 ? FileStatus.MODERATION: FileStatus.TEMP;
|
||||||
|
|
||||||
if (status == FileStatus.TEMP) {
|
if (status == FileStatus.TEMP) {
|
||||||
@@ -447,7 +445,9 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
if (status != FileStatus.TEMP) {
|
if (status != FileStatus.TEMP) {
|
||||||
String fileType = session.getFileType();
|
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) {
|
if (status != FileStatus.TEMP) {
|
||||||
|
|||||||
Reference in New Issue
Block a user