Ignore if an entry cannot be read when enumerating files

[cascardo/atompub.git] / backend / gio / gio.c

diff --git a/backend/gio/gio.c b/backend/gio/gio.c
index 62f3ead..7f140a6 100644 (file)
--- a/backend/gio/gio.c
+++ b/backend/gio/gio.c
@@ -21,12 +21,13 @@
 #include <gio/gio.h>
 #include <atompub/atom.h>
 #include <atompub/atom-glib.h>
+#include <string.h>
 
 static GFile *
-gio_iri_to_file (AtomCtx *ctx, IRI *iri)
+gio_id_to_file (AtomCtx *ctx, AtomID *id)
 {
   gchar *root = atom_config_get_str (ctx, "gio", "root");
-  gchar *path = iri_get_path (iri);
+  gchar *path = atom_id_string (id);
   gchar *filename = g_build_filename (root, path, NULL);
   GFile *file = g_file_new_for_path (filename);
   g_free (root);
@@ -34,13 +35,13 @@ gio_iri_to_file (AtomCtx *ctx, IRI *iri)
   return file;
 }
 
-static Atom *
+static AtomEntry *
 gio_file_to_atom (AtomCtx *ctx, GFile *file)
 {
   GError *error = NULL;
   gchar *data;
   gsize len;
-  Atom *atom;
+  AtomEntry *atom;
   error = NULL;
   if (!g_file_load_contents (file, NULL, &data, &len, NULL, &error))
     {
@@ -54,32 +55,42 @@ gio_file_to_atom (AtomCtx *ctx, GFile *file)
   return atom;
 }
 
-static Atom *
-gio_atom_retrieve_resource (AtomCtx *ctx, IRI *iri)
+static AtomEntry *
+gio_atom_retrieve_entry (AtomCtx *ctx, AtomID *id)
 {
   GFile *file;
-  Atom *atom;
-  file = gio_iri_to_file (ctx, iri);
+  AtomEntry *atom;
+  file = gio_id_to_file (ctx, id);
   atom = gio_file_to_atom (ctx, file);
   g_object_unref (file);
   return atom;
 }
 
 static void
-gio_enumerate_entries (AtomCtx *ctx, Atom ***entries, size_t *len)
+gio_enumerate_entries (AtomCtx *ctx, AtomEntry ***entries, size_t *len)
 {
   GFile *dir;
   GFileEnumerator *enumerator;
   GFileInfo *info;
   GFile *file;
+  AtomEntry *entry;
+  GError *error;
   gchar *root;
   gchar *name;
   gchar *filename;
   GPtrArray *array;
   root = atom_config_get_str (ctx, "gio", "root");
   dir = g_file_new_for_path (root);
+  error = NULL;
   enumerator = g_file_enumerate_children (dir, G_FILE_ATTRIBUTE_STANDARD_NAME,
-                                         G_FILE_QUERY_INFO_NONE, NULL, NULL);
+                                         G_FILE_QUERY_INFO_NONE, NULL, &error);
+  if (enumerator == NULL)
+    {
+      AtomError *aerr = atom_error_new_from_gerror (error);
+      atom_error_set (ctx, aerr);
+      g_error_free (error);
+      return;
+    }
   array = g_ptr_array_new ();
   while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL)
     {
@@ -87,7 +98,15 @@ gio_enumerate_entries (AtomCtx *ctx, Atom ***entries, size_t *len)
       filename = g_build_filename (root, name, NULL);
       g_object_unref (info);
       file = g_file_new_for_path (filename);
-      g_ptr_array_add (array, gio_file_to_atom (ctx, file));
+      entry = gio_file_to_atom (ctx, file);
+      if (entry)
+        {
+          g_ptr_array_add (array, entry);
+        }
+      else
+        {
+          atom_error_set (ctx, NULL);
+        }
       g_object_unref (file);
       g_free (filename);
     }
@@ -101,11 +120,19 @@ gio_enumerate_entries (AtomCtx *ctx, Atom ***entries, size_t *len)
   g_ptr_array_free (array, FALSE);
 }
 
+static int
+gio_atom_is_feed (AtomCtx *ctx, AtomID *id)
+{
+  return (!strcmp (atom_id_string (id), "/"));
+}
+
 AtomBackend *
 gio_backend (void)
 {
   AtomBackend *backend;
   backend = atom_backend_new ();
-  atom_backend_retrieve_resource_set (backend, gio_atom_retrieve_resource);
+  atom_backend_retrieve_entry_set (backend, gio_atom_retrieve_entry);
+  atom_backend_enumerate_entries_set (backend, gio_enumerate_entries);
+  atom_backend_is_feed_set (backend, gio_atom_is_feed);
   return backend;
 }