Sync from develop to main

README.md

@@ -1,7 +1,6 @@
 # webdl
 
 <img  src="https://raw.githubusercontent.com/SegoCode/webdl_bot/main/media/demo2.gif">
-<img  src="https://raw.githubusercontent.com/SegoCode/webdl_bot/main/media/demoPanel.png">
 
 <p align="center">
   <a href="#about">About</a> •
@@ -15,30 +14,59 @@ Telegram bot in Java for downloading social media videos using yt-dlp
 
 ## Features
 
-- Non-blocking message queue processing
+- Non-blocking message queue processing with virtual threads
 
-- Dynamic interaction with messages
+- Dynamic interaction with Telegram messages (send, delete, edit)
 
-- Panel with usage statistics 
+- Web panel with usage statistics on port 8080
+
+- Automatic retry on download failures
 
 ## Quick Start & Information
 
 Webdl accepts a video URL, downloads it using [yt-dlp](https://github.com/yt-dlp/yt-dlp), and sends it back to the user as a video message.
 
-Clone and run the project from source code.
+### From source
+
 ```
 git clone https://github.com/SegoCode/webdl
-cd webdl\code
-mvn clean package
+cd webdl/code
+mvn clean package -DskipTests
 java -jar target/webdl.jar
 ```
 
-For Docker deployment, make sure to set up environment variables.
-Use a temp volume for the download, it will delete after send.
+### Docker
+
 ```
-mvn clean package
+cd webdl/code
+mvn clean package -DskipTests
 docker build -t webdl-image .
-docker run -e BOT_TOKEN=your-bot-token -p 8080:8080 -v /mnt/drive/data/webdl:/downloads --name webdl webdl-image
+docker run -d \
+  --name webdl \
+  --restart unless-stopped \
+  -e BOT_TOKEN=your-bot-token \
+  -p 8080:8080 \
+  -v /mnt/drive/data/webdl:/downloads \
+  webdl-image
+```
+
+### Project structure
+
+```
+code/src/main/java/org/segocode/webdl/
+├── Main.java                          # Entry point
+├── bot/
+│   ├── Webdlbot.java                  # Telegram long-polling bot
+│   ├── constants/Messages.java        # User-facing message strings
+│   ├── model/{User,DataRootContainer}.java  # EclipseStore persistence
+│   ├── service/{MessageService,VideoService}.java
+│   └── util/MessageUtil.java
+├── panel/
+│   ├── PanelApplication.java          # Javalin web server bootstrap
+│   └── AdminController.java           # Admin panel route handler
+└── system/
+    ├── command/CommandExecutor.java   # yt-dlp subprocess with retry
+    └── util/FileUtil.java
 ```
 
 

code/Dockerfile

@@ -8,17 +8,11 @@ COPY src ./src
 RUN mvn package -DskipTests
 
 # Runtime stage: Run the application
-FROM alpine:latest
+FROM eclipse-temurin:21-jre-alpine
 
-RUN apk update && \
-    apk add --no-cache wget curl ffmpeg && \
+RUN apk add --no-cache ffmpeg python3 && \
     wget -O /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp && \
-    chmod a+rx /usr/local/bin/yt-dlp && \
-    rm -rf /var/cache/apk/*
-
-RUN apk add --no-cache openjdk21 python3 py3-pip
-
-ENV YT_DLP=/usr/bin/yt-dlp PYTHONUNBUFFERED=1
+    chmod a+rx /usr/local/bin/yt-dlp
 
 WORKDIR /app
 COPY --from=build /app/target/webdl.jar /app/webdl.jar

code/pom.xml

@@ -65,13 +65,25 @@
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.segocode.Main</mainClass>
+                                    <mainClass>org.segocode.webdl.Main</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <java>
+                        <palantirJavaFormat>
+                            <version>2.92.0</version>
+                        </palantirJavaFormat>
+                    </java>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

code/src/main/java/org/segocode/Main.java → code/src/main/java/org/segocode/webdl/Main.java

@@ -1,18 +1,14 @@
-package org.segocode;
+package org.segocode.webdl;
 
-import io.javalin.Javalin;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
-import org.eclipse.store.storage.types.StorageManager;
-import org.segocode.bot.Webdlbot;
-import org.segocode.panel.PanelController;
+import org.segocode.webdl.bot.Webdlbot;
+import org.segocode.webdl.panel.PanelApplication;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
 
-import java.util.Date;
-
 public class Main {
     private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
 
@@ -25,7 +21,7 @@ public static void main(String[] args) {
             botsApi.registerBot(new Webdlbot(storageManager));
             LOGGER.info("Bot started successfully and ready to download videos 🚀");
             LOGGER.info("Starting webp anel app...");
-            PanelController.start(storageManager);
+            PanelApplication.start(storageManager);
         } catch (Exception e) {
             LOGGER.error("Error while attempting to start the bot. Error details:", e);
         }