From da3582fb1e09d2201ed00c537ff900f32e8040f9 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 5 Nov 2020 05:58:20 +0100 Subject: [PATCH] fix parsing regex --- FHEM/98_backupToStorage.pm | 2 +- lib/FHEM/backupToStorage.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FHEM/98_backupToStorage.pm b/FHEM/98_backupToStorage.pm index 6bfff08..670b4a4 100644 --- a/FHEM/98_backupToStorage.pm +++ b/FHEM/98_backupToStorage.pm @@ -179,7 +179,7 @@ sub backupToStorage_Initialize { ], "release_status": "devepolment", "license": "GPL_2", - "version": "v1.2.1", + "version": "v1.2.2", "author": [ "Marko Oldenburg " ], diff --git a/lib/FHEM/backupToStorage.pm b/lib/FHEM/backupToStorage.pm index 0a11fc8..1004183 100644 --- a/lib/FHEM/backupToStorage.pm +++ b/lib/FHEM/backupToStorage.pm @@ -497,11 +497,11 @@ sub FileUpload { if ( $subprocess->{loglevel} > 4 ); - if ( $returnString =~ /100\s[0-9].*\s100\s[0-9].*/m + if ( $returnString =~ /100\s\s?[0-9].*\s100\s\s?[0-9].*/m and $returnString =~ /\s\s(.*)<\/o:hint>/m ) { $response->{ncUpload} = $1; } - elsif ( $returnString =~ /100\s[0-9].*\s100\s[0-9].*/m ) { + elsif ( $returnString =~ /100\s\s?[0-9].*\s100\s\s?[0-9].*/m ) { $response->{ncUpload} = 'upload successfully'; } elsif ( $returnString =~ /(curl:\s.*)/ ){