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

feat: Timeout-Handling für rclone-Befehle hinzugefügt und Versionsnummer auf 1.0.37 erhöht

Browse Source
This commit is contained in:
Tobias Leuschner
2026-05-09 13:21:54 +02:00
parent 632f9e348c
commit 652353c641
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app.py
View File

@@ -872,10 +872,16 @@ upload_lock = threading.Lock()
def _rclone(*args, timeout=60): def _rclone(*args, timeout=60):
return subprocess.run( try:
['rclone', '--config', str(RCLONE_CONF)] + list(args), return subprocess.run(
capture_output=True, text=True, timeout=timeout ['rclone', '--config', str(RCLONE_CONF)] + list(args),
) capture_output=True, text=True, timeout=timeout
)
except subprocess.TimeoutExpired as e:
if e.process:
e.process.kill()
# Fake CompletedProcess mit Fehlercode
return subprocess.CompletedProcess(args, 1, stdout='', stderr='Timeout')
def _rclone_obscure(pw): def _rclone_obscure(pw):
@@ -2355,9 +2361,11 @@ async function utSave(){
const r=await api('/upload/targets','POST',body); const r=await api('/upload/targets','POST',body);
if(r.error){flash('ut-form-flash','err',r.error);return;} if(r.error){flash('ut-form-flash','err',r.error);return;}
flash('ut-form-flash','warn','Teste Verbindung - Schreibzugriff wird geprüft...'); flash('ut-form-flash','warn','Teste Verbindung - Schreibzugriff wird geprüft...');
const t=await api('/upload/targets/'+r.id+'/test','POST'); try{
if(t.ok){flash('ut-form-flash','ok','✓ Verbindung OK - Lesen & Schreiben erfolgreich');utToggleForm();await loadUTs();} const t=await api('/upload/targets/'+r.id+'/test','POST');
else flash('ut-form-flash','err','✗ '+(t.error||'Test fehlgeschlagen')); if(t.ok){flash('ut-form-flash','ok','✓ Verbindung OK - Lesen & Schreiben erfolgreich');utToggleForm();await loadUTs();}
else flash('ut-form-flash','err','✗ '+(t.error||'Test fehlgeschlagen'));
}catch(e){flash('ut-form-flash','err','✗ Test fehlgeschlagen (Server-Timeout)');}
} }
async function utTest(id){ async function utTest(id){
const btn=$('ut-test-'+id), res=$('ut-test-result-'+id); const btn=$('ut-test-'+id), res=$('ut-test-result-'+id);

2
version.txt
View File

@@ -1 +1 @@
1.0.36 1.0.37