dcm 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f3bbfdbb0284f5b1e4dea4e3428e49049724ee9fc5e059337fccb9f953ec37
-  data.tar.gz: 52215d5d5ad42b0157d6b6b61110a57b1a2c97a64a3192e59e0ace8ab486868b
+  metadata.gz: 7d6c6d8b3341afdbe2ee6d4fbb596409e364844ca8e16552e6b2deb22756609a
+  data.tar.gz: 7881fdc1335265a96d70e88121dca3c5cfee693c328b1f8518a9952633e13bca
 SHA512:
-  metadata.gz: f157553d0a3d945aa43c90359e540310ecdd38efda40a1644799e28a30eb9a43a31447e5369ac7ce3dd5b9f56b21349ad5c286083cd4ca2ce3364875ae198caf
-  data.tar.gz: 4f49b2a5aa5280dfef2f4933dc6fcb308e537097a6d28730faf31084a1f8fe78e3bbde5f615f76bc38654f31783c8c0819fbb5e166d8f8c8fea34259b89dba79
+  metadata.gz: 246e46a81052ddb1c86a49c529979e7e9134b129b6d68d58756ce319b84453d2b9b9d155e424ff748eaea226ab40774f5f11971ee3a43df36374dd2b2bbbcf7e
+  data.tar.gz: aaec1159240e20cc19caf6be99b9f8d62c6c8c04d40441957c6f1d34febc4de28dc069fac4aca833aa795a409524457e533b584af044349b4d2b62e067fbf141

data/lib/cli.rb

@@ -11,6 +11,7 @@ require_relative "codinginfo"
 require_relative "tempfile_handler"
 require_relative "diff_viewer"
 require_relative "label_selector"
+require_relative "variant_filter"
 require_relative "core_ext"
 require_relative "version"
 
@@ -40,20 +41,20 @@ module Dcm
       loop { LabelSelector.choose_from(list) }
     end
 
-    desc "creta2begu ID CODING FILE", "Convert a hierarchical DCM to a flat DCM"
-    def creta2begu(id, codingpath, file)
+    desc "creta2begu FILTER CODING FILE", "Convert a hierarchical DCM to a flat DCM"
+    def creta2begu(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new([id], codingpath)
+      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
         .flatten_list(list)
         .to_dcm
     end
 
-    desc "begu2creta IDS CODING FILE", "Convert a flat DCM to a hierarchical DCM"
-    def begu2creta(ids, codingpath, file)
+    desc "begu2creta FILTER CODING FILE", "Convert a flat DCM to a hierarchical DCM"
+    def begu2creta(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new(ids.split(","), codingpath)
+      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
         .unflatten_list(list)
         .to_dcm
     end

data/lib/codinginfo.rb

@@ -25,8 +25,8 @@ class Codinginfo
     def to_s = "#{name}=#{value}"
     def ==(other) = name == other.name
 
-    def merge(other)
-      fail "Cannot merge #{name} with #{other.name}" unless self == other
+    def combine(other)
+      fail "Cannot combine #{name} with #{other.name}" unless self == other
 
       self.class.new \
         name: name,
@@ -47,8 +47,9 @@ class Codinginfo
     end
   end
 
-  def initialize(ids, filepath)
+  def initialize(filepath, filter)
     @doc         = SimpleXlsxReader.open(filepath)
+    @filter      = filter
     @headers     = []
     @variants    = []
     @assignments = {}
@@ -56,11 +57,8 @@ class Codinginfo
     overview_sheet
       .rows
       .each do |row|
-        parse_headers(row) if @headers.empty?
-        next if @headers.empty?
-        next if row[1].nil? || row[3].nil?
-        next unless ids.any? { row[1].match?(/#{_1}/i) }
-        next unless row[3].match?(/CVAR/)
+        next unless headers_parsed?(row)
+        next unless filter.match?(@headers, row)
 
         @variants << Variant.new(@headers, row)
       end
@@ -89,21 +87,23 @@ class Codinginfo
   end
 
   def variant
-    fail "No variant matching #{id} found!" if @variants.empty?
+    fail "No variant matching #{@filter} found!" if @variants.empty?
     fail "More than one variant matching #{id} found!" if @variants.size > 1
 
     @variants.first
   end
 
   def unflatten_list(list)
+    fail "No variants found matching #{@filter}" if @variants.empty?
+
     Ecu::LabelList.new \
       list.flat_map { |label|
         if has_cvar_assignment?(label)
-          @variants.map { label.with(name: add_cvar_prefix(label, _1)) }
+          @variants.map { label.with(name: add_cvar_prefix(label.name, _1)) }
         else
           label
         end
-      }
+      }.uniq
   end
 
   def flatten_list(list)
@@ -124,28 +124,33 @@ class Codinginfo
     variant.cvars.any? { label.name.match?(_1.label_prefix) }
   end
 
-  def add_cvar_prefix(label, variant)
+  def add_cvar_prefix(name, variant)
     variant
       .cvars
-      .find { _1 == @assignments[label.name] }
-      .then { _1.merge(@assignments[label.name]) }
-      .then { _1.label_prefix + label.name }
+      .find { _1 == @assignments[name] }
+      .then { _1.combine(@assignments[name]) }
+      .then { _1.label_prefix + name }
   end
 
   def remove_cvar_prefix(name)
     name.sub(CVAR_PREFIX_REGEXP, "")
   end
 
-  def parse_headers(row)
-    return unless row[1]&.match?(/SWFK-ID/)
-    return unless row[1]&.match?(/CVAR_BeguData/)
-    return unless row[2]&.match?(/Kommentar/)
+  def headers_parsed?(row)
+    return true if @headers.any?
+
+    return false unless row[1]&.match?(/SWFK-ID/)
+    return false unless row[1]&.match?(/CVAR_BeguData/)
+    return false unless row[2]&.match?(/Kommentar/)
 
     @headers = row
       .map(&:chomp)
       .map(&:lstrip)
       .map(&:strip)
       .map { _1.sub(/\n.*/, "") }
-      .tap { _1[0] = "typestr" }
+      .tap { _1[0] = :typestr }
+      .tap { _1[1] = :swfk_id }
+      .tap { _1[4] = :typekey }
+      .tap { _1[6] = :devkey }
   end
 end

data/lib/variant_filter.rb

@@ -0,0 +1,27 @@
+module Dcm
+  class VariantFilter
+    ALLOWED_FILTERKEYS = %w(swfk_id typekey devkey)
+
+    attr_reader :key, :matchers
+    def initialize(expr)
+      unless expr.match?(/^[\w_]+\:/) && ALLOWED_FILTERKEYS.include?(expr.split(":").first)
+        fail "Unknown filter expression #{expr}. "
+          "Syntax: (#{ALLOWED_FILTERKEYS.join("|")}):value[,value2]."
+      end
+
+      key, matchers = expr.split(":")
+      @key = key.to_sym
+      @matchers = matchers.split(",").map { /#{_1}/i }
+    end
+
+    def match?(headers, row)
+      return false unless row[3]
+      return false unless row[3].match?(/CVAR/)
+      return false unless headers.include?(@key)
+
+      matchers.any? { row[headers.index(@key)].match?(_1) }
+    end
+
+    def to_s = "<Filter #{key}:#{matchers.join(",")}"
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automotive-ecu
@@ -84,6 +84,7 @@ files:
 - lib/list_colorizer.rb
 - lib/selecta.rb
 - lib/tempfile_handler.rb
+- lib/variant_filter.rb
 - lib/version.rb
 homepage: https://sr.ht/~muellerj/dcm
 licenses: