core: Re-unify on one OSTREE_OBJECT_TYPE_FILE
Having the archived vs not distinction in the object system wasn't useful in light of pack files. In fact, we should probably move towards generating a pack file per commit by default.
This commit is contained in:
Colin Walters committed
1 parent
f15c184584
commit
38ef75e6e0
22 files changed
+1062
-805
No files matched your search
@@ -0,0 +1,210 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
|
||||
*
|
||||
* Copyright (C) 2011 Colin Walters <walters@verbum.org>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General
|
||||
* Public License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
|
||||
#include <gio/gio.h>
|
||||
#include "ostree-chain-input-stream.h"
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_STREAMS
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (OstreeChainInputStream, ostree_chain_input_stream, G_TYPE_INPUT_STREAM)
|
||||
|
||||
struct _OstreeChainInputStreamPrivate {
|
||||
GPtrArray *streams;
|
||||
guint index;
|
||||
};
|
||||
|
||||
static void ostree_chain_input_stream_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static void ostree_chain_input_stream_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static void ostree_chain_input_stream_finalize (GObject *object);
|
||||
static gssize ostree_chain_input_stream_read (GInputStream *stream,
|
||||
void *buffer,
|
||||
gsize count,
|
||||
GCancellable *cancellable,
|
||||
GError **error);
|
||||
static gboolean ostree_chain_input_stream_close (GInputStream *stream,
|
||||
GCancellable *cancellable,
|
||||
GError **error);
|
||||
|
||||
static void
|
||||
ostree_chain_input_stream_class_init (OstreeChainInputStreamClass *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
|
||||
|
||||
g_type_class_add_private (klass, sizeof (OstreeChainInputStreamPrivate));
|
||||
|
||||
gobject_class->get_property = ostree_chain_input_stream_get_property;
|
||||
gobject_class->set_property = ostree_chain_input_stream_set_property;
|
||||
gobject_class->finalize = ostree_chain_input_stream_finalize;
|
||||
|
||||
stream_class->read_fn = ostree_chain_input_stream_read;
|
||||
stream_class->close_fn = ostree_chain_input_stream_close;
|
||||
|
||||
/**
|
||||
* OstreeChainInputStream:streams: (element-type GInputStream)
|
||||
*
|
||||
* Chain of input streams read in order.
|
||||
*/
|
||||
g_object_class_install_property (gobject_class,
|
||||
PROP_STREAMS,
|
||||
g_param_spec_pointer ("streams",
|
||||
"", "",
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
ostree_chain_input_stream_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
OstreeChainInputStream *self;
|
||||
|
||||
self = OSTREE_CHAIN_INPUT_STREAM (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_STREAMS:
|
||||
self->priv->streams = g_ptr_array_ref (g_value_get_pointer (value));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
ostree_chain_input_stream_get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
OstreeChainInputStream *self;
|
||||
|
||||
self = OSTREE_CHAIN_INPUT_STREAM (object);
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_STREAMS:
|
||||
g_value_set_pointer (value, self->priv->streams);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
ostree_chain_input_stream_finalize (GObject *object)
|
||||
{
|
||||
OstreeChainInputStream *stream;
|
||||
|
||||
stream = (OstreeChainInputStream*)(object);
|
||||
|
||||
g_ptr_array_unref (stream->priv->streams);
|
||||
|
||||
G_OBJECT_CLASS (ostree_chain_input_stream_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
ostree_chain_input_stream_init (OstreeChainInputStream *self)
|
||||
{
|
||||
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
|
||||
OSTREE_TYPE_CHAIN_INPUT_STREAM,
|
||||
OstreeChainInputStreamPrivate);
|
||||
|
||||
}
|
||||
|
||||
OstreeChainInputStream *
|
||||
ostree_chain_input_stream_new (GPtrArray *streams)
|
||||
{
|
||||
OstreeChainInputStream *stream;
|
||||
|
||||
stream = g_object_new (OSTREE_TYPE_CHAIN_INPUT_STREAM,
|
||||
"streams", streams,
|
||||
NULL);
|
||||
|
||||
return (OstreeChainInputStream*) (stream);
|
||||
}
|
||||
|
||||
static gssize
|
||||
ostree_chain_input_stream_read (GInputStream *stream,
|
||||
void *buffer,
|
||||
gsize count,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
OstreeChainInputStream *self = (OstreeChainInputStream*) stream;
|
||||
GInputStream *child;
|
||||
gssize res = -1;
|
||||
|
||||
if (g_cancellable_set_error_if_cancelled (cancellable, error))
|
||||
return -1;
|
||||
|
||||
if (self->priv->index >= self->priv->streams->len)
|
||||
return 0;
|
||||
|
||||
child = self->priv->streams->pdata[self->priv->index];
|
||||
|
||||
res = g_input_stream_read (child,
|
||||
buffer,
|
||||
count,
|
||||
cancellable,
|
||||
error);
|
||||
if (res == 0)
|
||||
self->priv->index++;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
ostree_chain_input_stream_close (GInputStream *stream,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
OstreeChainInputStream *self = (gpointer)stream;
|
||||
guint i;
|
||||
|
||||
for (i = 0; i < self->priv->streams->len; i++)
|
||||
{
|
||||
GInputStream *child = self->priv->streams->pdata[i];
|
||||
if (!g_input_stream_close (child, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
Reference in new issue
Block a user