Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/libdocument
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2008-11-29 12:09:10 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2008-11-29 12:09:10 (GMT)
commitc077e7131bdd63aeaee762b69d77f3881ff496b1 (patch)
treea13eb702164bd97c1652fce526e9ebbbead68ea2 /libdocument
parent4327eef27e7651e2aa59cacd206dd20691f51321 (diff)
Move mime-type functions from document-facrory to file-helpers so that it
2008-11-29 Carlos Garcia Campos <carlosgc@gnome.org> * libdocument/ev-document-factory.c: (get_document_from_uri), (ev_document_factory_get_document): * libdocument/ev-file-helpers.[ch]: (get_mime_type_from_uri), (get_mime_type_from_data), (ev_file_get_mime_type): Move mime-type functions from document-facrory to file-helpers so that it can be reused. svn path=/trunk/; revision=3279
Diffstat (limited to 'libdocument')
-rw-r--r--libdocument/ev-document-factory.c62
-rw-r--r--libdocument/ev-file-helpers.c60
-rw-r--r--libdocument/ev-file-helpers.h4
3 files changed, 68 insertions, 58 deletions
diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 1255833..09baef2 100644
--- a/libdocument/ev-document-factory.c
+++ b/libdocument/ev-document-factory.c
@@ -104,61 +104,9 @@ get_compression_from_mime_type (const gchar *mime_type)
return EV_COMPRESSION_NONE;
}
-static gchar *
-get_mime_type_from_uri (const gchar *uri, GError **error)
-{
- GFile *file;
- GFileInfo *file_info;
- gchar *mime_type;
-
- file = g_file_new_for_uri (uri);
- file_info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- 0, NULL, error);
- g_object_unref (file);
-
- if (file_info == NULL)
- return NULL;
-
- mime_type = g_strdup (g_file_info_get_content_type (file_info));
- g_object_unref (file_info);
-
- return mime_type;
-}
-
-static gchar *
-get_mime_type_from_data (const gchar *uri, GError **error)
-{
- GFile *file;
- GFileInputStream *input_stream;
- gssize size_read;
- guchar buffer[1024];
-
- file = g_file_new_for_uri (uri);
-
- input_stream = g_file_read (file, NULL, error);
- if (!input_stream) {
- g_object_unref (file);
- return NULL;
- }
-
- size_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
- buffer, 1024, NULL, NULL);
- g_input_stream_close (G_INPUT_STREAM (input_stream), NULL, error);
-
- g_object_unref (file);
-
- if (size_read == -1)
- return NULL;
-
- return g_content_type_guess (NULL, /* no filename */
- buffer, 1024,
- NULL);
-}
-
static EvDocument *
get_document_from_uri (const char *uri,
- gboolean slow,
+ gboolean fast,
EvCompressionType *compression,
GError **error)
{
@@ -167,9 +115,7 @@ get_document_from_uri (const char *uri,
*compression = EV_COMPRESSION_NONE;
- mime_type = slow ?
- get_mime_type_from_data (uri, error) :
- get_mime_type_from_uri (uri, error);
+ mime_type = ev_file_get_mime_type (uri, fast, error);
if (mime_type == NULL) {
g_free (mime_type);
@@ -231,7 +177,7 @@ ev_document_factory_get_document (const char *uri, GError **error)
EvCompressionType compression;
gchar *uri_unc = NULL;
- document = get_document_from_uri (uri, FALSE, &compression, error);
+ document = get_document_from_uri (uri, TRUE, &compression, error);
if (*error == NULL) {
uri_unc = ev_file_uncompress (uri, compression, error);
if (uri_unc) {
@@ -271,7 +217,7 @@ ev_document_factory_get_document (const char *uri, GError **error)
uri_unc = NULL;
- document = get_document_from_uri (uri, TRUE, &compression, error);
+ document = get_document_from_uri (uri, FALSE, &compression, error);
if (*error != NULL) {
return NULL;
diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 45eb3ec..34d24f0 100644
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -232,6 +232,66 @@ ev_xfer_uri_simple (const char *from,
}
+static gchar *
+get_mime_type_from_uri (const gchar *uri, GError **error)
+{
+ GFile *file;
+ GFileInfo *file_info;
+ gchar *mime_type;
+
+ file = g_file_new_for_uri (uri);
+ file_info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ 0, NULL, error);
+ g_object_unref (file);
+
+ if (file_info == NULL)
+ return NULL;
+
+ mime_type = g_strdup (g_file_info_get_content_type (file_info));
+ g_object_unref (file_info);
+
+ return mime_type;
+}
+
+static gchar *
+get_mime_type_from_data (const gchar *uri, GError **error)
+{
+ GFile *file;
+ GFileInputStream *input_stream;
+ gssize size_read;
+ guchar buffer[1024];
+
+ file = g_file_new_for_uri (uri);
+
+ input_stream = g_file_read (file, NULL, error);
+ if (!input_stream) {
+ g_object_unref (file);
+ return NULL;
+ }
+
+ size_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
+ buffer, 1024, NULL, NULL);
+ g_input_stream_close (G_INPUT_STREAM (input_stream), NULL, error);
+
+ g_object_unref (file);
+
+ if (size_read == -1)
+ return NULL;
+
+ return g_content_type_guess (NULL, /* no filename */
+ buffer, 1024,
+ NULL);
+}
+
+gchar *
+ev_file_get_mime_type (const gchar *uri,
+ gboolean fast,
+ GError **error)
+{
+ return fast ? get_mime_type_from_uri (uri, error) : get_mime_type_from_data (uri, error);
+}
+
/* Compressed files support */
#define BZIPCOMMAND "bzip2"
#define GZIPCOMMAND "gzip"
diff --git a/libdocument/ev-file-helpers.h b/libdocument/ev-file-helpers.h
index cd86320..833eade 100644
--- a/libdocument/ev-file-helpers.h
+++ b/libdocument/ev-file-helpers.h
@@ -50,6 +50,10 @@ gboolean ev_xfer_uri_simple (const char *from,
const char *to,
GError **error);
+gchar *ev_file_get_mime_type (const gchar *uri,
+ gboolean fast,
+ GError **error);
+
gchar *ev_file_uncompress (const gchar *uri,
EvCompressionType type,
GError **error);