Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d63b6b36d4 | ||
|
|
06e88ced19 | ||
|
|
fbf5f3b93f | ||
|
|
9bd4b360cd |
@@ -1,4 +1,4 @@
|
||||
"""Playtube - ein eigenstaendiger YouTube- & YouTube-Music-Player mit Discord Rich Presence."""
|
||||
|
||||
__app_name__ = "Playtube"
|
||||
__version__ = "2.1.3"
|
||||
__version__ = "2.1.5"
|
||||
|
||||
@@ -48,6 +48,14 @@ def _app_data_dir() -> Path:
|
||||
return d
|
||||
|
||||
|
||||
def app_data_dir() -> Path:
|
||||
"""Oeffentlicher Zugriff auf den App-Datenordner, z.B. fuer Debug-Logs - die
|
||||
gepackte .exe laeuft ohne Konsolenfenster (console=False), print()-Debugging ist
|
||||
dort also unsichtbar; ein Log-File ist die einzige Moeglichkeit, dort etwas
|
||||
nachtraeglich einzusehen."""
|
||||
return _app_data_dir()
|
||||
|
||||
|
||||
def _config_path() -> Path:
|
||||
# Im Entwicklungsmodus liegt config.json direkt im Projektordner (leicht editierbar),
|
||||
# im gepackten Build im APPDATA-Ordner.
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
"""Sehr einfaches, immer aktives Datei-Log fuer schwer reproduzierbare Bugs.
|
||||
|
||||
Die gepackte .exe laeuft ohne Konsolenfenster (console=False in packaging/playtube.spec),
|
||||
also sind print()-Debugausgaben dort unsichtbar - selbst mit PLAYTUBE_DEBUG=1 sieht der
|
||||
Nutzer nichts. Dieses Modul schreibt stattdessen in eine kleine, automatisch gekappte
|
||||
Log-Datei im App-Datenordner, die sich jederzeit nachtraeglich auslesen laesst.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
import traceback
|
||||
from pathlib import Path
|
||||
|
||||
from .config import app_data_dir
|
||||
|
||||
_MAX_LINES = 500
|
||||
|
||||
|
||||
def _log_path() -> Path:
|
||||
d = app_data_dir() / "logs"
|
||||
d.mkdir(parents=True, exist_ok=True)
|
||||
return d / "discord_rpc.log"
|
||||
|
||||
|
||||
def log_line(msg: str) -> None:
|
||||
"""Haengt eine Zeile mit Zeitstempel an - haelt die Datei klein, indem bei
|
||||
Ueberlaenge nur die letzten _MAX_LINES Zeilen behalten werden."""
|
||||
try:
|
||||
path = _log_path()
|
||||
timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
|
||||
line = f"[{timestamp}] {msg}\n"
|
||||
with open(path, "a", encoding="utf-8") as f:
|
||||
f.write(line)
|
||||
|
||||
lines = path.read_text(encoding="utf-8", errors="replace").splitlines()
|
||||
if len(lines) > _MAX_LINES:
|
||||
path.write_text("\n".join(lines[-_MAX_LINES:]) + "\n", encoding="utf-8")
|
||||
except Exception:
|
||||
# Logging darf niemals die App zum Absturz bringen.
|
||||
pass
|
||||
|
||||
|
||||
def log_exception(context: str, exc: BaseException) -> None:
|
||||
log_line(f"{context}: {exc!r}\n{''.join(traceback.format_exception(exc))}")
|
||||
@@ -16,6 +16,7 @@ from typing import Any
|
||||
from PySide6.QtCore import QThread
|
||||
|
||||
from .config import APP_NAME
|
||||
from .debug_log import log_line
|
||||
|
||||
try:
|
||||
from pypresence.types import ActivityType
|
||||
@@ -199,6 +200,7 @@ class DiscordRPCWorker(QThread):
|
||||
self._presence = Presence(self._client_id)
|
||||
self._presence.connect()
|
||||
self._connected = True
|
||||
log_line("[connect] verbunden")
|
||||
if os.environ.get("PLAYTUBE_DEBUG"):
|
||||
print("[discord-rpc] verbunden", flush=True)
|
||||
except Exception as exc:
|
||||
@@ -224,6 +226,7 @@ class DiscordRPCWorker(QThread):
|
||||
now = time.time()
|
||||
|
||||
if key != self._track_key:
|
||||
old_key = self._track_key
|
||||
self._track_key = key
|
||||
# current_time nur als grobe Anfangs-Schaetzung verwenden (z.B. Programm
|
||||
# startet waehrend ein Titel schon laeuft) - plausibilisiert, damit ein
|
||||
@@ -231,6 +234,7 @@ class DiscordRPCWorker(QThread):
|
||||
# rein ueber die Systemzeit weiterlaeuft statt ueber currentTime.
|
||||
offset = current_time if (duration <= 0 or 0 <= current_time <= duration) else 0
|
||||
self._track_start_ts = int(now - offset)
|
||||
log_line(f"[track-change] alt={old_key!r} neu={key!r} offset={offset:.1f}s")
|
||||
|
||||
start_ts = self._track_start_ts if self._track_start_ts is not None else int(now)
|
||||
end_ts = start_ts + int(duration) if duration and duration > 0 else None
|
||||
@@ -254,11 +258,22 @@ class DiscordRPCWorker(QThread):
|
||||
start_ts, end_ts = self._track_timestamps(item)
|
||||
payload = build_presence_payload(item, self._session_start, start_ts, end_ts)
|
||||
self._presence.update(**payload)
|
||||
log_line(
|
||||
"[send] title=%r thumbnail=%r large_image=%r start=%s end=%s"
|
||||
% (
|
||||
item.get("title"),
|
||||
item.get("thumbnail"),
|
||||
payload.get("large_image"),
|
||||
start_ts,
|
||||
end_ts,
|
||||
)
|
||||
)
|
||||
if os.environ.get("PLAYTUBE_DEBUG"):
|
||||
print(f"[discord-rpc] gesendet: {payload!r}", flush=True)
|
||||
except Exception as exc:
|
||||
# Discord evtl. geschlossen worden -> beim naechsten Mal neu verbinden.
|
||||
self._connected = False
|
||||
log_line(f"[send-error] {exc!r}")
|
||||
if os.environ.get("PLAYTUBE_DEBUG"):
|
||||
print(f"[discord-rpc] Senden fehlgeschlagen: {exc!r}", flush=True)
|
||||
|
||||
|
||||
@@ -333,7 +333,14 @@ class MainWindow(QMainWindow):
|
||||
self._settings_tab.set_download_progress(100)
|
||||
if getattr(sys, "frozen", False):
|
||||
# Ein Hintergrund-Skript wartet bereits darauf, dass dieser Prozess
|
||||
# beendet wird, tauscht dann die Dateien aus und startet die App neu.
|
||||
# beendet wird, tauscht dann die Dateien aus und startet die App neu -
|
||||
# es zeigt dabei selbst ein kleines Fortschrittsfenster an (siehe
|
||||
# updater.py), damit der Nutzer zwischen "App schliesst sich" und
|
||||
# "neue App startet" nicht denkt, etwas sei abgestuerzt.
|
||||
self._settings_tab.set_update_status(
|
||||
"Installation abgeschlossen. Playtube wird neu gestartet …"
|
||||
)
|
||||
self._tray.setToolTip(f"{APP_NAME} – wird neu gestartet …")
|
||||
self._quit()
|
||||
else:
|
||||
QMessageBox.information(
|
||||
|
||||
+83
-11
@@ -222,32 +222,88 @@ class UpdateInstaller(QThread):
|
||||
|
||||
self.finished_ok.emit()
|
||||
|
||||
# Kleines, immer sichtbares Fortschrittsfenster fuer den Windows-Installationsschritt.
|
||||
# Der Hauptprozess ist zu diesem Zeitpunkt schon beendet (Datei-Sperren!), daher
|
||||
# laeuft das komplett im separaten PowerShell-Skript - ohne dieses Fenster wuerde
|
||||
# der Nutzer nach dem Schliessen der App fuer die Dauer der Installation (bei
|
||||
# einem vollen Paket ggf. mehrere Sekunden) gar nichts sehen, was wie ein Absturz
|
||||
# oder Haenger wirkt.
|
||||
_WINDOWS_PROGRESS_FORM_PS = """
|
||||
Add-Type -AssemblyName System.Windows.Forms
|
||||
Add-Type -AssemblyName System.Drawing
|
||||
$form = New-Object System.Windows.Forms.Form
|
||||
$form.Text = "Playtube-Update"
|
||||
$form.Size = New-Object System.Drawing.Size(380,130)
|
||||
$form.StartPosition = "CenterScreen"
|
||||
$form.FormBorderStyle = "FixedDialog"
|
||||
$form.ControlBox = $false
|
||||
$form.TopMost = $true
|
||||
$label = New-Object System.Windows.Forms.Label
|
||||
$label.Text = "Playtube wird aktualisiert – bitte warten …"
|
||||
$label.AutoSize = $false
|
||||
$label.Size = New-Object System.Drawing.Size(340,20)
|
||||
$label.Location = New-Object System.Drawing.Point(20,15)
|
||||
$form.Controls.Add($label)
|
||||
$bar = New-Object System.Windows.Forms.ProgressBar
|
||||
$bar.Style = "Marquee"
|
||||
$bar.MarqueeAnimationSpeed = 30
|
||||
$bar.Size = New-Object System.Drawing.Size(340,20)
|
||||
$bar.Location = New-Object System.Drawing.Point(20,50)
|
||||
$form.Controls.Add($bar)
|
||||
$form.Show()
|
||||
$form.Refresh()
|
||||
"""
|
||||
|
||||
# -- Patch (nur .exe/Binary tauschen, _internal/ bleibt unangetastet) --
|
||||
|
||||
def _install_patch_windows(self, new_exe: Path, install_dir: Path, staging: Path) -> None:
|
||||
exe_path = install_dir / _WINDOWS_BINARY_NAME
|
||||
script = f"""
|
||||
script = self._WINDOWS_PROGRESS_FORM_PS + f"""
|
||||
$ErrorActionPreference = "SilentlyContinue"
|
||||
Start-Sleep -Seconds 1
|
||||
$targetPid = {os.getpid()}
|
||||
while (Get-Process -Id $targetPid -ErrorAction SilentlyContinue) {{
|
||||
Start-Sleep -Milliseconds 500
|
||||
Start-Sleep -Milliseconds 300
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
}}
|
||||
$label.Text = "Kopiere aktualisierte Datei …"
|
||||
$form.Refresh()
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
Copy-Item -Path "{new_exe}" -Destination "{exe_path}" -Force
|
||||
$label.Text = "Fertig – Playtube wird neu gestartet …"
|
||||
$form.Refresh()
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
Start-Process -FilePath "{exe_path}"
|
||||
Start-Sleep -Seconds 2
|
||||
Start-Sleep -Milliseconds 800
|
||||
$form.Close()
|
||||
Remove-Item -Recurse -Force "{staging}" -ErrorAction SilentlyContinue
|
||||
"""
|
||||
self._spawn_windows_script(script, staging)
|
||||
|
||||
# Falls zenity installiert ist (auf den meisten Desktop-Distros vorhanden), waehrend
|
||||
# Wartezeit/Installation ein pulsierendes Fortschrittsfenster zeigen - rein optisch,
|
||||
# das Update funktioniert auch ohne (dann passiert der Neustart einfach unsichtbar).
|
||||
_POSIX_PROGRESS_HEADER = """#!/bin/sh
|
||||
ZPID=""
|
||||
if command -v zenity >/dev/null 2>&1; then
|
||||
tail -f /dev/null | zenity --progress --title="Playtube-Update" \
|
||||
--text="Playtube wird aktualisiert - bitte warten ..." --pulsate --no-cancel \
|
||||
>/dev/null 2>&1 &
|
||||
ZPID=$!
|
||||
fi
|
||||
"""
|
||||
_POSIX_PROGRESS_FOOTER = """
|
||||
[ -n "$ZPID" ] && kill "$ZPID" 2>/dev/null
|
||||
"""
|
||||
|
||||
def _install_patch_posix(self, new_binary: Path, install_dir: Path, staging: Path) -> None:
|
||||
exe_path = install_dir / _LINUX_BINARY_NAME
|
||||
script = f"""#!/bin/sh
|
||||
script = self._POSIX_PROGRESS_HEADER + f"""
|
||||
while kill -0 {os.getpid()} 2>/dev/null; do
|
||||
sleep 0.5
|
||||
done
|
||||
cp -f "{new_binary}" "{exe_path}"
|
||||
chmod +x "{exe_path}"
|
||||
""" + self._POSIX_PROGRESS_FOOTER + f"""
|
||||
nohup "{exe_path}" >/dev/null 2>&1 &
|
||||
rm -rf "{staging}"
|
||||
"""
|
||||
@@ -257,29 +313,45 @@ rm -rf "{staging}"
|
||||
|
||||
def _install_full_windows(self, source_dir: Path, install_dir: Path, staging: Path) -> None:
|
||||
exe_path = install_dir / _WINDOWS_BINARY_NAME
|
||||
script = f"""
|
||||
script = self._WINDOWS_PROGRESS_FORM_PS + f"""
|
||||
$ErrorActionPreference = "SilentlyContinue"
|
||||
Start-Sleep -Seconds 1
|
||||
$targetPid = {os.getpid()}
|
||||
while (Get-Process -Id $targetPid -ErrorAction SilentlyContinue) {{
|
||||
Start-Sleep -Milliseconds 500
|
||||
Start-Sleep -Milliseconds 300
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
}}
|
||||
robocopy "{source_dir}" "{install_dir}" /MIR /NFL /NDL /NJH /NJS /NC /NS /NP | Out-Null
|
||||
$label.Text = "Kopiere Programmdateien … (kann etwas dauern)"
|
||||
$form.Refresh()
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
# Ueber Start-Process (statt direktem Aufruf) gestartet und per Polling statt -Wait
|
||||
# abgewartet, damit die Fensternachrichtenschleife per DoEvents() weiterlaeuft -
|
||||
# sonst wuerde Windows das Fenster waehrend robocopy als "Keine Rueckmeldung" anzeigen.
|
||||
$roboArgs = @("{source_dir}", "{install_dir}", "/MIR", "/NFL", "/NDL", "/NJH", "/NJS", "/NC", "/NS", "/NP")
|
||||
$roboProc = Start-Process -FilePath "robocopy" -ArgumentList $roboArgs -WindowStyle Hidden -PassThru
|
||||
while (-not $roboProc.HasExited) {{
|
||||
Start-Sleep -Milliseconds 200
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
}}
|
||||
$label.Text = "Fertig – Playtube wird neu gestartet …"
|
||||
$form.Refresh()
|
||||
[System.Windows.Forms.Application]::DoEvents()
|
||||
Start-Process -FilePath "{exe_path}"
|
||||
Start-Sleep -Seconds 2
|
||||
Start-Sleep -Milliseconds 800
|
||||
$form.Close()
|
||||
Remove-Item -Recurse -Force "{staging}" -ErrorAction SilentlyContinue
|
||||
"""
|
||||
self._spawn_windows_script(script, staging)
|
||||
|
||||
def _install_full_posix(self, source_dir: Path, install_dir: Path, staging: Path) -> None:
|
||||
exe_path = install_dir / _LINUX_BINARY_NAME
|
||||
script = f"""#!/bin/sh
|
||||
script = self._POSIX_PROGRESS_HEADER + f"""
|
||||
while kill -0 {os.getpid()} 2>/dev/null; do
|
||||
sleep 0.5
|
||||
done
|
||||
rm -rf "{install_dir}"/*
|
||||
cp -a "{source_dir}"/. "{install_dir}"/
|
||||
chmod +x "{exe_path}"
|
||||
""" + self._POSIX_PROGRESS_FOOTER + f"""
|
||||
nohup "{exe_path}" >/dev/null 2>&1 &
|
||||
rm -rf "{staging}"
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user