Merge lp:~rodrigo-moya/ubuntuone-client/add-missing-libsd-api into lp:ubuntuone-client

[Rodrigo Moya]

Added missing public files API in SyncdaemonDaemon object

Added missing public files API in SyncdaemonDaemon object

[dobey (dobey)]

review: Approve

[Stuart Langridge (sil)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~rodrigo-moya/ubuntuone-client/add-missing-libsd-api into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.15
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dep...

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Rodrigo Moya <email address hidden>

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Rodrigo Moya <email address hidden>

=== modified file 'libsyncdaemon/Makefile.am'
=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-11-03 10:33:54 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-11-19 09:22:48 +0000
@@ -1068,6 +1068,109 @@
 }
 
 /**
+ * syncdaemon_daemon_publish_file:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Full path of the file to be published
+ *
+ * Publish a file on Ubuntu One. When the file is successfully published, the "file_published"
+ * signal will be emitted.
+ *
+ * Return value: TRUE if successful, FALSE otherwise.
+ */
+gboolean
+syncdaemon_daemon_publish_file (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonMetadata *metadata;
+	gboolean result = FALSE;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	/* First, retrieve the metadata */
+	metadata = syncdaemon_daemon_get_metadata (daemon, path, FALSE);
+	if (metadata != NULL) {
+		SyncdaemonInterface *interface;
+
+		interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
+		syncdaemon_publicfiles_interface_change_public_access (
+			SYNCDAEMON_PUBLICFILES_INTERFACE (interface),
+			syncdaemon_metadata_get_share_id (metadata),
+			syncdaemon_metadata_get_node_id (metadata),
+			TRUE);
+
+		result = TRUE;
+
+		g_object_unref (metadata);
+	}
+
+	return result;
+}
+
+/**
+ * syncdaemon_daemon_unpublish_file:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Full path of the file to be unpublished
+ *
+ * Unpublish a file from Ubuntu One. When the file is successfully unpublished, the "file_unpublished"
+ * signal will be emitted.
+ *
+ * Return value: TRUE if successful, FALSE otherwise.
+ */
+gboolean
+syncdaemon_daemon_unpublish_file (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonMetadata *metadata;
+	gboolean result = FALSE;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	/* First, retrieve the metadata */
+	metadata = syncdaemon_daemon_get_metadata (daemon, path, FALSE);
+	if (metadata != NULL) {
+		SyncdaemonInterface *interface;
+
+		interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
+		syncdaemon_publicfiles_interface_change_public_access (
+			SYNCDAEMON_PUBLICFILES_INTERFACE (interface),
+			syncdaemon_metadata_get_share_id (metadata),
+			syncdaemon_metadata_get_node_id (metadata),
+			FALSE);
+
+		result = TRUE;
+
+		g_object_unref (metadata);
+	}
+
+	return result;
+}
+
+/**
+ * syncdaemon_daemon_get_public_files:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Retrieve the list of public files.
+ *
+ * Return value: A #GSList of #SyncdaemonFileInfo objects, each of which describes
+ * a published file for the user. When no longer needed, this list should be
+ * freed by calling g_slist_free, but the data within the list should never
+ * be freed, as it belongs to the library.
+ */
+GSList *
+syncdaemon_daemon_get_public_files (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
+	if (interface != NULL) {
+		return syncdaemon_publicfiles_interface_get_public_files (
+			SYNCDAEMON_PUBLICFILES_INTERFACE (interface));
+	}
+
+	return NULL;
+}
+
+/**
  * syncdaemon_daemon_create_share:
  * @daemon: A #SyncdaemonDaemon object
  * @path: Full path of the folder to be shared

=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-11-03 10:33:54 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-11-19 09:22:48 +0000
@@ -124,7 +124,9 @@
 void                 syncdaemon_daemon_unsubscribe_folder (SyncdaemonDaemon *daemon, const gchar *path);
 
 /* Public files operations */
-/* FIXME: need nautilus-refactor branch landed first */
+gboolean             syncdaemon_daemon_publish_file (SyncdaemonDaemon *daemon, const gchar *path);
+gboolean             syncdaemon_daemon_unpublish_file (SyncdaemonDaemon *daemon, const gchar *path);
+GSList              *syncdaemon_daemon_get_public_files (SyncdaemonDaemon *daemon);
 
 /* Shares operations */
 void                 syncdaemon_daemon_create_share (SyncdaemonDaemon *daemon,