Add more files for firstbase mode

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.8.1)
+    oddb2xml (2.8.2)
       htmlentities
       httpi
       mechanize

lib/oddb2xml/cli.rb

@@ -40,7 +40,7 @@ def run
       start_time = Time.now
       files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
       FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?
-      if @options[:calc] && !(@options[:extended])
+      if @options[:calc] && !(@options[:extended] || @options[:firstbase])
         threads << download(:package) # swissmedic
       elsif @options[:address]
         [:company, :person].each do |type|
@@ -106,9 +106,9 @@ def run
     private
 
     def build
-      @the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+      @the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
       builder = Builder.new(@options) do |builder|
-        if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+        if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
           builder.packs = @packs
         elsif @options[:address]
           builder.companies = @companies
@@ -343,7 +343,9 @@ def compress
     def files
       unless @the_files
         @the_files = {}
-        @the_files[:calc] = "oddb_calc.xml" if @options[:calc]
+        if @options[:calc]
+          @the_files[:calc] = "oddb_calc.xml"
+        end
         if @options[:artikelstamm]
           @the_files[:artikelstamm] = "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.xml"
         elsif @options[:address]

lib/oddb2xml/options.rb

@@ -55,6 +55,11 @@ def self.parse(args = ARGV)
       @opts.delete(:increment)
       @opts[:nonpharma] = @opts[:append]
       @opts.delete(:append)
+      if @opts[:firstbase]
+        @opts[:nonpharma] = true
+        # https://github.com/zdavatz/oddb2xml/issues/76
+        @opts[:calc] = true
+      end
       if @opts[:extended]
         @opts[:nonpharma] = true
         @opts[:price] = :zurrose
@@ -64,10 +69,6 @@ def self.parse(args = ARGV)
         @opts[:extended] = true
         @opts[:price] = :zurrose
       end
-      if @opts[:firstbase]
-        @opts[:nonpharma] = true
-        @opts[:calc] = true
-      end
       @opts[:price] = :zurrose if @opts[:price].is_a?(TrueClass)
       @opts[:price] = @opts[:price].to_sym if @opts[:price]
       @opts[:ean14] = @opts[:include]