dcm 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fe5532820ef2590dd51fcb42433a4a3972b716ce5f77269653a58d33f93435
-  data.tar.gz: 96b84123a8fe6b36916aa1648729373f896712a0a2e6a8b5301854896091c409
+  metadata.gz: 566406af32cf1b1fc52fd0efc038584ba2ebf65593a6320b9ca81f7039c005b4
+  data.tar.gz: df518e54f75ef0aae5aa6a13c004e43cc3f6658a69b79d929733a8d69ceee12e
 SHA512:
-  metadata.gz: 6725d774fdaa8b235463a141a3b3d504d4fbc5b52e77f8dc1f0fd0b5d56388b4381f4dd718f43b7a0c588ae4aeb1d64e816bb4f1c849709274facff262872657
-  data.tar.gz: ca12146d598edd1b8264eb19c766416c945e99df79d0ed1c020b68ef64fba92ce738416e9f4e0e05b1ceb6471b27e6e43a1a7244b394b7af6192358a0cbb9e7f
+  metadata.gz: 58dfaf09bf316528e3e89673dbac84569049226bb8db76120dcedd866862a15eb97e5ae58db48d31d15b677820376119bbff9fa8a7a0538724830dd953ce733b
+  data.tar.gz: 54cf037e406d496ada46510043be829615bddc44cc1b394ebf6b93d4d52e62df54c0b81c564e3db1c9ef09818136de625a24d8afcc0ddee2bae421e1550ef7f5

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"
 
@@ -18,8 +19,6 @@ module Dcm
 
   class CLI < Thor
 
-    ALLOWED_FILTERKEYS = [:swfk_id, :typekey, :devkey]
-
     desc "show FILE", "Show all labels in FILE"
     option :oneline, type: :boolean, aliases: ["-l"]
     def show(file=nil)
@@ -46,7 +45,7 @@ module Dcm
     def creta2begu(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, parse_filter(expr))
+      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
         .flatten_list(list)
         .to_dcm
     end
@@ -55,7 +54,7 @@ module Dcm
     def begu2creta(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, parse_filter(expr))
+      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
         .unflatten_list(list)
         .to_dcm
     end
@@ -256,18 +255,6 @@ module Dcm
       Ecu::LabelList.new([label])
     end
 
-    def check_filter(expr)
-      return if ALLOWED_FILTERKEYS.include?(expr.split(":").first)
-
-      fail "Unknown filter expression #{expr}. Possible keys are #{ALLOWED_FILTERKEYS.join(", ")}. Use key:value1,value2 syntax."
-    end
-
-    def parse_filter(expr)
-      expr
-        .split(":")
-        .then { { _1.to_sym => _2.split(",") } }
-    end
-
     def display_list(list:, detail:, format: :tty)
       case format
       when :tty

data/lib/codinginfo.rb

@@ -45,10 +45,13 @@ class Codinginfo
         .select { |key, _| key.match?(/^CVAR_/) }
         .map { Cvar.new(name: _1, value: _2.to_i) }
     end
+
+    def description = @properties[:swfk_id]
   end
 
   def initialize(filepath, filter)
     @doc         = SimpleXlsxReader.open(filepath)
+    @filter      = filter
     @headers     = []
     @variants    = []
     @assignments = {}
@@ -57,7 +60,7 @@ class Codinginfo
       .rows
       .each do |row|
         next unless headers_parsed?(row)
-        next unless matches_filter?(row, *filter.to_a.first)
+        next unless filter.match?(@headers, row)
 
         @variants << Variant.new(@headers, row)
       end
@@ -85,22 +88,24 @@ class Codinginfo
       .tap { fail "Cannot find sheet Parameterdefinition" if _1.nil? }
   end
 
-  def matches_filter?(row, key, values)
-    return false unless row[3]
-    return false unless row[3].match?(/CVAR/)
-    return false unless @headers.include?(key)
-
-    values.any? { row[@headers.index(key)].match?(/#{_1}/i) }
-  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 variants_description
+    [
+      "Created by dcm version #{Dcm::VERSION}",
+      "The following swfk_ids were matched:",
+      *@variants.map { "  " + _1.description }
+    ]
+  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)
@@ -108,13 +113,15 @@ class Codinginfo
         else
           label
         end
-      }.uniq
+      }.uniq,
+      variants_description
   end
 
   def flatten_list(list)
     list
       .select { !cvar_coded?(_1) || has_matching_cvar?(_1) }
       .map_int { _1.with(name: remove_cvar_prefix(_1.name)) }
+      .with(headers: variants_description)
   end
 
   def cvar_coded?(label)

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.11"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automotive-ecu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -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: