Add option to either compress zip file or not

Author: minhqdao

src/stdlib_io_np.fypp

@@ -135,7 +135,7 @@ module stdlib_io_np
     !> Save multidimensional arrays to a compressed or an uncompressed npz file.
     !> ([Specification](../page/specs/stdlib_io.html#save_npz))
     interface save_npz
-        module subroutine save_npz_from_arrays(filename, arrays, iostat, iomsg, compressed)
+        module subroutine save_arrays_to_npz(filename, arrays, iostat, iomsg, compressed)
             character(len=*), intent(in) :: filename
             type(t_array_wrapper), intent(in) :: arrays(:)
             integer, intent(out), optional :: iostat

src/stdlib_io_np_save.fypp

@@ -196,7 +196,7 @@ contains
     !>
     !> Save multidimensional arrays to a compressed or an uncompressed npz file.
     !> ([Specification](../page/specs/stdlib_io.html#save_npz))
-    module subroutine save_npz_from_arrays(filename, arrays, iostat, iomsg, compressed)
+    module subroutine save_arrays_to_npz(filename, arrays, iostat, iomsg, compressed)
         character(len=*), intent(in) :: filename
         type(t_array_wrapper), intent(in) :: arrays(:)
         integer, intent(out), optional :: iostat
@@ -252,7 +252,7 @@ contains
             end select
         end do
 
-        call zip(filename, files, stat, msg)
+        call zip(filename, files, stat, msg, is_compressed)
         if (stat /= 0) then
             if (present(iostat)) iostat = stat
             if (present(iomsg)) iomsg = msg

src/stdlib_io_zip.f90

@@ -12,18 +12,26 @@ module stdlib_io_zip
 
 contains
 
-    subroutine zip(output_file, files, stat, msg)
+    subroutine zip(output_file, files, stat, msg, compressed)
         character(*), intent(in) :: output_file
         type(string_type), intent(in) :: files(:)
         integer, intent(out), optional :: stat
         character(len=:), allocatable, intent(out), optional :: msg
+        logical, intent(in), optional :: compressed
 
         integer :: run_stat, i
-        character(:), allocatable :: files_str
+        character(:), allocatable :: files_str, cmd
+        logical :: is_compressed
 
         if (present(stat)) stat = 0
         run_stat = 0
 
+        if (present(compressed)) then
+            is_compressed = compressed
+        else
+            is_compressed = .true.
+        end if
+
         if (trim(output_file) == '') then
             if (present(stat)) stat = 1
             if (present(msg)) msg = "Output file is empty."
@@ -35,7 +43,10 @@ subroutine zip(output_file, files, stat, msg)
             files_str = files_str//' '//char(files(i))
         end do
 
-        call run('zip '//output_file//files_str, run_stat)
+        cmd = 'zip '//''//output_file//' '//files_str
+        if (.not. is_compressed) cmd = cmd//' -0'
+
+        call run(cmd, run_stat)
         if (run_stat /= 0) then
             if (present(stat)) stat = run_stat
             if (present(msg)) msg = "Error creating zip file '"//output_file//"'."

test/io/test_np.f90

@@ -1078,25 +1078,6 @@ subroutine npz_add_arr_duplicate_names(error)
         call check(error, stat, "Adding a second array with the same name shouldn't work.")
     end
 
-    ! subroutine npz_add_arr(error)
-    !     type(error_type), allocatable, intent(out) :: error
-
-    !     type(t_array_wrapper), allocatable :: arrays(:)
-    !     integer :: stat
-    !     character(*), parameter :: filename = "npz_add_arr.npz"
-    !     real(dp), allocatable :: input_array(:,:)
-
-    !     allocate(input_array(10, 4))
-    !     call random_number(input_array)
-    !     call add_array(arrays, input_array, stat)
-    !     call check(error, stat, "Error adding an array to the list of arrays.")
-    !     if (allocated(error)) return
-    !     call check(error, size(arrays) == 1, "Array was not added to the list of arrays.")
-    !     if (allocated(error)) return
-    !     call check(error, arrays(1)%array%name == "arr_0.npy", "Wrong array name.")
-    !     if (allocated(error)) return
-    ! end
-
     subroutine npz_save_empty_array_input(error)
         type(error_type), allocatable, intent(out) :: error
 

test/io/test_zip.f90

@@ -1,7 +1,8 @@
 module test_zip
+    use stdlib_filesystem, only: exists
     use stdlib_io_zip
-    use stdlib_string_type, only : string_type, char
-    use testdrive, only : new_unittest, unittest_type, error_type, check, test_failed
+    use stdlib_string_type, only: string_type, char
+    use testdrive, only: new_unittest, unittest_type, error_type, check, test_failed
     implicit none
     private
 
@@ -28,7 +29,8 @@ subroutine collect_zip(testsuite)
             new_unittest("zip_invalid_file", zip_invalid_file, should_fail=.true.), &
             new_unittest("zip_empty_file", zip_empty_file), &
             new_unittest("zip_invalid_output_file", zip_invalid_output_file, should_fail=.true.), &
-            new_unittest("zip_two_files", zip_two_files) &
+            new_unittest("zip_two_files", zip_two_files), &
+            new_unittest("zip_without_comp", zip_without_comp) &
             ]
     end
 
@@ -199,6 +201,13 @@ subroutine zip_empty_file(error)
 
         call zip(output_file, files, stat)
         call check(error, stat, "Compressing a valid empty file should not fail.")
+        if (allocated(error)) then
+            call delete_file(input_file)
+            call delete_file(output_file)
+            return
+        end if
+
+        call check(error, exists(output_file), "The output file should exist.")
 
         call delete_file(input_file)
         call delete_file(output_file)
@@ -241,12 +250,48 @@ subroutine zip_two_files(error)
 
         call zip(output_file, files, stat)
         call check(error, stat, "Compressing two valid files should not fail.")
+        if (allocated(error)) then
+            call delete_file(input_file_1)
+            call delete_file(input_file_2)
+            call delete_file(output_file)
+            return
+        end if
+
+        call check(error, exists(output_file), "The output file should exist.")
 
         call delete_file(input_file_1)
         call delete_file(input_file_2)
         call delete_file(output_file)
     end
 
+
+    subroutine zip_without_comp(error)
+        type(error_type), allocatable, intent(out) :: error
+
+        integer :: stat, unit
+        character(*), parameter :: output_file = "temp.zip"
+        character(*), parameter :: input_file = "abc.txt"
+        type(string_type), allocatable :: files(:)
+
+        files = [string_type(input_file)]
+
+        open(newunit= unit, file=input_file)
+        close(unit)
+
+        call zip(output_file, files, stat, compressed=.false.)
+        call check(error, stat, "Zipping a valid file without compression shouldn't fail.")
+        if (allocated(error)) then
+            call delete_file(input_file)
+            call delete_file(output_file)
+            return
+        end if
+
+        call check(error, exists(output_file), "The output file should exist.")
+
+        call delete_file(input_file)
+        call delete_file(output_file)
+    end
+
     !> Makes sure that we find the file when running both `ctest` and `fpm test`.
     function get_path(file) result(path)
         character(*), intent(in) :: file