Changeset 2253 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm

Timestamp:

Aug 30, 2017, 5:07:33 PM (7 years ago)

Author:

Bruno Cornec

Message:

More YAML transformations

• We now generate a .pbrc.yml if none exist
• If no .pbrc.yml is found but a former .pbrc is there convert it automatically
• Adds a function pb_conf_update_v0 to convert automatically v0 conf files into v1 conf files
• pb_conf_cache now handles multi lines and can be used for filter management by pb_get_filters

File:

• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -68 +68 @@
 my $pbos = shift;
 my $ptr = undef; # returned value pointer on the hash of filters
-my %h;
+my $h;
 
 pb_log(2,"Entering pb_get_filters - pbpkg: $pbpkg - pbos: ".Dumper($pbos)."\n");
@@ -88 +88 @@
     foreach my $f (@ffiles) {
         pb_log(3,"DEBUG processing filter file $f\n");
-        open(CONF,$f) || next;
-        while(<CONF>)  {
-            if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-                my ($what, $var, $value) = ($1, $2, $3);
-                pb_log(3,"DEBUG creating entry $what, key $var, value $value\n");
-                # Add support for multi-lines
-                while ($value =~ s/\\\s*$//o) {
-                    $_ = <CONF>;
-                    die "Still processing continuations for $what $var at EOF" if (not defined $_);
-                    s/[\r\n]//go;
-                    $value .= "\n$_";
-                }
-                $h{$what}{$var}=$value;
-            } elsif ((/^\s*#/o) || (/^\s*$/o)) {
-                # ignore
-            } else {
-                chomp();
-                warn "unexpected line '$_' in $f";
-            }
-        }
-        close(CONF);
-    }
-    $ptr = $h{"filter"};
+        $h = pb_conf_cache($f,$h);
+    }
+    $ptr = $h->{"filter"};
 
     # TODO: find a place to document it. Why not in this file as pod and also documenting filters ?
     # Handle transform
-    if (defined $h{transform}) {
-        while (my ($out_key,$spec) = each %{$h{transform}}) {
+    if (defined $h->{transform}) {
+        while (my ($out_key,$spec) = each %{$h->{transform}}) {
             die "Unknown transform for $out_key '$spec' expected <out-key> <transform>" unless $spec =~ /^([\w\-]+)\s+(.+)$/;
             my ($in_key, $expr) = ($1, $2);