Changeset 3454

Timestamp:

03/04/08 12:53:34

Author:

pvanhoof

Message:

2008-03-04 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Introduction of TnySeekable?
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-stream.c (modified) (6 diffs)
• trunk/libtinymail-camel/tny-camel-stream.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-stream-camel.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-stream-camel.h (modified) (3 diffs)
• trunk/libtinymail-gnomevfs/tny-vfs-stream.c (modified) (9 diffs)
• trunk/libtinymail-gnomevfs/tny-vfs-stream.h (modified) (1 diff)
• trunk/libtinymail/Makefile.am (modified) (2 diffs)
• trunk/libtinymail/tny-fs-stream.c (modified) (11 diffs)
• trunk/libtinymail/tny-fs-stream.h (modified) (1 diff)
• trunk/libtinymail/tny-seekable.c (added)
• trunk/libtinymail/tny-seekable.h (added)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-text-buffer-stream.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-03-04  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Introduction of TnySeekable
+
-2008-03-03  Philip Van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/tny-camel-stream.c

@@ -129 +129 @@
-}
-
+static off_t 
+tny_camel_stream_seek (TnySeekable *self, off_t offset, int policy)
+{
+        TnyCamelStreamPriv *priv = TNY_CAMEL_STREAM_GET_PRIVATE (self);
+        if (CAMEL_IS_SEEKABLE_STREAM (priv->stream))
+                return camel_seekable_stream_seek ((CamelSeekableStream *) priv->stream, offset, (CamelStreamSeekPolicy) policy);
+        return -1;
+}
+
+
+static off_t
+tny_camel_stream_tell (TnySeekable *self)
+{
+        TnyCamelStreamPriv *priv = TNY_CAMEL_STREAM_GET_PRIVATE (self);
+        if (CAMEL_IS_SEEKABLE_STREAM (priv->stream))
+                return camel_seekable_stream_tell ((CamelSeekableStream *) priv->stream);
+        return -1;
+}
+
+static gint 
+tny_camel_stream_set_bounds (TnySeekable *self, off_t start, off_t end)
+{
+        TnyCamelStreamPriv *priv = TNY_CAMEL_STREAM_GET_PRIVATE (self);
+        if (CAMEL_IS_SEEKABLE_STREAM (priv->stream))
+                return camel_seekable_stream_set_bounds ((CamelSeekableStream *) priv->stream, start, end);
+        return -1;
+}
+
-
-/**
@@ -144 +172 @@
-
-        if (priv->stream)
-CAMEL_OBJECT (priv->stream)
+priv->stream
-
-        return priv->stream;
@@ -186 +214 @@
-tny_camel_stream_finalize (GObject *object)
-{
-       
-
-
-G_LIKELY (priv->stream)
-CAMEL_OBJECT (priv->stream)
+
+
+
+priv->stream
+priv->stream
-
-        (*parent_class->finalize) (object);
@@ -209 +237 @@
-        klass->reset= tny_camel_stream_reset;
-        klass->write_to_stream= tny_camel_stream_write_to_stream;
+
+        return;
+}
+
+
+
+static void
+tny_seekable_init (gpointer g, gpointer iface_data)
+{
+        TnySeekableIface *klass = (TnySeekableIface *)g;
+
+        klass->seek= tny_camel_stream_seek;
+        klass->tell= tny_camel_stream_tell;
+        klass->set_bounds= tny_camel_stream_set_bounds;
-
-        return;
@@ -271 +313 @@
-                };
-
+                static const GInterfaceInfo tny_seekable_info = 
+                {
+                  (GInterfaceInitFunc) tny_seekable_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (G_TYPE_OBJECT,
-                        "TnyCamelStream",
@@ -277 +326 @@
-                g_type_add_interface_static (type, TNY_TYPE_STREAM, 
-                        &tny_stream_info);
+
+                g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
+                        &tny_seekable_info);
+
-        }
-

trunk/libtinymail-camel/tny-camel-stream.h

@@ -24 +24 @@
-#include <glib-object.h>
-#include <tny-stream.h>
+#include <tny-seekable.h>
-
-#include <camel/camel-stream.h>

trunk/libtinymail-camel/tny-stream-camel.c

@@ -21 +21 @@
-
-#include <tny-stream-camel.h>
+#include <tny-camel-stream.h>
-#include <tny-camel-shared.h>
-
@@ -113 +114 @@
-}
-
+
+static off_t 
+tny_stream_camel_seek (CamelSeekableStream *stream, off_t offset, CamelStreamSeekPolicy policy)
+{
+        TnyStreamCamel *self = (TnyStreamCamel *)stream;
+        off_t retval = -1;
+
+        if (TNY_IS_SEEKABLE (self->stream))
+                retval = tny_seekable_seek ((TnySeekable *) self->stream, offset, (int) policy);
+
+        return retval;
+}
+
+static off_t 
+tny_stream_camel_tell (CamelSeekableStream *stream)
+{
+        TnyStreamCamel *self = (TnyStreamCamel *)stream;
+        off_t retval = -1;
+
+        if (TNY_IS_SEEKABLE (self->stream))
+                retval = tny_seekable_tell ((TnySeekable *) self->stream);
+
+        return retval;
+}
+
+int 
+tny_stream_camel_set_bouds (CamelSeekableStream *stream, off_t start, off_t end)
+{
+        TnyStreamCamel *self = (TnyStreamCamel *)stream;
+        int retval = -1;
+
+        if (TNY_IS_SEEKABLE (self->stream))
+                retval = tny_seekable_set_bounds ((TnySeekable *) self->stream, start, end);
+
+        return retval;
+}
+
-static void
-tny_stream_camel_init (CamelObject *object)
@@ -127 +165 @@
-        TnyStreamCamel *self = (TnyStreamCamel *)object;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-static void
@@ -145 +181 @@
-        ((CamelStreamClass *)klass)->reset = tny_stream_camel_reset;
-        ((CamelStreamClass *)klass)->flush = tny_stream_camel_flush;
+
+
+        ((CamelSeekableStreamClass *)klass)->seek = tny_stream_camel_seek;
+        ((CamelSeekableStreamClass *)klass)->tell = tny_stream_camel_tell;
+        ((CamelSeekableStreamClass *)klass)->set_bounds = tny_stream_camel_set_bouds;
-
-        return;

trunk/libtinymail-camel/tny-stream-camel.h

@@ -24 +24 @@
-#include <glib-object.h>
-#include <tny-stream.h>
+#include <tny-seekable.h>
-
-#include <camel/camel-seekable-stream.h>
+#include <camel/camel-seekable-substream.h>
-
-G_BEGIN_DECLS
@@ -41 +43 @@
-struct _TnyStreamCamel
-{
-
+eekableSubs
-
-        TnyStream *stream;
@@ -48 +50 @@
-struct _TnyStreamCamelClass 
-{
-
+eekableSubs
-};
-

trunk/libtinymail-gnomevfs/tny-vfs-stream.c

@@ -24 +24 @@
-#include <errno.h>
-
-#include <tny-stream.h>
-#include <tny-vfs-stream.h>
-
@@ -35 +34 @@
-        GnomeVFSHandle *handle;
-        gboolean eos;
+        off_t position;         /* current postion in the stream */
+        off_t bound_start;      /* first valid position */
+        off_t bound_end;        /* first invalid position */
-};
-
@@ -166 +168 @@
-{
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GnomeVFSResult res;
-
-
-
+
-                errno = EINVAL;
-                return -1;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        tny_vfs_stream_set_errno (res);
@@ -201 +231 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GnomeVFSResult res;
-
@@ -237 +330 @@
-        }
-
-        res = gnome_vfs_close (priv->handle);
-
-        priv->handle = NULL;
-        priv->eos = TRUE;
-    
-        if (res == GNOME_VFS_OK)
-                return 0;
-
-        tny_vfs_stream_set_errno (res);
-
-        return -1;
-}
-
-
-/**
- * tny_vfs_stream_set_handle:
- * @self: A #TnyVfsStream instance
- * @handle: The #GnomeVFSHandle to write to or read from
- *
- * Set the #GnomeVFSHandle to play adaptor for
- *
- **/
-void
-tny_vfs_stream_set_handle (TnyVfsStream *self, GnomeVFSHandle *handle)
-{
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
-        if (priv->handle)
-                gnome_vfs_close (priv->handle);
-
-        priv->handle = handle;
-        priv->eos = FALSE;
-    
-        return;
-}
-
-/**
- * tny_vfs_stream_new:
- * @handle: The #GnomeVFSHandle to write to or read from
- *
- * Create an adaptor instance between #TnyStream and #GnomeVFSHandle
- *
- * Return value: a new #TnyStream instance
- **/
-TnyStream*
-tny_vfs_stream_new (GnomeVFSHandle *handle)
-{
-        TnyVfsStream *self = g_object_new (TNY_TYPE_VFS_STREAM, NULL);
-
-        tny_vfs_stream_set_handle (self, handle);
-
-        return TNY_STREAM (self);
-}
-
-static void
-tny_vfs_stream_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-        TnyVfsStream *self = (TnyVfsStream *)instance;
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
-        priv->eos = FALSE;
-        priv->handle = NULL;
-
-        return;
-}
-
-static void
-tny_vfs_stream_finalize (GObject *object)
-{
-        TnyVfsStream *self = (TnyVfsStream *)object;    
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
-        if (G_LIKELY (priv->handle))
-                gnome_vfs_close (priv->handle);
-
-        (*parent_class->finalize) (object);
-
-        return;
-}
-
-static gint 
-tny_vfs_flush (TnyStream *self)
-{
-        return 0;
-}
-
-static gboolean 
-tny_vfs_is_eos (TnyStream *self)
-{
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
-        return priv->eos;
-}
-
-static gint 
-tny_vfs_reset (TnyStream *self)
-{
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-        gint retval = 0;
-        GnomeVFSResult res;
-
-        if (priv->handle == NULL) 
-        {
-                errno = EINVAL;
-                return -1;
-        }
-
-        res = gnome_vfs_seek (priv->handle, GNOME_VFS_SEEK_START, 0);
-
@@ -352 +338 @@
-        }
-        priv->eos = FALSE;
-
+
-        return retval;
+}
+
+
+
+static off_t 
+tny_vfs_seek (TnySeekable *self, off_t offset, int policy)
+{
+        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
+        GnomeVFSFileSize real = 0;
+        GnomeVFSResult result;
+        GnomeVFSHandle *handle = priv->handle;
+
+        switch (policy) {
+        case SEEK_SET:
+                real = offset;
+                break;
+        case SEEK_CUR:
+                real = priv->position + offset;
+                break;
+        case SEEK_END:
+                if (priv->bound_end == (~0)) {
+                        result = gnome_vfs_seek (handle, GNOME_VFS_SEEK_END, offset);
+                        if (result != GNOME_VFS_OK)
+                                return -1;
+                        gnome_vfs_tell (handle, &real);
+                        if (real != -1) {
+                                if (real<priv->bound_start)
+                                        real = priv->bound_start;
+                                priv->position = real;
+                        }
+                        return real;
+                }
+                real = priv->bound_end + offset;
+                break;
+        }
+
+        if (priv->bound_end != (~0))
+                real = MIN (real, priv->bound_end);
+        real = MAX (real, priv->bound_start);
+
+        result = gnome_vfs_seek (handle, GNOME_VFS_SEEK_START, real);
+        if (result != GNOME_VFS_OK)
+                return -1;
+
+        if (real != priv->position && priv->eos)
+                priv->eos = FALSE;
+
+        priv->position = real;
+
+        return real;
+}
+
+static off_t
+tny_vfs_tell (TnySeekable *self)
+{
+        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
+        return priv->position;
+}
+
+static gint 
+tny_vfs_set_bounds (TnySeekable *self, off_t start, off_t end)
+{
+        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
+        priv->bound_end = end;
+        priv->bound_start = start;
+        return;
-}
-
@@ -364 +416 @@
-        klass->flush= tny_vfs_flush;
-        klass->is_eos= tny_vfs_is_eos;
-
-        klass->read= tny_vfs_stream_read;
-        klass->write= tny_vfs_stream_write;
-        klass->close= tny_vfs_stream_close;
-        klass->write_to_stream= tny_vfs_stream_write_to_stream;
+
+        return;
+}
+
+
+static void
+tny_seekable_init (gpointer g, gpointer iface_data)
+{
+        TnySeekableIface *klass = (TnySeekableIface *)g;
+
+        klass->seek= tny_vfs_seek;
+        klass->tell= tny_vfs_tell;
+        klass->set_bounds= tny_vfs_set_bounds;
-
-        return;
@@ -416 +480 @@
-                };
-
+                static const GInterfaceInfo tny_seekable_info = 
+                {
+                  (GInterfaceInitFunc) tny_seekable_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (G_TYPE_OBJECT,
-                        "TnyVfsStream",
@@ -422 +493 @@
-                g_type_add_interface_static (type, TNY_TYPE_STREAM, 
-                        &tny_stream_info);
+
+                g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
+                        &tny_seekable_info);
+
-        }
-

trunk/libtinymail-gnomevfs/tny-vfs-stream.h

@@ -26 +26 @@
-
-#include <tny-stream.h>
+#include <tny-seekable.h>
-
-G_BEGIN_DECLS

trunk/libtinymail/Makefile.am

@@ -40 +40 @@
-        tny-account-store.h \
-        tny-stream.h \
+        tny-seekable.h \
-        tny-fs-stream.h \
-        tny-simple-list.h \
@@ -79 +80 @@
-        tny-account-store.c \
-        tny-stream.c \
+        tny-seekable.c \
-        tny-fs-stream.c \
-        tny-simple-list-priv.h \

trunk/libtinymail/tny-fs-stream.c

@@ -57 +57 @@
-#include <errno.h>
-
-#include <tny-stream.h>
-#include <tny-fs-stream.h>
-
@@ -67 +66 @@
-{
-        int fd;
-
+
+
+
-        gboolean eos;
-};
@@ -104 +105 @@
-}
-
+
-static gssize
- 
+
-{
-        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
-        gssize nread;
-
-
+
+
+
+
-        if ((nread = read (priv->fd, buffer, n)) > 0)
-offset
-if (nread != n
+position
+else if (nread == 0
-                priv->eos = TRUE;
-
-
-
-
+
-        return nread;
-
-}
-
@@ -128 +128 @@
-        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
-        gssize nwritten;
+
+        if (priv->bound_end != (~0))
+                n = MIN (priv->bound_end - priv->position, n);
+
-        if ((nwritten = write (priv->fd, buffer, n)) > 0)
-offset
-
+position
+
-        return nwritten;
-}
+
-
-static gint
@@ -164 +169 @@
-                close (priv->fd);
-        priv->fd = fd;
-
-
-
-
+
+
+
-        return;
-}
@@ -205 +209 @@
-        TnyFsStream *self = (TnyFsStream *)instance;
-        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
-
+
-        priv->fd = -1;
-
+
+
+
+
-        return;
-}
@@ -214 +221 @@
-tny_fs_stream_finalize (GObject *object)
-{
-     
+
-        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
-        if (priv->fd != -1) {
@@ -244 +251 @@
-{
-        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
-offset
+position
-        priv->eos = FALSE;
-        return 0;
-}
+
+static off_t 
+tny_fs_seek (TnySeekable *self, off_t offset, int policy)
+{
+        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
+        off_t real = 0;
+
+        switch (policy) {
+        case SEEK_SET:
+                real = offset;
+                break;
+        case SEEK_CUR:
+                real = priv->position + offset;
+                break;
+        case SEEK_END:
+                if (priv->bound_end == (~0)) {
+                        real = lseek(priv->fd, offset, SEEK_END);
+                        if (real != -1) {
+                                if (real<priv->bound_start)
+                                        real = priv->bound_start;
+                                priv->position = real;
+                        }
+                        return real;
+                }
+                real = priv->bound_end + offset;
+                break;
+        }
+
+        if (priv->bound_end != (~0))
+                real = MIN (real, priv->bound_end);
+        real = MAX (real, priv->bound_start);
+
+        real = lseek(priv->fd, real, SEEK_SET);
+        if (real == -1)
+                return -1;
+
+        if (real != priv->position && priv->eos)
+                priv->eos = FALSE;
+
+        priv->position = real;
+
+        return real;
+}
+
+static off_t
+tny_fs_tell (TnySeekable *self)
+{
+        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
+        return priv->position;
+}
+
+static gint 
+tny_fs_set_bounds (TnySeekable *self, off_t start, off_t end)
+{
+        TnyFsStreamPriv *priv = TNY_FS_STREAM_GET_PRIVATE (self);
+        priv->bound_end = end;
+        priv->bound_start = start;
+        return;
+}
+
-
-static void
@@ -261 +328 @@
-        klass->close= tny_fs_stream_close;
-        klass->write_to_stream= tny_fs_stream_write_to_stream;
+
+        return;
+}
+
+static void
+tny_seekable_init (gpointer g, gpointer iface_data)
+{
+        TnySeekableIface *klass = (TnySeekableIface *)g;
+
+        klass->seek= tny_fs_seek;
+        klass->tell= tny_fs_tell;
+        klass->set_bounds= tny_fs_set_bounds;
-
-        return;
@@ -306 +385 @@
-                };
-
+                static const GInterfaceInfo tny_seekable_info = 
+                {
+                  (GInterfaceInitFunc) tny_seekable_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (G_TYPE_OBJECT,
-                        "TnyFsStream",
@@ -312 +398 @@
-                g_type_add_interface_static (type, TNY_TYPE_STREAM, 
-                        &tny_stream_info);
+
+                g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
+                        &tny_seekable_info);
+
-        }
-

trunk/libtinymail/tny-fs-stream.h

@@ -29 +29 @@
-
-#include <tny-stream.h>
+#include <tny-seekable.h>
-
-G_BEGIN_DECLS

trunk/libtinymail/tny-shared.h

@@ -103 +103 @@
-typedef struct _TnyConnectionPolicy TnyConnectionPolicy;
-typedef struct _TnyConnectionPolicyIface TnyConnectionPolicyIface;
+typedef struct _TnySeekable TnySeekable;
+typedef struct _TnySeekableIface TnySeekableIface;
+
-
-typedef void (*TnyStatusCallback) (GObject *self, TnyStatus *status, gpointer user_data);

trunk/libtinymailui-gtk/tny-gtk-text-buffer-stream.c

@@ -309 +309 @@
-tny_gtk_text_buffer_stream_finalize (GObject *object)
-{
-       
+
-        TnyGtkTextBufferStreamPriv *priv = TNY_GTK_TEXT_BUFFER_STREAM_GET_PRIVATE (self);
-
-        if (priv->buffer && priv->pending_bytes)
-
+(TnyStream *) 
-
-        if (priv->buffer)
-G_OBJECT (priv->buffer)
+priv->buffer
-        if (priv->pending_bytes)
-                g_byte_array_free (priv->pending_bytes, TRUE);