Make sure we don't prefix File.join with an empty string - else it be…

…comes an absolute path
DimitriosLisenko · Sep 1, 2021 · 326c1e4 · 326c1e4
1 parent e828591
commit 326c1e4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/lib/fet/cli/generate/listening.rb b/lib/fet/cli/generate/listening.rb
@@ -11,7 +11,7 @@ def self.run(_global_options, options, _args)
             tempo: options[:tempo],
             degrees: options[:degrees],
             all_single_degree: options[:"all-single-degree"],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

diff --git a/lib/fet/cli/generate/singing.rb b/lib/fet/cli/generate/singing.rb
@@ -9,7 +9,7 @@ def self.run(_global_options, options, _args)
           Fet::Generator::Singing.new(
             tempo: options[:tempo],
             pause: options[:pause],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

diff --git a/lib/fet/cli/generate/single_note_listening.rb b/lib/fet/cli/generate/single_note_listening.rb
@@ -8,7 +8,7 @@ module SingleNoteListening
         def self.run(_global_options, options, _args)
           Fet::Generator::SingleNoteListening.new(
             tempo: options[:tempo],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

diff --git a/lib/fet/generator/listening.rb b/lib/fet/generator/listening.rb
@@ -85,7 +85,7 @@ def generate_midi_info(key_type, root, chosen_notes)
       end
 
       def full_filename(key_type, root, chosen_notes)
-        result = File.join(directory_prefix, "listening", key_type)
+        result = File.join(*[directory_prefix, "listening", key_type].reject(&:empty?))
         filename = root[0].to_s # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter

diff --git a/lib/fet/generator/singing.rb b/lib/fet/generator/singing.rb
@@ -59,7 +59,7 @@ def generate_midi_info(key_type, root_note_name, root_midi_value, note_midi_valu
       end
 
       def full_filename(key_type, root_note_name, root_midi_value, note_midi_value)
-        result = File.join(directory_prefix, "singing", key_type)
+        result = File.join(*[directory_prefix, "singing", key_type].reject(&:empty?))
         filename = root_note_name # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter

diff --git a/lib/fet/generator/single_note_listening.rb b/lib/fet/generator/single_note_listening.rb
@@ -47,7 +47,7 @@ def generate_midi_info(key_type, root_note_name, root_midi_value)
       end
 
       def full_filename(key_type, root_note_name, root_midi_value)
-        result = File.join(directory_prefix, "listening_single_note", key_type)
+        result = File.join(*[directory_prefix, "listening_single_note", key_type].reject(&:empty?))
         filename = root_note_name # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter