Tobias/PiCopy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Quellverzeichnisprüfung und verbesserte Fehlerprotokollierung für Uploads; Versionsnummer auf 1.0.44 erhöht

Browse Source
This commit is contained in:
Tobias Leuschner
2026-05-09 13:50:31 +02:00
parent 191f43372d
commit 2c3c9e359a
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app.py
View File

@@ -973,29 +973,42 @@ def run_uploads(local_dir: Path, cfg: dict):
root = _smb_conn(t)
dest = _smb_conn(t, dest_root)
# Quellverzeichnis prüfen
if not local_dir.exists():
err = f'Quellverzeichnis nicht gefunden: {local_dir}'
add_log(f'Upload {name}: ✗ {err}')
with upload_lock:
upload_state['results'].append({'name': name, 'ok': False, 'msg': err})
continue
# 1. Verbindung prüfen
conn = _rclone('lsd', root, timeout=15)
add_log(f'Upload {name}: Verbindung rc={conn.returncode}')
if conn.returncode != 0:
lines = [l for l in conn.stderr.strip().splitlines() if l.strip()]
err = lines[-1] if lines else 'NAS nicht erreichbar'
err = (conn.stderr.strip().splitlines()[-1] if conn.stderr.strip()
else 'NAS nicht erreichbar')
add_log(f'Upload {name}: ✗ {err}')
with upload_lock:
upload_state['results'].append({'name': name, 'ok': False, 'msg': err})
continue
# 2. Zielordner anlegen
_rclone('mkdir', dest, timeout=30)
mk = _rclone('mkdir', dest, timeout=30)
add_log(f'Upload {name}: mkdir rc={mk.returncode}'
+ (f' err={mk.stderr.strip()[:100]}' if mk.returncode != 0 else ''))
# 3. Kopieren
add_log(f'Upload {name}: starte copy von {local_dir}')
r = _rclone('copy', str(local_dir), dest,
'--create-empty-src-dirs',
'--retries', '2',
'--transfers', '1',
'--retries', '1',
timeout=7200)
ok = r.returncode == 0
err = ''
if not ok:
lines = [l for l in r.stderr.strip().splitlines() if l.strip()]
err = lines[-1] if lines else 'Unbekannter Fehler'
err = r.stderr.strip() or 'Unbekannter Fehler'
add_log(f'Upload {name}: rclone stderr: {err[:300]}')
with upload_lock:
upload_state['results'].append({'name': name, 'ok': ok, 'msg': err})