From 2323659122010211d80ef71c0906d90fc1439b55 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Sun, 8 Nov 2015 23:32:24 +0100 Subject: emi: Factorize filenames parsing, to make easy to support more file suffixes --- emi | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/emi b/emi index e79b3d3..d26e758 100755 --- a/emi +++ b/emi @@ -132,14 +132,19 @@ sub done_func { my $section = "$m/$s"; - if ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*)\.done$/) { - my ($prefix, $arch) = ($1, $2); - $archdone{$prefix}{$section}{$arch} = 1; - } elsif ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_(.*)\.excluded$/) { - my ($prefix, $arch) = ($1, $2); - $arch = $config->{arch_translation}{$arch} if $config->{arch_translation}{$arch}; - plog('DEBUG', "found .excluded ($prefix)"); - $excluded{$prefix}{$section}{$arch} = 1; + if ($r =~ /^(\d{14}\.\w+\.\w+\.\d+)([_.].+)$/) { + my ($prefix, $suffix) = ($1, $2); + if ($suffix =~ /^_(\w+)\.(\w+)$/) { + my ($arch, $result) = ($1, $2); + if ($result eq 'done') { + plog('DEBUG', "found .done ($prefix) for $arch"); + $archdone{$prefix}{$section}{$arch} = 1; + } elsif ($result eq 'excluded') { + $arch = $config->{arch_translation}{$arch} if $config->{arch_translation}{$arch}; + plog('DEBUG', "found .excluded ($prefix) for $arch"); + $excluded{$prefix}{$section}{$arch} = 1; + } + } } } -- cgit v1.2.1