Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge pull request #24

Browse Source 
dev
This commit is contained in:
TitiOnFire 2024-03-21 16:34:13 +01:00 committed by GitHub
commit 2a9fc01f81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/deploy.yml vendored
View File

@ -59,6 +59,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
command_timeout: 20m
script: | script: |
cd ${{ secrets.TARGET_DIR }}/ffsaf cd ${{ secrets.TARGET_DIR }}/ffsaf
cp ../vite.env src/main/webapp/.env cp ../vite.env src/main/webapp/.env

7
src/main/java/fr/titionfire/ffsaf/ws/FileSocket.java
View File

@ -1,7 +1,6 @@
package fr.titionfire.ffsaf.ws; package fr.titionfire.ffsaf.ws;
import io.quarkus.runtime.annotations.RegisterForReflection; import io.quarkus.runtime.annotations.RegisterForReflection;
import io.quarkus.scheduler.Scheduled;
import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.ApplicationScoped;
import jakarta.websocket.*; import jakarta.websocket.*;
import jakarta.websocket.server.PathParam; import jakarta.websocket.server.PathParam;
@ -23,7 +22,7 @@ public class FileSocket {
@ConfigProperty(name = "upload_dir") @ConfigProperty(name = "upload_dir")
String media; String media;
@Scheduled(every = "10s") /*@Scheduled(every = "10s")
void increment() { void increment() {
sessions.forEach((key, value) -> { sessions.forEach((key, value) -> {
if (System.currentTimeMillis() - value.time > 60000) { if (System.currentTimeMillis() - value.time > 60000) {
@ -40,14 +39,14 @@ public class FileSocket {
sessions.remove(key); sessions.remove(key);
} }
}); });
} }*/
@OnOpen @OnOpen
public void onOpen(Session session, @PathParam("code") String code) { public void onOpen(Session session, @PathParam("code") String code) {
try { try {
if (sessions.containsKey(code)) { if (sessions.containsKey(code)) {
FileRecv fileRecv = sessions.get(code); FileRecv fileRecv = sessions.get(code);
fileRecv.file = new File(media, "record/" + fileRecv.name); fileRecv.file = new File(media + "-ext", "record/" + fileRecv.name);
fileRecv.fos = new FileOutputStream(fileRecv.file, false); fileRecv.fos = new FileOutputStream(fileRecv.file, false);
logger.info("Start reception of file: " + fileRecv.file.getAbsolutePath()); logger.info("Start reception of file: " + fileRecv.file.getAbsolutePath());
} else { } else {