Max665/sharepulse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into frontend

Browse Source
This commit is contained in:
Max W. 2024-02-16 14:42:11 +01:00
commit 58e3dd0af5
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/upload/upload.component.ts
View File

@ -27,7 +27,7 @@ export class UploadComponent {
singleDownload: boolean = false; singleDownload: boolean = false;
fileDescription: string = ''; fileDescription: string = '';
passwordProtected: boolean = false; passwordProtected: boolean = false;
password: string = 'nigga123'; password: string = ''; // Generated by the server for only this file
uploadStarted: boolean = false; uploadStarted: boolean = false;
uploadProgress = 0; // Real progress uploadProgress = 0; // Real progress
@ -96,7 +96,7 @@ export class UploadComponent {
axios.post(this.developmentStore.getBaseUrl() + 'api/v1/upload', formData, config) axios.post(this.developmentStore.getBaseUrl() + 'api/v1/upload', formData, config)
.then(response => { .then(response => {
console.log('Upload completed successfully:', response.data); console.log('Upload completed successfully!');
console.log(response.data); console.log(response.data);
this.uploadFinished = true; this.uploadFinished = true;
}) })

1
frontend/src/store/DevelopmentStore.ts
View File

@ -13,6 +13,7 @@ export class DevelopmentStore {
constructor() { constructor() {
this.isDevelopment = location.port === '4200'; this.isDevelopment = location.port === '4200';
console.log("Development mode enabled: " + this.isDevelopment);
} }
getIsDevelopment(): boolean { getIsDevelopment(): boolean {

14
src/main/java/de/w665/sharepulse/rest/mappings/Upload.java
View File

@ -1,5 +1,7 @@
package de.w665.sharepulse.rest.mappings; package de.w665.sharepulse.rest.mappings;
import com.google.gson.JsonObject;
import de.w665.sharepulse.model.FileUpload;
import de.w665.sharepulse.rest.ApiRestController; import de.w665.sharepulse.rest.ApiRestController;
import de.w665.sharepulse.service.FileService; import de.w665.sharepulse.service.FileService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@ -38,8 +40,16 @@ public class Upload extends ApiRestController {
return new ResponseEntity<>("Please select a file to upload.", HttpStatus.NOT_ACCEPTABLE); return new ResponseEntity<>("Please select a file to upload.", HttpStatus.NOT_ACCEPTABLE);
} }
String fileId = fileService.processUploadedFile(file, request.getRemoteAddr(), password, singleDownload, fileDescription); FileUpload fileUpload = fileService.processUploadedFile(file, request.getRemoteAddr(), password, singleDownload, fileDescription);
log.debug("User uploaded file " + file.getOriginalFilename() + " from IP " + request.getRemoteAddr() + " successfully."); log.debug("User uploaded file " + file.getOriginalFilename() + " from IP " + request.getRemoteAddr() + " successfully.");
return new ResponseEntity<>("File " + file.getOriginalFilename() + " uploaded successfully! ID(" + fileId + ")", HttpStatus.OK);
JsonObject response = new JsonObject();
response.addProperty("fileId", fileUpload.getFileId());
response.addProperty("message", "File " + file.getOriginalFilename() + " uploaded successfully!");
response.addProperty("passwordProtected", fileUpload.isPasswordProtected());
response.addProperty("singleDownload", fileUpload.isSingleDownload());
response.addProperty("uploadDate", fileUpload.getUploadDate().toString());
return new ResponseEntity<>(response.toString(), HttpStatus.OK);
} }
} }

4
src/main/java/de/w665/sharepulse/service/FileService.java
View File

@ -53,7 +53,7 @@ public class FileService {
} }
} }
public String processUploadedFile(MultipartFile file, String uploaderIp, String password, boolean singleDownload, String fileDescription) { public FileUpload processUploadedFile(MultipartFile file, String uploaderIp, String password, boolean singleDownload, String fileDescription) {
String fileId = fileIdService.generateNewUniqueId(); String fileId = fileIdService.generateNewUniqueId();
@ -80,7 +80,7 @@ public class FileService {
try { try {
Files.write(path, file.getBytes()); Files.write(path, file.getBytes());
log.debug("File " + file.getOriginalFilename() + " written to " + path.getFileName()); log.debug("File " + file.getOriginalFilename() + " written to " + path.getFileName());
return fileId; return fileUpload;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;