luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-31 22:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add GZIP header processing to GZlibCompressor/GZlibDecompressor

Browse Source 
Add GZlibCompressor:file-info property. If it contains a non-NULL
GFileInfo, and the compressor is in GZIP mode, the filename and
modification time from the file info are written to the GZIP header
in the output data.

Add GZlibDeompressor:file-info property. If the decompressor is in GZIP
mode, and the GZIP data contains a GZIP header, the filename and
modification time are read from it, stored in a GFileInfo, and the
file-info property is notified.

Bug #617691.
This commit is contained in:
Christian Persch
2010-05-13 19:57:41 +02:00
parent b196cd7447
commit cae86073ea
7 changed files with 294 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
gio/gzlibcompressor.c
View File

@@ -28,6 +28,7 @@
#include <zlib.h>
#include <string.h>
#include "gfileinfo.h"
#include "gioerror.h"
#include "gioenums.h"
#include "gioenumtypes.h"
@@ -37,7 +38,8 @@
enum {
PROP_0,
PROP_FORMAT,
PROP_LEVEL
PROP_LEVEL,
PROP_FILE_INFO
};
/**
@@ -63,8 +65,34 @@ struct _GZlibCompressor
GZlibCompressorFormat format;
int level;
z_stream zstream;
gz_header gzheader;
GFileInfo *file_info;
};
static void
g_zlib_compressor_set_gzheader (GZlibCompressor *compressor)
{
const gchar *filename;
if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
compressor->file_info == NULL)
return;
memset (&compressor->gzheader, 0, sizeof (gz_header));
compressor->gzheader.os = 0x03; /* Unix */
filename = g_file_info_get_name (compressor->file_info);
compressor->gzheader.name = (Bytef *) filename;
compressor->gzheader.name_max = filename ? strlen (filename) + 1 : 0;
compressor->gzheader.time =
(uLong) g_file_info_get_attribute_uint64 (compressor->file_info,
G_FILE_ATTRIBUTE_TIME_MODIFIED);
if (deflateSetHeader (&compressor->zstream, &compressor->gzheader) != Z_OK)
g_warning ("unexpected zlib error: %s\n", compressor->zstream.msg);
}
G_DEFINE_TYPE_WITH_CODE (GZlibCompressor, g_zlib_compressor, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_CONVERTER,
g_zlib_compressor_iface_init))
@@ -78,6 +106,9 @@ g_zlib_compressor_finalize (GObject *object)
deflateEnd (&compressor->zstream);
if (compressor->file_info)
g_object_unref (compressor->file_info);
G_OBJECT_CLASS (g_zlib_compressor_parent_class)->finalize (object);
}
@@ -102,6 +133,10 @@ g_zlib_compressor_set_property (GObject *object,
compressor->level = g_value_get_int (value);
break;
case PROP_FILE_INFO:
g_zlib_compressor_set_file_info (compressor, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -129,6 +164,10 @@ g_zlib_compressor_get_property (GObject *object,
g_value_set_int (value, compressor->level);
break;
case PROP_FILE_INFO:
g_value_set_object (value, compressor->file_info);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -172,6 +211,8 @@ g_zlib_compressor_constructed (GObject *object)
if (res != Z_OK)
g_warning ("unexpected zlib error: %s\n", compressor->zstream.msg);
g_zlib_compressor_set_gzheader (compressor);
}
static void
@@ -203,6 +244,24 @@ g_zlib_compressor_class_init (GZlibCompressorClass *klass)
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
/**
* GZlibCompressor:file-info:
*
* If set to a non-%NULL #GFileInfo object, and #GZlibCompressor:format is
* %G_ZLIB_COMPRESSOR_FORMAT_GZIP, the compressor will write the file name
* and modification time from the file info to the the GZIP header.
*
* Since: 2.26
*/
g_object_class_install_property (gobject_class,
PROP_FILE_INFO,
g_param_spec_object ("file-info",
P_("file info"),
P_("File info"),
G_TYPE_FILE_INFO,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
}
/**
@@ -230,6 +289,59 @@ g_zlib_compressor_new (GZlibCompressorFormat format,
return compressor;
}
/**
* g_zlib_compressor_get_file_info:
* @compressor: a #GZlibCompressor
*
* Returns the #GZlibCompressor:file-info property.
*
* Returns: (transfer none): a #GFileInfo, or %NULL
*
* Since: 2.26
*/
GFileInfo *
g_zlib_compressor_get_file_info (GZlibCompressor *compressor)
{
g_return_val_if_fail (G_IS_ZLIB_COMPRESSOR (compressor), NULL);
return compressor->file_info;
}
/**
* g_zlib_compressor_set_file_info:
* @compressor: a #GZlibCompressor
* @file_info: (allow-none): a #GFileInfo
*
* Sets @file_info in @compressor. If non-%NULL, and @compressor's
* #GZlibCompressor:format property is %G_ZLIB_COMPRESSOR_FORMAT_GZIP,
* it will be used to set the file name and modification time in
* the GZIP header of the compressed data.
*
* Note: it is an error to call this function while a compression is in
* progress; it may only be called immediately after creation of @compressor,
* or after resetting it with g_converter_reset().
*
* Since: 2.26
*/
void
g_zlib_compressor_set_file_info (GZlibCompressor *compressor,
GFileInfo *file_info)
{
g_return_if_fail (G_IS_ZLIB_COMPRESSOR (compressor));
if (file_info == compressor->file_info)
return;
if (compressor->file_info)
g_object_unref (compressor->file_info);
if (file_info)
g_object_ref (file_info);
compressor->file_info = file_info;
g_object_notify (G_OBJECT (compressor), "file-info");
g_zlib_compressor_set_gzheader (compressor);
}
static void
g_zlib_compressor_reset (GConverter *converter)
{
@@ -239,6 +351,9 @@ g_zlib_compressor_reset (GConverter *converter)
res = deflateReset (&compressor->zstream);
if (res != Z_OK)
g_warning ("unexpected zlib error: %s\n", compressor->zstream.msg);
/* deflateReset reset the header too, so re-set it */
g_zlib_compressor_set_gzheader (compressor);
}
static GConverterResult