Merge pull request #2276 from seek4science/fix-tarbz2

Fix tarbz2

Author: stuzart

.github/workflows/tests.yml

@@ -61,7 +61,7 @@ jobs:
           sudo apt install -y software-properties-common
           sudo add-apt-repository ppa:deadsnakes/ppa
           sudo apt update
-          sudo apt install -y graphicsmagick graphviz libcurl4-gnutls-dev libreoffice poppler-utils build-essential \
+          sudo apt install -y libmagick++-dev graphviz libcurl4-gnutls-dev libreoffice poppler-utils build-essential \
             git imagemagick libgmp-dev python3.9-dev python3.9-distutils python3-pip
       - name: Checkout code
         uses: actions/checkout@v4

lib/seek/content_type_detection.rb

@@ -56,7 +56,7 @@ def is_extractable_spreadsheet?(blob = self)
 
     # is any zipped format, that can be extracted from
     def is_unzippable_datafile?(blob = self)
-      blob.file_exists? && (is_zip?(blob)|| is_tar?(blob) || is_tgz?(blob) || is_tbz?(blob) || is_7zip?(blob) || is_txz?(blob))
+      blob.file_exists? && (is_zip?(blob)|| is_tar?(blob) || is_tgz?(blob) || is_tbz2?(blob) || is_7zip?(blob) || is_txz?(blob))
     end
 
     def is_in_simulatable_size_limit?(blob = self)
@@ -79,8 +79,8 @@ def is_tgz?(blob = self)
       blob.content_type_file_extensions.include?('tgz')
     end
 
-    def is_tbz?(blob = self)
-      blob.content_type_file_extensions.include?('tbz')
+    def is_tbz2?(blob = self)
+      blob.content_type_file_extensions.include?('tbz2')
     end
 
     def is_txz?(blob = self)

lib/seek/data_files/unzip.rb

@@ -11,8 +11,8 @@ def unzip(tmp_dir)
             unzip_zip(tmp_dir)
           elsif content_blob.is_tgz?
             unzip_tgz(tmp_dir)
-          elsif content_blob.is_tbz?
-            unzip_tbz(tmp_dir)
+          elsif content_blob.is_tbz2?
+            unzip_tbz2(tmp_dir)
           elsif content_blob.is_txz?
             unzip_txz(tmp_dir)
           elsif content_blob.is_tar?
@@ -35,7 +35,7 @@ def unzip_tar(tmp_dir, input = content_blob.filepath)
             Minitar.unpack(input, tmp_dir)
         end
 
-        def unzip_tbz(tmp_dir)
+        def unzip_tbz2(tmp_dir)
           Tempfile.create('decompressed_tar') do |temp_tar|
             Bzip2::FFI::Reader.open(content_blob.filepath) do |reader|
               IO.copy_stream(reader, temp_tar)