mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

szip: run vfmt, refactor test

Browse Source
This commit is contained in:
Delyan Angelov 2021-04-02 08:26:14 +03:00
parent 55c8e6d1cc
commit 5ac9e39d44
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/szip/szip.v
View File

@ -203,7 +203,6 @@ pub fn (mut zentry Zip) extract_entry(path string) ? {
}
}
// extract zip file to directory
pub fn extract_zip_to_dir(file string, dir string) ?bool {
if C.access(dir.str, 0) == -1 {
@ -215,19 +214,17 @@ pub fn extract_zip_to_dir(file string, dir string) ?bool {
// zip files (full path) to zip file
pub fn zip_files(path_to_file []string, path_to_export_zip string) ? {
// open or create new zip
mut zip := szip.open(path_to_export_zip, .no_compression, .write) or { panic(err) }
mut zip := open(path_to_export_zip, .no_compression, .write) or { panic(err) }
// add all files from the directory to the archive
for file in path_to_file {
// add file to zip
zip.open_entry(os.base(file)) or { panic(err) }
file_as_byte := os.read_bytes(file) or { panic(err) }
zip.write_entry(file_as_byte) or { panic(err) }
zip.write_entry(file_as_byte) or { panic(err) }
zip.close_entry()
zip.close_entry()
}
// close zip
@ -237,7 +234,6 @@ pub fn zip_files(path_to_file []string, path_to_export_zip string) ? {
}
/*
TODO add
// zip all files in directory to zip file
pub fn zip_folder(path_to_dir string, path_to_export_zip string) {

60
vlib/szip/szip_test.v
View File

@ -1,37 +1,37 @@
import szip
import os
fn test_szip() {
const (
test_out_zip = 'v_test_zip.zip'
test_path = 'zip files'
fpath1 = os.join_path(test_path, 'file_1.txt')
fpath2 = os.join_path(test_path, 'file_2.txt')
)
// create temp files for zip/unzip test
test_path := 'zip files'
test_out_zip := 'v_test_zip.zip'
os.mkdir(test_path) or { panic(err) }
os.write_file(test_path + os.path_separator + 'file_1.txt', 'file one') or { panic(err) }
os.write_file(test_path + os.path_separator + 'file_2.txt', 'file file two') or { panic(err) }
fn test_szip_create_temp_files() ? {
os.chdir(os.temp_dir())
os.rmdir_all(test_path) or {}
os.mkdir(test_path) ?
os.write_file(fpath1, 'file one') ?
os.write_file(fpath2, 'file two') ?
assert os.exists(fpath1)
assert os.exists(fpath2)
}
// get list files from directory
mut files := os.ls(test_path) or { panic(err) }
for mut file in files {
file = os.getwd() + os.path_separator + test_path + os.path_separator + *file
}
// zip files
szip.zip_files(files, test_out_zip) or { panic(err) }
fn test_zipping_files() ? {
files := (os.ls(test_path) ?).map(os.join_path(test_path, it))
szip.zip_files(files, test_out_zip) ?
assert os.exists(test_out_zip)
}
// remove files before next test
os.rm(test_path + os.path_separator + 'file_1.txt') or { panic(err) }
os.rm(test_path + os.path_separator + 'file_2.txt') or { panic(err) }
// extract test
szip.extract_zip_to_dir(test_out_zip, test_path) or { panic(err) }
assert os.exists(test_path + os.path_separator + 'file_1.txt')
assert os.exists(test_path + os.path_separator + 'file_2.txt')
// clear temp files
// remove temp files and dir
os.rmdir_all (test_path) or { panic(err) }
os.rm(test_out_zip) or { }
}
fn test_extract_zipped_files() ? {
os.rm(fpath1) ?
os.rm(fpath2) ?
szip.extract_zip_to_dir(test_out_zip, test_path) ?
assert os.exists(fpath1)
assert os.exists(fpath2)
assert (os.read_file(fpath1) ?) == 'file one'
assert (os.read_file(fpath2) ?) == 'file two'
os.rmdir_all(test_path) ?
os.rm(test_out_zip) or {}
}