FIX: Don't fail when there's no directory to strip

discourse · Oct 10, 2019 · fa66290 · fa66290 · discoursebot · Oct 10, 2019
1 parent c532668
commit fa66290
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/compression/strategy.rb b/lib/compression/strategy.rb
@@ -33,8 +33,10 @@ def decompress(dest_path, compressed_file_path, allow_non_root_folder: false)
     end
 
     def strip_directory(from, to, relative: false)
-      sanitized_from = sanitize_path(from)
-      sanitized_to = sanitize_path(to)
+      sanitized_from = sanitize_path(from) rescue nil
+      sanitized_to = sanitize_path(to) rescue nil
+      return unless sanitized_from && sanitized_to
+
       glob_path = relative ? "#{sanitized_from}/*/*" : "#{sanitized_from}/**"
       FileUtils.mv(Dir.glob(glob_path), sanitized_to) if File.directory?(sanitized_from)
     end