diff --git a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java index bc71141..ed580b9 100644 --- a/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java +++ b/src/main/java/ru/soune/nocopy/service/file/FileEntityService.java @@ -22,9 +22,11 @@ import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.file.cloud.CloudStorageService; import java.io.IOException; +import java.nio.channels.FileChannel; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -241,8 +243,12 @@ public class FileEntityService { if (Files.exists(protectedFilePath)) { Files.delete(protectedFilePath); } +// SEND ON DISK + try (FileChannel channel = FileChannel.open(protectedFilePath, StandardOpenOption.WRITE)) { + channel.force(true); + } - Files.write(protectedFilePath, data); +// Files.write(protectedFilePath, data); if (imageResizeService.isImage(extension)) { imageResizeService.generateSizes(fileEntity, data); diff --git a/src/main/java/ru/soune/nocopy/service/file/cloud/CloudStorageService.java b/src/main/java/ru/soune/nocopy/service/file/cloud/CloudStorageService.java index 451aa52..cbc371d 100644 --- a/src/main/java/ru/soune/nocopy/service/file/cloud/CloudStorageService.java +++ b/src/main/java/ru/soune/nocopy/service/file/cloud/CloudStorageService.java @@ -51,7 +51,6 @@ public class CloudStorageService { public void saveFilesToStorage(String mimeType, String extension, String sendToCloudFilePath) { AwsCredentials credentials = AwsBasicCredentials.create(key, secretKey); - S3Client s3Client = S3Client.builder() .httpClient(ApacheHttpClient.create()) .region(Region.of(region)) diff --git a/src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java b/src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java index f2bf222..205575c 100644 --- a/src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java +++ b/src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java @@ -115,51 +115,43 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider { @NotNull @Override public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); + log.info("__________________________________________"); try { FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED"); - log.info("FILEENTITY PROTECTED : " + fileEntity.getMimeType()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getMimeType()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getFileExtension()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getFileExtension()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath()); - log.info("FILEENTITY PROTECTED : " + fileEntity.getProtectedFilePath()); + + Path filePath = Paths.get(fileEntity.getProtectedFilePath()); + if (!Files.exists(filePath)) { + log.error("File not found after write: {}", filePath); + return OperationResult.Companion.failure("File not found"); + } + + log.info("File ready for upload: {} (size: {} bytes)", filePath, Files.size(filePath)); cloudStorageService.saveFilesToStorage(fileEntity.getMimeType(), fileEntity.getFileExtension(), fileEntity.getProtectedFilePath()); @@ -174,6 +166,26 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider { @NotNull @Override public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); + log.info("++++++++++++++++++++++++++++++++++++"); try { FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt); @@ -190,6 +202,14 @@ public class ProtectionFileProviderImpl implements FileProtector.FileProvider { @NotNull @Override public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) { + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); + log.info("+_+_+_+_+_+_+_+_+_+_+_+_+"); try { FileEntity fileEntity = fileEntityService.writeProtectedFile(id, data, fileExt);