dcm 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f3bbfdbb0284f5b1e4dea4e3428e49049724ee9fc5e059337fccb9f953ec37
-  data.tar.gz: 52215d5d5ad42b0157d6b6b61110a57b1a2c97a64a3192e59e0ace8ab486868b
+  metadata.gz: 24fe5532820ef2590dd51fcb42433a4a3972b716ce5f77269653a58d33f93435
+  data.tar.gz: 96b84123a8fe6b36916aa1648729373f896712a0a2e6a8b5301854896091c409
 SHA512:
-  metadata.gz: f157553d0a3d945aa43c90359e540310ecdd38efda40a1644799e28a30eb9a43a31447e5369ac7ce3dd5b9f56b21349ad5c286083cd4ca2ce3364875ae198caf
-  data.tar.gz: 4f49b2a5aa5280dfef2f4933dc6fcb308e537097a6d28730faf31084a1f8fe78e3bbde5f615f76bc38654f31783c8c0819fbb5e166d8f8c8fea34259b89dba79
+  metadata.gz: 6725d774fdaa8b235463a141a3b3d504d4fbc5b52e77f8dc1f0fd0b5d56388b4381f4dd718f43b7a0c588ae4aeb1d64e816bb4f1c849709274facff262872657
+  data.tar.gz: ca12146d598edd1b8264eb19c766416c945e99df79d0ed1c020b68ef64fba92ce738416e9f4e0e05b1ceb6471b27e6e43a1a7244b394b7af6192358a0cbb9e7f

data/lib/cli.rb

@@ -18,6 +18,8 @@ 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)
@@ -40,20 +42,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, parse_filter(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, parse_filter(expr))
         .unflatten_list(list)
         .to_dcm
     end
@@ -254,6 +256,18 @@ 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

@@ -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,7 +47,7 @@ class Codinginfo
     end
   end
 
-  def initialize(ids, filepath)
+  def initialize(filepath, filter)
     @doc         = SimpleXlsxReader.open(filepath)
     @headers     = []
     @variants    = []
@@ -56,11 +56,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 matches_filter?(row, *filter.to_a.first)
 
         @variants << Variant.new(@headers, row)
       end
@@ -88,6 +85,14 @@ 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 "More than one variant matching #{id} found!" if @variants.size > 1
@@ -99,11 +104,11 @@ class Codinginfo
     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 +129,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jonas Mueller