diff --git a/app/cfg/settings.yaml b/app/cfg/settings.yaml
index c56e9f5..7e73cbc 100644
--- a/app/cfg/settings.yaml
+++ b/app/cfg/settings.yaml
@@ -3,7 +3,12 @@ log_level: DEBUG
log_rotation: time
path_file: "media_path.yaml"
server_ip: "0.0.0.0"
-server_port: 8000
+extern_http_url: localhost
+webserver_port: 8080
+webserver_https: 0
+extern_websocket_url: localhost
+websocket_port: 8000
+websocket_https: 0
task_max: 1
autostart: true
subtitle:
@@ -16,4 +21,4 @@ subtitle:
audio:
language:
- ger
- - eng
\ No newline at end of file
+ - eng
diff --git a/app/class_file_convert_read_out.py b/app/class_file_convert_read_out.py
index 7f06766..bc6144e 100644
--- a/app/class_file_convert_read_out.py
+++ b/app/class_file_convert_read_out.py
@@ -34,10 +34,9 @@ class Process:
self.process_line_extract(obj, line_decoded)
#logging.info(line_decoded)
- self.time_remaining = obj.format_time(obj.time_remaining())
self.loading = (self.frames / obj.source_frames_total) * 100
- await self.obj_websocket.send_websocket(self.to_dict())
+ await self.obj_websocket.send_websocket(self.to_dict(obj))
if self.line_empty > 30:
break
@@ -49,7 +48,7 @@ class Process:
self.line_empty = 0
if i == 100 or i == 200 or i == 300 or i == 400 or i == 500:
- logging.info(self.to_dict())
+ logging.info(self.to_dict(obj))
self.save_stat_value(obj)
elif i == 101 or i == 501:
i = 0
@@ -66,17 +65,14 @@ class Process:
# Quantizer
q = re.findall(r"q=\s*(\d+).\d+", line)
- #logging.info(f"q: {q}")
self.quantizer = int(q[0]) if q else 0
# Bitrate
bitrate = re.findall(r"bitrate=\s*(\d+)", line)
- #logging.info(f"bitrate: {bitrate}")
self.bitrate[0] = int(bitrate[0]) if bitrate else 0
# Speed
speed = re.findall(r"speed=\s*(\d+\.\d+)", line)
- #logging.info(f"speed: {speed}")
self.speed = float(speed[0]) if speed else 0.0
# File Size
@@ -88,7 +84,6 @@ class Process:
# Time
media_time = re.findall(r"time=\s*(\d+:\d+:\d+)", line)
time_v = media_time[0] if media_time else "00:00:00"
- #logging.info(media_time)
if self.time < obj.time_in_sec(time_v):
self.time = obj.time_in_sec(time_v)
obj.process_time = self.time
@@ -112,15 +107,15 @@ class Process:
if self.speed:
obj.stat_speed = [obj.stat_speed[0] + self.speed, obj.stat_speed[1] + 1]
- def to_dict(self):
+ def to_dict(self, obj):
return {"data_flow": {
"id": self.id,
"frames": self.frames,
"fps": self.fps,
"quantizer": self.quantizer,
"size": self.size,
- "time": self.time,
- "time_remaining": self.time_remaining,
+ "time": obj.format_time(self.time, "Tage", "Std", "Min", None),
+ "time_remaining": obj.format_time(obj.time_remaining(), None, "Std", "Min", None),
"loading": self.loading,
"bitrate": self.bitrate,
"speed": self.speed
diff --git a/app/class_media_file.py b/app/class_media_file.py
index 9ffb7ff..1807d02 100644
--- a/app/class_media_file.py
+++ b/app/class_media_file.py
@@ -9,6 +9,7 @@ class Media:
self.id = Media._id_counter
# source
self.source_file: str = path
+ self.source_path: str = os.path.dirname(path)
self.source_file_name: str = os.path.basename(self.source_file)
self.source_duration: int = self.time_in_sec(streams_video[0]["tags"].get("DURATION" or "duration", "00:00:00"))
self.source_size: list = self.size_convert("B", None, "storage", int(streams_format[0].get("size")))
@@ -83,6 +84,7 @@ class Media:
return {
"source_file_name": self.source_file_name,
"source_file": self.source_file,
+ "source_path": self.source_path,
"source_duration": self.source_duration,
"source_size": self.source_size,
"source_frame_rate": self.source_frame_rate,
@@ -147,30 +149,34 @@ class Media:
return self.process_time_remaining
@staticmethod
- def format_time(seconds):
+ def format_time(seconds:int, str_day, str_hour, str_min, str_s):
days = round(seconds // (24 * 3600))
seconds %= (24 * 3600)
- if days:
- d = (f"{days} Tag"
- f"")
+ if days and str_day is not None:
+ d = (f"{days} {str_day}")
else:
d = ""
hours = round(seconds // 3600)
seconds %= 3600
- if hours:
- h = f"{hours} Stunden"
+ if hours and str_hour is not None:
+ h = f"{hours} {str_hour}"
else:
h = ""
minutes = math.ceil(seconds // 60)
seconds %= 60
- if minutes:
- m = f"{minutes} Minuten"
+ if minutes and str_min is not None:
+ m = f"{minutes} {str_min}"
else:
m = ""
- return f"{d} {h} {m}"
+ if seconds and str_s is not None:
+ s = f"{seconds} {str_s}"
+ else:
+ s = ""
+
+ return f"{d} {h} {m} {s}"
# Data convert
@staticmethod
diff --git a/app/main_server.py b/app/main_server.py
index d49e83f..bf4cc42 100644
--- a/app/main_server.py
+++ b/app/main_server.py
@@ -78,8 +78,8 @@ class Server:
var_convert_active = value
async def server_websocket(self):
- server = await websockets.serve(self.handle_client, self.yaml['server_ip'], self.yaml['server_port'])
- logging.info(f"Websocket Server läuft auf IP: {self.yaml['server_ip']} Port: {self.yaml['server_port']}")
+ server = await websockets.serve(self.handle_client, self.yaml['server_ip'], self.yaml['websocket_port'])
+ logging.info(f"Websocket Server läuft auf IP: {self.yaml['server_ip']} Port: {self.yaml['websocket_port']}")
await server.wait_closed()
# WebServer --------------------------------------------------------------------------------------------------------
@@ -97,9 +97,10 @@ class Server:
if "debug" in query:
logging.info("Debug-Modus aktiv beim Seitenaufruf")
- ip = self.yaml.get("server_ip", "localhost")
- port = self.yaml.get("server_port", 8000)
- return web.json_response({"server_ip": ip, "server_port": port})
+ url = self.yaml["extern_websocket_url"]
+ port = self.yaml["websocket_port"]
+ websocket_https = self.yaml["websocket_https"]
+ return web.json_response({"extern_websocket_url": url, "websocket_port": port, "websocket_https": websocket_https})
@staticmethod
async def handle_stat(request):
@@ -118,9 +119,9 @@ class Server:
app.router.add_static("/client/", path="./client", name="client")
runner = web.AppRunner(app)
await runner.setup()
- site = web.TCPSite(runner, "0.0.0.0", 8080)
+ site = web.TCPSite(runner, "0.0.0.0", self.yaml["webserver_port"])
await site.start()
- logging.info("HTTP Server läuft auf Port 8080")
+ logging.info(f"HTTP Server läuft auf Port {self.yaml["webserver_port"]}")
# Start Server -----------------------------------------------------------------------------------------------------
diff --git a/client/index.html b/client/index.html
index 099c5ca..22c6fb9 100755
--- a/client/index.html
+++ b/client/index.html
@@ -11,7 +11,7 @@
Video Konvertierung
@@ -28,10 +28,16 @@
-
- Allgemeine Statistiken
- Hier könnten Diagramme, Durchschnittswerte etc. angezeigt werden.
-
+
diff --git a/client/index_style.css b/client/index_style.css
index e3e9343..21d129f 100755
--- a/client/index_style.css
+++ b/client/index_style.css
@@ -148,4 +148,55 @@ nav button:hover {
#statistics h2 {
margin-top: 0;
-}
\ No newline at end of file
+}
+
+.conversion_icons {
+ width: 50px;
+ height: auto;
+}
+
+.conversion_url {
+ font-size: 0.7rem;
+ text-align: center;
+}
+
+.popup {
+ display: none;
+ position: fixed;
+ z-index: 1000;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ background-color: rgba(0,0,0,0.7);
+}
+
+.popup-content {
+ background-color: #000000;
+ margin: 15% auto;
+ padding: 20px;
+ border: 1px solid #444;
+ width: 90%;
+ border-radius: 10px;
+ color: #eee;
+}
+
+.close {
+ color: #aaa;
+ float: right;
+ font-size: 24px;
+ font-weight: bold;
+ cursor: pointer;
+}
+
+.close:hover {
+ color: #fff;
+}
+
+.flex-row {
+ display: flex;
+ flex-direction: row;
+ align-items: flex-start;
+ justify-content: space-between;
+}
diff --git a/client/media_conversion.js b/client/media_conversion.js
old mode 100644
new mode 100755
index 42bdccd..ed22a64
--- a/client/media_conversion.js
+++ b/client/media_conversion.js
@@ -16,13 +16,21 @@ async function getMediaStat() {
getServerConfig()
.then(data => {
- const websocketIp = data.server_ip;
- const websocketPort = data.server_port;
- const ws = new WebSocket(`ws://${websocketIp}:${websocketPort}`);
+ const externWebsocketUrl = data.extern_websocket_url;
+ const websocketPort = data.websocket_port;
+ const websocketHttps = data.websocket_https
+
+ if (websocketHttps === 1){
+ connect = "wss"
+ } else {
+ connect = "ws"
+ }
+
+ const ws = new WebSocket(`${connect}://${externWebsocketUrl}:${websocketPort}`);
ws.onopen = function() {
console.log("WebSocket ist geöffnet");
- ws.send(JSON.stringify({"data_message": "Server Adresse: " + websocketIp + ":" + websocketPort}));
+ ws.send(JSON.stringify({"data_message": "Server Adresse: " + externWebsocketUrl + ":" + websocketPort}));
};
ws.onmessage = function(messageEvent) {
@@ -64,20 +72,21 @@ function createVideoElement(packet){
card.id = key
card.innerHTML = `
- ${video.source_file_name} - ${video.target_file_name}
+ ${video.source_file_name} - ${video.target_file_name}
-
Frames: 0 Anz
-
Größe: 0
-
FPS: 0
-
Quanitzer: 0
-
Bitrate: 0
-
Speed: 0
-
Zeit: 0
-
+
Frames: 0 Anz
+
Größe: 0
+
FPS: 0
+
Quanitzer: 0
+
Bitrate: 0
+
Speed: 0
+
Verbleibend: 0
+
Zeit: 0
+
Quelle: ${video.key}
@@ -103,6 +112,7 @@ function updateVideoElement(packet){
container.querySelector(".bitrate_unit").textContent = video.bitrate[1] || 0;
container.querySelector(".speed").textContent = video.speed || 0;
container.querySelector(".time_remaining").textContent = video.time_remaining || 0;
+ container.querySelector(".time").textContent = video.time || 0;
let progressBar = container.querySelector(".progress-bar");
let progress = video.loading; // Annahme: `loading` kommt als Zahl von 0 bis 100
@@ -118,4 +128,4 @@ function updateVideoElement(packet){
progressBar.style.background = "#ff0000";
container.querySelector(".finished").textContent = "Fehler";
}
-}
\ No newline at end of file
+}
diff --git a/client/media_stat.js b/client/media_stat.js
index 941bbd8..2b7b3c6 100755
--- a/client/media_stat.js
+++ b/client/media_stat.js
@@ -16,6 +16,14 @@ async function toggleStatHidden() {
section_stat.hidden = !section_stat.hidden
}
+function openPopup() {
+ document.getElementById("popup").style.display = "block";
+}
+
+function closePopup() {
+ document.getElementById("popup").style.display = "none";
+}
+
getMediaStat()
.then(data => {
console.log("Antwort von /api/stats:", data); // Debug-Ausgabe
@@ -51,7 +59,7 @@ getMediaStat()
FPS (aktuell): ${video.stat_fps}
Bitrate: ${video.stat_bitrate}
Speed: ${video.stat_speed}
-
+
`;
stat_Container.appendChild(card)
+ 