From 72538543aa10c5be692e4f44302c1037db06a421 Mon Sep 17 00:00:00 2001 From: Christer Fletcher Date: Tue, 18 Sep 2018 12:06:54 +0200 Subject: [PATCH 1/2] Add mz_zip_[reader,writer]_set_progress_interval With mz_zip_reader_set_progress_interval the user can specify how often in milliseconds the progress callback should be called. This makes it possible to make a smoother progress bar when using minizip from a GUI application. --- mz_os_posix.c | 23 +++++++++++++++++++++++ mz_os_posix.h | 2 ++ mz_os_win32.c | 10 ++++++++++ mz_os_win32.h | 2 ++ mz_zip_rw.c | 51 +++++++++++++++++++++++++++++++++------------------ mz_zip_rw.h | 10 ++++++++-- 6 files changed, 78 insertions(+), 20 deletions(-) diff --git a/mz_os_posix.c b/mz_os_posix.c index 7528bd8..6074eb1 100644 --- a/mz_os_posix.c +++ b/mz_os_posix.c @@ -33,6 +33,11 @@ # include #endif +#ifdef __APPLE__ +#include +#include +#endif + #include "mz.h" #include "mz_strm.h" #include "mz_os.h" @@ -260,3 +265,21 @@ int32_t mz_posix_is_dir(const char *path) return MZ_OK; return MZ_EXIST_ERROR; } + +uint64_t mz_posix_ms_time(void) { + struct timespec ts; + +#ifdef __APPLE__ + clock_serv_t cclock; + mach_timespec_t mts; + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); + clock_get_time(cclock, &mts); + mach_port_deallocate(mach_task_self(), cclock); + ts.tv_sec = mts.tv_sec; + ts.tv_nsec = mts.tv_nsec; +#else + clock_gettime(CLOCK_MONOTONIC, &ts); +#endif + + return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; +} diff --git a/mz_os_posix.h b/mz_os_posix.h index 9d693d9..f3a53c6 100644 --- a/mz_os_posix.h +++ b/mz_os_posix.h @@ -45,6 +45,7 @@ struct dirent* mz_posix_read_dir(DIR *dir); int32_t mz_posix_close_dir(DIR *dir); int32_t mz_posix_is_dir(const char *path); +uint64_t mz_posix_ms_time(void); /***************************************************************************/ @@ -62,6 +63,7 @@ int32_t mz_posix_is_dir(const char *path); #define mz_os_read_dir mz_posix_read_dir #define mz_os_close_dir mz_posix_close_dir #define mz_os_is_dir mz_posix_is_dir +#define mz_os_ms_time mz_posix_ms_time /***************************************************************************/ diff --git a/mz_os_win32.c b/mz_os_win32.c index 5a5fc47..8b6e9d3 100644 --- a/mz_os_win32.c +++ b/mz_os_win32.c @@ -381,3 +381,13 @@ int32_t mz_win32_is_dir(const char *path) return MZ_EXIST_ERROR; } + +uint64_t mz_win32_ms_time(void) { + SYSTEMTIME system_time; + GetSystemTime(&system_time); + + FILETIME file_time; + SystemTimeToFileTime(&system_time, &file_time); + + return ((((ULONGLONG) file_time.dwHighDateTime) << 32) + file_time.dwLowDateTime)/10000 - 11644473600000; +} diff --git a/mz_os_win32.h b/mz_os_win32.h index d4b7a4d..8caab50 100644 --- a/mz_os_win32.h +++ b/mz_os_win32.h @@ -46,6 +46,7 @@ struct dirent* mz_win32_read_dir(DIR *dir); int32_t mz_win32_close_dir(DIR *dir); int32_t mz_win32_is_dir(const char *path); +uint64_t mz_win32_ms_time(void); /***************************************************************************/ @@ -63,6 +64,7 @@ int32_t mz_win32_is_dir(const char *path); #define mz_os_read_dir mz_win32_read_dir #define mz_os_close_dir mz_win32_close_dir #define mz_os_is_dir mz_win32_is_dir +#define mz_os_ms_time mz_win32_ms_time /***************************************************************************/ diff --git a/mz_zip_rw.c b/mz_zip_rw.c index 1b327da..02593de 100644 --- a/mz_zip_rw.c +++ b/mz_zip_rw.c @@ -46,6 +46,7 @@ typedef struct mz_zip_reader_s { void *progress_userdata; mz_zip_reader_progress_cb progress_cb; + uint32_t progress_cb_interval_ms; void *entry_userdata; mz_zip_reader_entry_cb entry_cb; @@ -56,6 +57,8 @@ typedef struct mz_zip_reader_s { /***************************************************************************/ +#define DEFAULT_PROGRESS_INTERVAL 1000u + int32_t mz_zip_reader_is_open(void *handle) { mz_zip_reader *reader = (mz_zip_reader *)handle; @@ -413,8 +416,8 @@ int32_t mz_zip_reader_entry_save(void *handle, void *stream, mz_stream_write_cb int64_t update_pos = 0; int32_t err = MZ_OK; int32_t written = 0; - time_t current_time = time(NULL); - time_t update_time = 0; + uint64_t current_time = 0; + uint64_t update_time = 0; if (mz_zip_reader_is_open(reader) != MZ_OK) return MZ_PARAM_ERROR; @@ -436,9 +439,9 @@ int32_t mz_zip_reader_entry_save(void *handle, void *stream, mz_stream_write_cb if (written < 0) err = written; - // Every 1 second lets update the progress - current_time = time(NULL); - if (current_time > update_time) + // Update progress if enough time have passed + current_time = mz_os_ms_time(); + if (current_time - update_time > reader->progress_cb_interval_ms) { if (reader->progress_cb != NULL) reader->progress_cb(handle, reader->progress_userdata, reader->file_info, current_pos); @@ -513,7 +516,7 @@ int32_t mz_zip_reader_entry_save_file(void *handle, const char *path) if (err == MZ_OK) { // Set the time of the file that has been created - mz_os_set_file_date(path, reader->file_info->modified_date, + mz_os_set_file_date(path, reader->file_info->modified_date, reader->file_info->accessed_date, reader->file_info->creation_date); } @@ -544,7 +547,7 @@ int32_t mz_zip_reader_entry_save_buffer(void *handle, void *buf, int32_t len) if (len != (int32_t)reader->file_info->uncompressed_size) return MZ_PARAM_ERROR; - // Create a memory stream backed by our buffer and save to it + // Create a memory stream backed by our buffer and save to it mz_stream_mem_create(&mem_stream); mz_stream_mem_set_buffer(mem_stream, buf, len); @@ -672,6 +675,12 @@ void mz_zip_reader_set_progress_cb(void *handle, void *userdata, mz_zip_reader_p reader->progress_userdata = userdata; } +void mz_zip_reader_set_progress_interval(void *handle, uint32_t milliseconds) +{ + mz_zip_reader *reader = (mz_zip_reader *)handle; + reader->progress_cb_interval_ms = milliseconds; +} + void mz_zip_reader_set_entry_cb(void *handle, void *userdata, mz_zip_reader_entry_cb cb) { mz_zip_reader *reader = (mz_zip_reader *)handle; @@ -700,9 +709,9 @@ void *mz_zip_reader_create(void **handle) if (reader != NULL) { memset(reader, 0, sizeof(mz_zip_reader)); - } - if (reader != NULL) + reader->progress_cb_interval_ms = DEFAULT_PROGRESS_INTERVAL; *handle = reader; + } return reader; } @@ -739,6 +748,7 @@ typedef struct mz_zip_writer_s { void *progress_userdata; mz_zip_writer_progress_cb progress_cb; + uint32_t progress_cb_interval_ms; void *entry_userdata; mz_zip_writer_entry_cb entry_cb; @@ -1007,9 +1017,8 @@ int32_t mz_zip_writer_add(void *handle, void *stream, mz_stream_read_cb read_cb) int64_t update_pos = 0; int32_t err = MZ_OK; int32_t written = 0; - time_t current_time = time(NULL); - time_t update_time = 0; - + uint64_t current_time = 0; + uint64_t update_time = 0; // Update the progress at the beginning if (writer->progress_cb != NULL) @@ -1026,9 +1035,9 @@ int32_t mz_zip_writer_add(void *handle, void *stream, mz_stream_read_cb read_cb) if (written < 0) err = written; - // Every 1 second lets update the progress - current_time = time(NULL); - if (current_time > update_time) + // Update progress if enough time have passed + current_time = mz_os_ms_time(); + if (current_time - update_time > writer->progress_cb_interval_ms) { if (writer->progress_cb != NULL) writer->progress_cb(handle, writer->progress_userdata, &writer->file_info, current_pos); @@ -1124,7 +1133,7 @@ int32_t mz_zip_writer_add_file(void *handle, const char *path, const char *filen filename += 1; // Get information about the file on disk so we can store it in zip - + file_info.version_madeby = MZ_VERSION_MADEBY; file_info.compression_method = writer->compress_method; file_info.filename = filename; @@ -1336,6 +1345,11 @@ void mz_zip_writer_set_progress_cb(void *handle, void *userdata, mz_zip_writer_p writer->progress_userdata = userdata; } +void mz_zip_writer_set_progress_interval(void *handle, uint32_t milliseconds) { + mz_zip_writer *writer = (mz_zip_writer *)handle; + writer->progress_cb_interval_ms = milliseconds; +} + void mz_zip_writer_set_entry_cb(void *handle, void *userdata, mz_zip_writer_entry_cb cb) { mz_zip_writer *writer = (mz_zip_writer *)handle; @@ -1367,9 +1381,10 @@ void *mz_zip_writer_create(void **handle) writer->compress_method = MZ_COMPRESS_METHOD_DEFLATE; writer->compress_level = MZ_COMPRESS_LEVEL_BEST; - } - if (writer != NULL) + writer->progress_cb_interval_ms = DEFAULT_PROGRESS_INTERVAL; + *handle = writer; + } return writer; } diff --git a/mz_zip_rw.h b/mz_zip_rw.h index f787f0d..1f38aa5 100644 --- a/mz_zip_rw.h +++ b/mz_zip_rw.h @@ -119,6 +119,9 @@ void mz_zip_reader_set_password_cb(void *handle, void *userdata, mz_zip_reade void mz_zip_reader_set_progress_cb(void *handle, void *userdata, mz_zip_reader_progress_cb cb); // Callback for extraction progress +void mz_zip_reader_set_progress_interval(void *handle, uint32_t milliseconds); +// Let at least milliseconds pass between calls to progress callback + void mz_zip_reader_set_entry_cb(void *handle, void *userdata, mz_zip_reader_entry_cb cb); // Callback for zip file entries @@ -161,7 +164,7 @@ int32_t mz_zip_writer_entry_open(void *handle, mz_zip_file *file_info); // Opens an entry in the zip file for writing int32_t mz_zip_writer_entry_close(void *handle); -// Closes entry in zip file +// Closes entry in zip file int32_t mz_zip_writer_entry_write(void *handle, const void *buf, int32_t len); // Writes data into entry for zip @@ -187,7 +190,7 @@ int32_t mz_zip_writer_add_path(void *handle, const char *path, const char *root_ // Enumerates a directory or pattern and adds entries to the zip int32_t mz_zip_writer_copy_from_reader(void *handle, void *reader); -// Adds an entry from a zip reader instance +// Adds an entry from a zip reader instance /***************************************************************************/ @@ -218,6 +221,9 @@ void mz_zip_writer_set_password_cb(void *handle, void *userdata, mz_zip_write void mz_zip_writer_set_progress_cb(void *handle, void *userdata, mz_zip_writer_progress_cb cb); // Callback for compression progress +void mz_zip_writer_set_progress_interval(void *handle, uint32_t milliseconds); +// Let at least milliseconds pass between calls to progress callback + void mz_zip_writer_set_entry_cb(void *handle, void *userdata, mz_zip_writer_entry_cb cb); // Callback for zip file entries From 5469018dbc6509f2ed0781c21d489f524f44e332 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Tue, 18 Sep 2018 20:25:48 -0700 Subject: [PATCH 2/2] Fixed formatting. --- mz_os_posix.c | 13 ++++++++----- mz_os_posix.h | 28 ++++++++++++++-------------- mz_os_win32.c | 13 +++++++++---- mz_os_win32.h | 28 ++++++++++++++-------------- mz_zip_rw.c | 14 ++++++++------ 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/mz_os_posix.c b/mz_os_posix.c index 6074eb1..a0fd704 100644 --- a/mz_os_posix.c +++ b/mz_os_posix.c @@ -20,14 +20,14 @@ #ifdef HAVE_GETRANDOM # include #endif -#if defined unix || defined __APPLE__ +#if defined(unix) || defined(__APPLE__) # include # include # define HAVE_ARC4RANDOM_BUF #endif -#if defined(HAVE_LIBBSD) && \ - !defined(MZ_ZIP_NO_COMPRESSION) && \ - !defined(MZ_ZIP_NO_ENCRYPTION) +#if defined(HAVE_LIBBSD) && \ + !defined(MZ_ZIP_NO_COMPRESSION) && \ + !defined(MZ_ZIP_NO_ENCRYPTION) # include // arc4random_buf #else # include @@ -266,15 +266,18 @@ int32_t mz_posix_is_dir(const char *path) return MZ_EXIST_ERROR; } -uint64_t mz_posix_ms_time(void) { +uint64_t mz_posix_ms_time(void) +{ struct timespec ts; #ifdef __APPLE__ clock_serv_t cclock; mach_timespec_t mts; + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); clock_get_time(cclock, &mts); mach_port_deallocate(mach_task_self(), cclock); + ts.tv_sec = mts.tv_sec; ts.tv_nsec = mts.tv_nsec; #else diff --git a/mz_os_posix.h b/mz_os_posix.h index f3a53c6..16864c5 100644 --- a/mz_os_posix.h +++ b/mz_os_posix.h @@ -30,21 +30,21 @@ extern "C" { /***************************************************************************/ -int32_t mz_posix_rand(uint8_t *buf, int32_t size); -int32_t mz_posix_rename(const char *source_path, const char *target_path); -int32_t mz_posix_delete(const char *path); -int32_t mz_posix_file_exists(const char *path); -int64_t mz_posix_get_file_size(const char *path); -int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date); -int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date); -int32_t mz_posix_get_file_attribs(const char *path, uint32_t *attributes); -int32_t mz_posix_set_file_attribs(const char *path, uint32_t attributes); -int32_t mz_posix_make_dir(const char *path); -DIR* mz_posix_open_dir(const char *path); +int32_t mz_posix_rand(uint8_t *buf, int32_t size); +int32_t mz_posix_rename(const char *source_path, const char *target_path); +int32_t mz_posix_delete(const char *path); +int32_t mz_posix_file_exists(const char *path); +int64_t mz_posix_get_file_size(const char *path); +int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date); +int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date); +int32_t mz_posix_get_file_attribs(const char *path, uint32_t *attributes); +int32_t mz_posix_set_file_attribs(const char *path, uint32_t attributes); +int32_t mz_posix_make_dir(const char *path); +DIR* mz_posix_open_dir(const char *path); struct -dirent* mz_posix_read_dir(DIR *dir); -int32_t mz_posix_close_dir(DIR *dir); -int32_t mz_posix_is_dir(const char *path); +dirent* mz_posix_read_dir(DIR *dir); +int32_t mz_posix_close_dir(DIR *dir); +int32_t mz_posix_is_dir(const char *path); uint64_t mz_posix_ms_time(void); /***************************************************************************/ diff --git a/mz_os_win32.c b/mz_os_win32.c index 8b6e9d3..283a8ee 100644 --- a/mz_os_win32.c +++ b/mz_os_win32.c @@ -382,12 +382,17 @@ int32_t mz_win32_is_dir(const char *path) return MZ_EXIST_ERROR; } -uint64_t mz_win32_ms_time(void) { +uint64_t mz_win32_ms_time(void) +{ SYSTEMTIME system_time; - GetSystemTime(&system_time); - FILETIME file_time; + uint64_t quad_file_time = 0; + + GetSystemTime(&system_time); SystemTimeToFileTime(&system_time, &file_time); - return ((((ULONGLONG) file_time.dwHighDateTime) << 32) + file_time.dwLowDateTime)/10000 - 11644473600000; + quad_file_time = file_time.dwLowDateTime; + quad_file_time |= ((uint64_t)file_time.dwHighDateTime << 32); + + return quad_file_time / 10000 - 11644473600000LL; } diff --git a/mz_os_win32.h b/mz_os_win32.h index 8caab50..545930e 100644 --- a/mz_os_win32.h +++ b/mz_os_win32.h @@ -31,21 +31,21 @@ typedef void* DIR; /***************************************************************************/ -int32_t mz_win32_rand(uint8_t *buf, int32_t size); -int32_t mz_win32_rename(const char *source_path, const char *target_path); -int32_t mz_win32_delete(const char *path); -int32_t mz_win32_file_exists(const char *path); -int64_t mz_win32_get_file_size(const char *path); -int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date); -int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date); -int32_t mz_win32_get_file_attribs(const char *path, uint32_t *attributes); -int32_t mz_win32_set_file_attribs(const char *path, uint32_t attributes); -int32_t mz_win32_make_dir(const char *path); -DIR* mz_win32_open_dir(const char *path); +int32_t mz_win32_rand(uint8_t *buf, int32_t size); +int32_t mz_win32_rename(const char *source_path, const char *target_path); +int32_t mz_win32_delete(const char *path); +int32_t mz_win32_file_exists(const char *path); +int64_t mz_win32_get_file_size(const char *path); +int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date); +int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date); +int32_t mz_win32_get_file_attribs(const char *path, uint32_t *attributes); +int32_t mz_win32_set_file_attribs(const char *path, uint32_t attributes); +int32_t mz_win32_make_dir(const char *path); +DIR* mz_win32_open_dir(const char *path); struct -dirent* mz_win32_read_dir(DIR *dir); -int32_t mz_win32_close_dir(DIR *dir); -int32_t mz_win32_is_dir(const char *path); +dirent* mz_win32_read_dir(DIR *dir); +int32_t mz_win32_close_dir(DIR *dir); +int32_t mz_win32_is_dir(const char *path); uint64_t mz_win32_ms_time(void); /***************************************************************************/ diff --git a/mz_zip_rw.c b/mz_zip_rw.c index 02593de..89ab7a4 100644 --- a/mz_zip_rw.c +++ b/mz_zip_rw.c @@ -27,6 +27,10 @@ /***************************************************************************/ +#define MZ_DEFAULT_PROGRESS_INTERVAL (1000u) + +/***************************************************************************/ + typedef struct mz_zip_reader_s { void *zip_handle; void *file_stream; @@ -57,8 +61,6 @@ typedef struct mz_zip_reader_s { /***************************************************************************/ -#define DEFAULT_PROGRESS_INTERVAL 1000u - int32_t mz_zip_reader_is_open(void *handle) { mz_zip_reader *reader = (mz_zip_reader *)handle; @@ -441,7 +443,7 @@ int32_t mz_zip_reader_entry_save(void *handle, void *stream, mz_stream_write_cb // Update progress if enough time have passed current_time = mz_os_ms_time(); - if (current_time - update_time > reader->progress_cb_interval_ms) + if ((current_time - update_time) > reader->progress_cb_interval_ms) { if (reader->progress_cb != NULL) reader->progress_cb(handle, reader->progress_userdata, reader->file_info, current_pos); @@ -709,7 +711,7 @@ void *mz_zip_reader_create(void **handle) if (reader != NULL) { memset(reader, 0, sizeof(mz_zip_reader)); - reader->progress_cb_interval_ms = DEFAULT_PROGRESS_INTERVAL; + reader->progress_cb_interval_ms = MZ_DEFAULT_PROGRESS_INTERVAL; *handle = reader; } @@ -1037,7 +1039,7 @@ int32_t mz_zip_writer_add(void *handle, void *stream, mz_stream_read_cb read_cb) // Update progress if enough time have passed current_time = mz_os_ms_time(); - if (current_time - update_time > writer->progress_cb_interval_ms) + if ((current_time - update_time) > writer->progress_cb_interval_ms) { if (writer->progress_cb != NULL) writer->progress_cb(handle, writer->progress_userdata, &writer->file_info, current_pos); @@ -1381,7 +1383,7 @@ void *mz_zip_writer_create(void **handle) writer->compress_method = MZ_COMPRESS_METHOD_DEFLATE; writer->compress_level = MZ_COMPRESS_LEVEL_BEST; - writer->progress_cb_interval_ms = DEFAULT_PROGRESS_INTERVAL; + writer->progress_cb_interval_ms = MZ_DEFAULT_PROGRESS_INTERVAL; *handle = writer; }