1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

szip: make compile (#6314)

This commit is contained in:
Enzo
2020-09-06 15:04:27 +02:00
committed by GitHub
parent 51d7d7cfae
commit 601d098b48
5 changed files with 303 additions and 152 deletions

View File

@ -1,32 +1,42 @@
module szip
#flag -I @VROOT/thirdparty/zip
#include "zip.c"
#include "zip.h"
type zip C.zip_t
type zip_ptr &zip
struct C.zip_t {}
type Zip C.zip_t
fn C.zip_open(byteptr, int, byte) &Zip
fn C.zip_close(&Zip)
fn C.zip_entry_open(&Zip, byteptr) int
fn C.zip_entry_close(&Zip) int
fn C.zip_entry_name(&Zip) byteptr
fn C.zip_entry_index(&Zip) int
fn C.zip_entry_isdir(&Zip) int
fn C.zip_entry_size(&Zip) u64
fn C.zip_entry_crc32(&Zip) u32
fn C.zip_entry_write(&Zip, voidptr, int) int
fn C.zip_entry_fwrite(&Zip, byteptr) int
fn C.zip_entry_read(&Zip, byteptr, int) int
fn C.zip_entry_fread(&Zip, byteptr) int
fn C.zip_total_entries(&Zip) int
// Ref - miniz.h
const (
no_compression = 0
best_speed = 1
best_compression = 9
uber_compression = 10
default_level = 6
default_compression = -1
)
// Ref - zip.h
const (
default_compression_level = (default_level)
no_compression = 0
best_speed = 1
best_compression = 9
uber_compression = 10
default_level = 6
default_compression = -1
)
const (
m_write = 'w'
m_ronly = 'r'
m_append = 'a'
m_write = `w`
m_ronly = `r`
m_append = `a`
)
/*
@ -40,34 +50,32 @@ open opens zip archive with compression level using the given mode.
- 'a': appends to an existing archive.
@return the zip archive handler or NULL on error
*/
pub fn open(name string, level int, mode string) ?zip_ptr {
mut _nlevel := level
if (_nlevel & 0xF) > uber_compression {
_nlevel = default_compression_level
}
n := name.len
if n == 0 {
return error('szip: name of file empty')
}
if mode != m_write && mode != m_ronly && mode != m_append {
return error('szip: invalid provided open mode')
}
/* struct zip_t* */_p_zip := zip_ptr(C.zip_open(name.str,
_nlevel, mode.str))
if _p_zip == zip_ptr(0) {
return error('szip: cannot open/create/append new zip archive')
}
return _p_zip
*/
pub fn open(name string, level int, mode byte) ?&Zip {
mut nlevel := level
if (nlevel & 0xF) > uber_compression {
nlevel = default_level
}
if name.len == 0 {
return error('szip: name of file empty')
}
if mode !in [m_write, m_ronly, m_append] {
return error('szip: invalid provided open mode')
}
p_zip := &Zip(C.zip_open(name.str, nlevel, mode))
if isnil(p_zip) {
return error('szip: cannot open/create/append new zip archive')
}
return p_zip
}
/*
close closes the zip archive, releases resources - always finalize.
@param zip zip archive handler.
*/
pub fn (mut z zip_ptr) close() {
C.zip_close(z)
*/
pub fn (mut z Zip) close() {
C.zip_close(z)
}
/*
@ -81,21 +89,23 @@ in global dictionary.
@param entryname an entry name in local dictionary.
@return the return code - 0 on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) open_entry(name string) /*?*/bool {
res := C.zip_entry_open(zentry, name.str)
return res != -1
*/
pub fn (mut zentry Zip) open_entry(name string) ? {
res := C.zip_entry_open(zentry, name.str)
if res == -1 {
return error('szip: cannot open archive entry')
}
}
/*
* close_entry closes a zip entry, flushes buffer and releases resources.
* close_entry closes a zip entry, flushes buffer and releases resources.
*
* @param zip zip archive handler.
*
* @return the return code - 0 on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) close_entry() {
C.zip_entry_close(zentry)
*/
pub fn (mut zentry Zip) close_entry() {
C.zip_entry_close(zentry)
}
/*
@ -111,13 +121,13 @@ for compatibility with Amiga and UNIX file systems etc.
@param zip: zip archive handler.
@return the pointer to the current zip entry name, or NULL on error.
*/
pub fn (mut zentry zip_ptr) name() string {
_name := C.zip_entry_name(zentry)
if _name == 0 {
return ''
}
return tos_clone(_name)
*/
pub fn (mut zentry Zip) name() string {
name := C.zip_entry_name(zentry)
if name == 0 {
return ''
}
return tos_clone(name)
}
/*
@ -126,13 +136,13 @@ index returns an index of the current zip entry.
@param zip zip archive handler.
@return the index on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) index() ?int {
_index := int(C.zip_entry_index(zentry))
if _index == -1 {
return error('szip: cannot get current index of zip entry')
}
return _index // must be check for INVALID_VALUE
*/
pub fn (mut zentry Zip) index() ?int {
index := int(C.zip_entry_index(zentry))
if index == -1 {
return error('szip: cannot get current index of zip entry')
}
return index // must be check for INVALID_VALUE
}
/*
@ -142,14 +152,13 @@ isdir determines if the current zip entry is a directory entry.
@return the return code - 1 (true), 0 (false), negative number (< 0) on
error.
*/
pub fn (mut zentry zip_ptr) isdir() ?bool {
_isdir := C.zip_entry_isdir(zentry)
if _isdir == -1 {
return error('szip: cannot check entry type')
}
dir := bool(_isdir) // wtf V , unary lvalue
return dir
*/
pub fn (mut zentry Zip) isdir() ?bool {
isdir := C.zip_entry_isdir(zentry)
if isdir < 0 {
return error('szip: cannot check entry type')
}
return isdir == 1
}
/*
@ -158,10 +167,9 @@ size returns an uncompressed size of the current zip entry.
@param zip zip archive handler.
@return the uncompressed size in bytes.
*/
pub fn (mut zentry zip_ptr) size() i64 {
_size := i64(C.zip_entry_size(zentry))
return _size
*/
pub fn (mut zentry Zip) size() u64 {
return C.zip_entry_size(zentry)
}
/*
@ -170,28 +178,29 @@ crc32 returns CRC-32 checksum of the current zip entry.
@param zip zip archive handler.
@return the CRC-32 checksum.
*/
pub fn (mut zentry zip_ptr) crc32() u32 {
_checksum := u32(C.zip_entry_crc32(zentry))
return _checksum // 0
*/
pub fn (mut zentry Zip) crc32() u32 {
return C.zip_entry_crc32(zentry)
}
/*
write_entry compresses an input buffer for the current zip entry.
write_entry compresses an input buffer for the current zip entry.
@param zip zip archive handler.
@param buf input buffer.
@param bufsize input buffer size (in bytes).
@return the return code - 0 on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) write_entry(data []byte) bool {
if (data[0] & 0xff) == -1 {
return false
}
buf := data // alias of data
res := C.zip_entry_write(zentry, buf.data, buf.len)
return res == 0
*/
pub fn (mut zentry Zip) write_entry(data []byte) ? {
if (data[0] & 0xff) == -1 {
return error('szip: cannot write entry')
}
buf := data // alias of data
res := C.zip_entry_write(zentry, buf.data, buf.len)
if res != 0 {
return error('szip: failed to write entry')
}
}
/*
@ -201,10 +210,12 @@ create_entry compresses a file for the current zip entry.
@param filename input file.
@return the return code - 0 on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) create_entry(name string) bool {
res := C.zip_entry_fwrite(zentry, name.str)
return res == 0
*/
pub fn (mut zentry Zip) create_entry(name string) ? {
res := C.zip_entry_fwrite(zentry, name.str)
if res != 0 {
return error('szip: failed to create entry')
}
}
/*
@ -221,15 +232,15 @@ for large entries, please take a look at zip_entry_extract function.
@return the return code - the number of bytes actually read on success.
Otherwise a -1 on error.
*/
pub fn (mut zentry zip_ptr) read_entry() ?voidptr {
mut _buf := voidptr(0)
mut _bsize := i64(0)
res := C.zip_entry_read(zentry, &_buf, &_bsize)
if res == -1 {
return error('szip: cannot read properly data from entry')
}
return _buf
*/
pub fn (mut zentry Zip) read_entry() ?voidptr {
mut buf := voidptr(0)
mut bsize := i64(0)
res := C.zip_entry_read(zentry, &buf, &bsize)
if res == -1 {
return error('szip: cannot read properly data from entry')
}
return buf
}
/*
@ -239,14 +250,15 @@ extract_entry extracts the current zip entry into output file.
@param filename output file.
@return the return code - 0 on success, negative number (< 0) on error.
*/
pub fn (mut zentry zip_ptr) extract_entry(path string) /*?*/bool {
if C.access(charptr(path.str), 0) == -1 {
return false
//return error('Cannot open file for extracting, file not exists')
}
res := C.zip_entry_fread(zentry, path.str)
return res == 0
*/
pub fn (mut zentry Zip) extract_entry(path string) ? {
if C.access(charptr(path.str), 0) == -1 {
return error('Cannot open file for extracting, file not exists')
}
res := C.zip_entry_fread(zentry, path.str)
if res != 0 {
return error('szip: failed to extract entry')
}
}
/*
@ -258,16 +270,17 @@ extract extracts the current zip entry using a callback function (on_extract).
on_extract callback)
@return the return code - 0 on success, negative number (< 0) on error.
*/
/*fn (mut zentry zip_ptr) extract(path string) bool {
*/
/*
fn (mut zentry Zip) extract(path string) bool {
if C.access(path.str, 0) == -1 {
return false
//return error('Cannot open directory for extracting, directory not exists')
}
res := C.zip_extract(zentry, path.str, 0, 0)
return res == 0
}*/
}
*/
/*
total returns the number of all entries (files and directories) in the zip archive.
@ -275,11 +288,11 @@ total returns the number of all entries (files and directories) in the zip archi
@return the return code - the number of entries on success, negative number
(< 0) on error.
*/
pub fn (mut zentry zip_ptr) total() ?int {
_tentry := int(C.zip_total_entries(zentry))
if _tentry == -1 {
return error('szip: cannot count total entries')
}
return _tentry
*/
pub fn (mut zentry Zip) total() ?int {
tentry := int(C.zip_total_entries(zentry))
if tentry == -1 {
return error('szip: cannot count total entries')
}
return tentry
}