Base functions and pluggable.

diff --git a/src/commons.c b/src/commons.c
index e464bf304e94557348b3376de38d9baa62e609ab..08e78c630c78b17cdf99d329094fc3790eb70118 100644 (file)
--- a/src/commons.c
+++ b/src/commons.c
@@ -2,7 +2,7 @@
  * commons.c
  * This file is part of libzakstorage
  *
- * Copyright (C) 2017 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2017-2018 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Library General Public License as published by
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_STORAGEG_H
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 

diff --git a/src/libzakstorage.h b/src/libzakstorage.h
index 6526bc8d88a04443735a1e015ec82e88030278c6..f956f5ec09958592fb39134c6bf3dfb632954e9b 100644 (file)
--- a/src/libzakstorage.h
+++ b/src/libzakstorage.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 Andrea Zagli <azagli@libero.it>
+ *  Copyright (C) 2017-2020 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #define __LIBZAKSTORAGE_H__
 
 #include <glib-object.h>
+#include <glib.h>
 
 #include <libpeas/peas.h>
 
@@ -59,6 +60,24 @@ PeasPluginInfo *zak_storage_get_plugin_info (ZakStorage *storage);
 
 void zak_storage_destroy (ZakStorage *storage);
 
+void zak_storage_node_new (ZakStorage *storage, const gchar *src_filename, const gchar *dest_filename, const gchar *version);
+void zak_storage_node_new_from_gfile (ZakStorage *storage, GFile *src_file, const gchar *dest_filename, const gchar *version);
+void zak_storage_node_new_from_gstream (ZakStorage *storage, GInputStream *src_stream, const gchar *dest_filename, const gchar *version);
+
+void zak_storage_node_delete (ZakStorage *storage, const gchar *filename);
+void zak_storage_node_delete_version (ZakStorage *storage, const gchar* filename, const gchar *version);
+
+const gchar *zak_storage_node_get_version (ZakStorage *storage, const gchar *filename);
+
+void zak_storage_node_rename (ZakStorage *storage, const gchar *filename, const gchar *new_name);
+void zak_storage_node_move (ZakStorage *storage, const gchar *filename, const gchar *new_filename);
+
+gchar *zak_storage_node_get (ZakStorage *storage, const gchar *filename, const gchar *version);
+GFile *zak_storage_note_get_as_tmp (ZakStorage *storage, const gchar *filename, const gchar *version);
+
+GHashTable *zak_storage_node_metadata (ZakStorage *storage, const gchar *filename);
+const gchar *zak_storage_node_metdata_get_field (ZakStorage *storage, const gchar *filename, const gchar *metdata_field);
+
 
 G_END_DECLS
 

diff --git a/src/storage.c b/src/storage.c
index a323733fac8f29012a90a309f23aacadf3d8d784..ffea47fddefac9ff778ab4c079f1e5734eb5f07e 100644 (file)
--- a/src/storage.c
+++ b/src/storage.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017 Andrea Zagli <azagli@libero.it>
+ *  Copyright (C) 2017-2020 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -237,6 +237,102 @@ PeasPluginInfo
        return ppinfo;
 }
 
+/**
+ * zak_storage_node_new:
+ * @storage:
+ * @src_filename: the absolute path from where load the node; if it's #NULL or an empty string, it's a directory
+ * @dest_filename: the name of the node; if it's #NULL or an empty string, it uses @src_filename
+ * @version: the version of the node, if it's a file
+ *
+ * Add/Replace a node. If @version is not #NULL but already exists, it replace the @version with the new content.
+ * If @version is #NULL or an empty string it automatically creates a new version.
+ */
+void
+zak_storage_node_new (ZakStorage *storage, const gchar *src_filename, const gchar *dest_filename, const gchar *version)
+{
+       GFile *gfile;
+
+       gfile = g_file_new_for_path (src_filename);
+
+       zak_storage_node_new_from_gfile (storage, gfile, dest_filename, version);
+}
+
+/**
+ * zak_storage_node_new_from_gfile:
+ * @storage:
+ * @src_file: the GFile from where load the node; if it's #NULL or an empty string, it's a directory
+ * @dest_filename: the name of the node; if it's #NULL or an empty string, it uses @src_file name
+ * @version: the version of the node, if it's a file
+ *
+ * Add/Replace a node. If @version is not #NULL but already exists, it replace the @version with the new content.
+ * If @version is #NULL or an empty string it automatically creates a new version.
+ */
+void
+zak_storage_node_new_from_gfile (ZakStorage *storage, GFile *src_file, const gchar *dest_filename, const gchar *version)
+{
+       GError *error;
+       GInputStream *istream;
+
+       gchar *_dest;
+
+       g_return_if_fail (src_file != NULL);
+
+
+       _dest = g_strstrip (g_strdup (dest_filename));
+       if (g_strcmp0 (_dest, "") == 0)
+               {
+                       _dest = g_build_filename (g_file_get_path (src_file),
+                                                 g_file_get_basename (src_file),
+                                                 NULL);
+               }
+
+       error = NULL;
+       istream = (GInputStream *)g_file_read (src_file, FALSE, &error);
+
+       zak_storage_node_new_from_gstream (storage, istream, _dest, version);
+
+       g_free (_dest);
+}
+
+/**
+ * zak_storage_node_new_from_gsream:
+ * @storage:
+ * @src_stream: the GInputStream from where load the node; cannnot be #NULL
+ * @dest_filename: the name of the node; cannot be #NULL
+ * @version: the version of the node, if it's a file
+ *
+ * Add/Replace a node. If @version is not #NULL but already exists, it replace the @version with the new content.
+ * If @version is #NULL or an empty string it automatically creates a new version.
+ */
+void
+zak_storage_node_new_from_gstream (ZakStorage *storage, GInputStream *src_stream, const gchar *dest_filename, const gchar *version)
+{
+       ZakStoragePrivate *priv = ZAK_STORAGE_GET_PRIVATE (storage);
+
+       gchar *_dest;
+
+       g_return_if_fail (src_stream != NULL);
+       g_return_if_fail (dest_filename != NULL);
+
+       _dest = g_strstrip (g_strdup (dest_filename));
+       if (g_strcmp0 (_dest, "") == 0)
+               {
+                       g_free (_dest);
+                       return;
+               }
+
+       g_free (_dest);
+
+       if (priv->pluggable == NULL)
+               {
+                       g_warning ("Not initialized.");
+               }
+       else
+               {
+                       zak_storage_pluggable_node_new (priv->pluggable, src_stream, _dest, version);
+               }
+}
+
 /**
  * zak_storage_destroy:
  * @storage: a #ZakStorage object.

diff --git a/src/storagepluggable.c b/src/storagepluggable.c
index f33a8c40f1d14bc38933ed8d67a56c6c2382b6b7..432c71f8e8ffc9eee28ed4094df4afc03bf9304e 100644 (file)
--- a/src/storagepluggable.c
+++ b/src/storagepluggable.c
@@ -2,7 +2,7 @@
  * storagepluggable.c
  * This file is part of libzakstorage
  *
- * Copyright (C) 2017 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2017-2020 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Library General Public License as published by
@@ -77,3 +77,16 @@ zak_storage_pluggable_initialize (ZakStoragePluggable *pluggable, const gchar *c
 
        return iface->initialize (pluggable, cnc_string);
 }
+
+void
+zak_storage_pluggable_node_new (ZakStoragePluggable *pluggable, GInputStream *src_stream, const gchar *dest_filename, const gchar *version)
+{
+       ZakStoragePluggableInterface *iface;
+
+       g_return_if_fail (ZAK_STORAGE_IS_PLUGGABLE (pluggable));
+
+       iface = ZAK_STORAGE_PLUGGABLE_GET_IFACE (pluggable);
+       g_return_if_fail (iface->node_new != NULL);
+
+       iface->node_new (pluggable, src_stream, dest_filename, version);
+}

diff --git a/src/storagepluggable.h b/src/storagepluggable.h
index 97cba417ead8668eaf0e332fd2340a4f9aae922f..8d72d01c9c5da70945e929a8941e15a6a56ff859 100644 (file)
--- a/src/storagepluggable.h
+++ b/src/storagepluggable.h
@@ -2,7 +2,7 @@
  * storagepluggable.h
  * This file is part of libstorage
  *
- * Copyright (C) 2017 - Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2017-2020 - Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Library General Public License as published by
@@ -23,6 +23,8 @@
 #define __ZAK_STORAGE_PLUGGABLE_H__
 
 #include <glib-object.h>
+#include <glib.h>
+#include <gio/gio.h>
 
 #include "commons.h"
 
@@ -57,6 +59,8 @@ struct _ZakStoragePluggableInterface {
 
        /* Virtual public methods */
        gboolean (*initialize) (ZakStoragePluggable *pluggable, const gchar *cnc_string);
+
+       void (*node_new) (ZakStoragePluggable *pluggable, GInputStream *src_stream, const gchar *dest_filename, const gchar *version);
 };
 
 /*
@@ -65,7 +69,9 @@ struct _ZakStoragePluggableInterface {
 GType zak_storage_pluggable_get_type (void) G_GNUC_CONST;
 
 gboolean zak_storage_pluggable_initialize (ZakStoragePluggable *pluggable,
-                                     const gchar *cnc_string);
+                                           const gchar *cnc_string);
+
+void zak_storage_pluggable_node_new (ZakStoragePluggable *pluggable, GInputStream *src_stream, const gchar *dest_filename, const gchar *version);
 
 
 G_END_DECLS