Merge lp:~nataliabidart/ubuntu/natty/magicicada/magicicada-0.3.0 into lp:ubuntu/natty/magicicada

[Natalia Bidart]

  * New upstream release:

    [ Natalia B. Bidart <email address hidden> ]
      * Added Public Files listing to the UI (LP: #568197).
      * The icon list is now set at creation time. This guarantees that proper
      icon sizes will be used (LP: #669947).
      * Default logging level is now INFO.
      * Volumes and metadata buttons are enabled when initial_data_ready
      callback is fired (LP: #612194).

    [ Facundo Batista <email address hidden> ]
      * Backend code to accept a share.
      * Support the new "CQ changed" signal, with no data in it.
      * Log all the errors that happen inside a deferred.
      * Splitted "on initial data callback" in both online and offline ones.
      * Handle Public Files info.
      * Support GetDelta in the MQ (LP: #665680).
      * Leave the "don't ask while asking" machinery ok if error while asking.
      * Support an error when calling the MD (LP: #665674).
      * Don't ask a lot of times for updates to Syncdaemon on changes bursts
      (LP: #587020) (LP: #643195).

  * debian/control
    - updated depedency list

[Stefano Rivera (stefanor)]

Hi looks ok, but a couple of small things pile up:
* changelog is a bit weirdly formatted (text indented to the same level as the bullets.
* You can use this syntax: (LP: #587020, #643195)
* I'd prefer something a little more concrete than "updated dependency list".
  It looks like: sorted depends, dropped depends-indep, depend on python-ubuntu-one-client (>= foo), depend on python-xdg
* No mention of the standards version update (these are traditionally changelogged as "Bumped Standards-Version to X.Y.Z (no changes needed)"
* No mention of the maintainer change in the changelog. Should the maintainer not be Ubuntu Developers <email address hidden>?
* No mention of the description change.
* Copyright:
  - I assume the copyright years need a bump.
  - DEP5 has evolved quite a bit, at some point this file should be updated to match the current standards.
  - The short GPL licence grant should be included before the "full text" notice.
* At some point, you should consider migrating to dh_python2, AFAIK doko is quite keen for Ubuntu-specific packages to migrate during natty.

review: Needs Fixing

[lp:~nataliabidart/ubuntu/natty/magicicada/magicicada-0.3.0]

9. By Natalia Bidart on 2011-01-07

Depending on freshly released ubuntuone-client 1.5.2.

[Natalia Bidart (nataliabidart)]

> Hi looks ok, but a couple of small things pile up:
> * changelog is a bit weirdly formatted (text indented to the same level as the
> bullets.

> * You can use this syntax: (LP: #587020, #643195)

> * I'd prefer something a little more concrete than "updated dependency list".
> It looks like: sorted depends, dropped depends-indep, depend on python-
> ubuntu-one-client (>= foo), depend on python-xdg

Fixed as per suggestion.

> * No mention of the standards version update (these are traditionally
> changelogged as "Bumped Standards-Version to X.Y.Z (no changes needed)"

Added (I bumped the version sin I got a lintian warning).

> * No mention of the maintainer change in the changelog. Should the maintainer
> not be Ubuntu Developers <email address hidden>?

I'm not sure, Elliot used to do the package maintenance but now is just Facundo Batista and me. I thought we had to put the actual maintainers on that field.
Can you please confirm?

> * No mention of the description change.

Added.

> * Copyright:
> - I assume the copyright years need a bump.

Added.

> - DEP5 has evolved quite a bit, at some point this file should be updated to
> match the current standards.

Sorry for my ignorance, what is DEP5? And how should it be updated?

> - The short GPL licence grant should be included before the "full text"
> notice.

I'm a bit lost, in which file this needs to be changed?

> * At some point, you should consider migrating to dh_python2, AFAIK doko is
> quite keen for Ubuntu-specific packages to migrate during natty.

Hum, my ignorance strikes again. I'm not using explicitly dh_python to build the package. Could you please be more specific where dh_python2 should be used?

Thanks a lot for the feedback!

[lp:~nataliabidart/ubuntu/natty/magicicada/magicicada-0.3.0]

10. By Natalia Bidart on 2011-01-07

* debian/control
  - Sorted Depends, dropped depends-indep
  - Added version depend restriction for python-ubuntuone-client (>= 1.5.2)
  - Added missing depend: python-xdg
  - Bumped Standards-Version to 3.9.1 (no changes needed)
  - Changed the description to match the new description in the project
  setup.py file

* debian/copyright
  - Added year 2011 to copyright statement
  - Fixed email ocurrences of nataliabidart to consistently be nataliabidart
  at gmail dot com

[Natalia Bidart (nataliabidart)]

Stefano, I forgot to as about:

"changelog is a bit weirdly formatted (text indented to the same level as the bullets"

what would be a better formatting?

[Stefano Rivera (stefanor)]

Thanks, that was quick.

> I thought we had to put the actual maintainers on that field.
> Can you please confirm?

I'm not sure on Maintainer policy either, best I can tell is that Ubuntu tends to use Ubuntu Developers for ubuntu-only packages. The reason for this is that Ubuntu packages don't have strong maintainers, but are maintained by all Ubuntu developers. However, there is no policy I know of stipulating this, so I'm happy with it as is.

> what is DEP5? And how should it be updated?

DEP5 is the machine-readable changelog format. http://dep.debian.net/deps/dep5/
A few of the fields have changed name, and there should only be one (multi-line) copyright item.

The licence block for GPL-3 should probably be:
License: GPL-3
 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
 the Free Software Foundation, version 3 of the License.
 .
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 General Public License for more details.
 .
 On Debian systems, the complete text of the GNU General Public License
 version 3 can be found in the /usr/share/common-licenses/GPL-3 file.

> Could you please be more specific where dh_python2 should be used?

dh_python2 is a replacement for python-support and python-central. Instead of creating per-python-version symlink farms at install time, they are shipped in the package, and only byte-compilation is done at install time. Unfortunately there is little documentation on it that I can point you to (yet).

CDBS only gained support in 0.4.90 (which isn't in Ubuntu yet), so the best way to use it is probably to switch to debhelper.

Here's a trivial port, which is untested, but looks ok: http://paste.ubuntu.com/551612/

> what would be a better formatting?
Wrapping like this

* this is a multilne
  bulleted point.

Oh, and lintian says "Splitted" isn't an english word. It's right about that :)

[Natalia Bidart (nataliabidart)]

> > I thought we had to put the actual maintainers on that field.
> > Can you please confirm?
>
> I'm not sure on Maintainer policy either, best I can tell is that Ubuntu tends
> to use Ubuntu Developers for ubuntu-only packages. The reason for this is that
> Ubuntu packages don't have strong maintainers, but are maintained by all
> Ubuntu developers. However, there is no policy I know of stipulating this, so
> I'm happy with it as is.

Good, I'll leave it as is since I plan to maintain magicicada in the long term.

> > what is DEP5? And how should it be updated?
>
> DEP5 is the machine-readable changelog format.
> http://dep.debian.net/deps/dep5/
> A few of the fields have changed name, and there should only be one (multi-
> line) copyright item.

Thanks for the pointer, all fixed.

> > Could you please be more specific where dh_python2 should be used?
>
> dh_python2 is a replacement for python-support and python-central. Instead of
> creating per-python-version symlink farms at install time, they are shipped in
> the package, and only byte-compilation is done at install time. Unfortunately
> there is little documentation on it that I can point you to (yet).
>
> CDBS only gained support in 0.4.90 (which isn't in Ubuntu yet), so the best
> way to use it is probably to switch to debhelper.
>
> Here's a trivial port, which is untested, but looks ok:
> http://paste.ubuntu.com/551612/

I've applied this patch and build and installed the packages, seems to work just fine. Thanks!

> > what would be a better formatting?
> Wrapping like this
>
> * this is a multilne
> bulleted point.

Fixed!

> Oh, and lintian says "Splitted" isn't an english word. It's right about that
> :)

Also fixed :-)

Thanks again!

[lp:~nataliabidart/ubuntu/natty/magicicada/magicicada-0.3.0]

11. By Natalia Bidart on 2011-01-07

* debian/copyright
    - Fixed formatting to be DEP5 compatible

12. By Natalia Bidart on 2011-01-07

* Switched to debhelper, thanks Stefano Rivera for the patch.

* debian/control
    - fixed bullet indent formatting
    - fixed typo (s/splitted/split/)

[Stefano Rivera (stefanor)]

OK, copyright still isn't quite current DEP5, I'll tweak it on upload.

I'll also document the transition to dh_python2 in the changelog, it's worthy of a mention.

review: Approve

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-09-02 19:26:08 +0000
+++ PKG-INFO	2011-01-07 23:06:32 +0000
@@ -1,19 +1,11 @@
 Metadata-Version: 1.1
 Name: magicicada
-Version: 0.2
-Summary: A GTK+ frontend for the "Chicharra" part of Ubuntu One.
+Version: 0.3.0
+Summary: A GTK+ frontend for Ubuntu One.
 Home-page: https://launchpad.net/magicicada
 Author: Natalia Bidart
-Author-email: [e-mail]
+Author-email: [e-mail]
 License: GPL-3
-Description: UNKNOWN
+Description: This application provides a GTK frontend to manage the file synchronisation service of Ubuntu One.
 Platform: UNKNOWN
-Requires: dbus
-Requires: gobject
-Requires: gtk
-Requires: pango
-Requires: twisted.internet
-Requires: twisted.trial.unittest
-Requires: ubuntuone.syncdaemon.tools
-Requires: xdg.BaseDirectory
 Provides: magicicada

=== added file 'data/media/logo-048.png'
Binary files data/media/logo-048.png	1970-01-01 00:00:00 +0000 and data/media/logo-048.png	2011-01-07 23:06:32 +0000 differ
=== modified file 'data/ui/gui.glade'
--- data/ui/gui.glade	2010-07-24 18:46:42 +0000
+++ data/ui/gui.glade	2011-01-07 23:06:32 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
@@ -84,6 +84,18 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkListStore" id="public_files_store">
+    <columns>
+      <!-- column-name path -->
+      <column type="gchararray"/>
+      <!-- column-name public_url -->
+      <column type="gchararray"/>
+      <!-- column-name volume -->
+      <column type="gchararray"/>
+      <!-- column-name node -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="main_window">
     <property name="width_request">800</property>
     <property name="height_request">600</property>
@@ -149,10 +161,12 @@
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
             <property name="toolbar_style">both</property>
+            <property name="icon_size">1</property>
             <child>
               <object class="GtkToolButton" id="start">
                 <property name="width_request">50</property>
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Start</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-apply</property>
@@ -166,6 +180,7 @@
             <child>
               <object class="GtkToolButton" id="stop">
                 <property name="width_request">50</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Stop</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-stop</property>
@@ -181,6 +196,7 @@
                 <property name="width_request">85</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Connect</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-connect</property>
@@ -194,6 +210,7 @@
             <child>
               <object class="GtkToolButton" id="disconnect">
                 <property name="width_request">85</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Disconnect</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-disconnect</property>
@@ -269,6 +286,20 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolButton" id="public_files">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="label" translatable="yes">Public Files</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-file</property>
+                <signal name="clicked" handler="on_public_files_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -548,7 +579,6 @@
   <object class="GtkAboutDialog" id="about_dialog">
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Magicicada</property>
     <property name="copyright" translatable="yes">Copyright 2010 Chicharreros
 Copyright 2010 Natalia Bidart &lt;[e-mail]&gt;
@@ -598,7 +628,6 @@
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -705,7 +734,6 @@
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -844,7 +872,6 @@
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox5">
         <property name="visible">True</property>
@@ -981,7 +1008,6 @@
     <property name="border_width">5</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <property name="create_folders">False</property>
     <signal name="file_activated" handler="on_file_chooser_open_clicked"/>
     <signal name="show" handler="on_file_chooser_show"/>
@@ -1040,4 +1066,96 @@
       <action-widget response="0">file_chooser_open</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkDialog" id="public_files_dialog">
+    <property name="width_request">600</property>
+    <property name="height_request">300</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Public files</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox9">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow6">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" id="public_files_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">public_files_store</property>
+                <property name="headers_clickable">False</property>
+                <property name="rules_hint">True</property>
+                <property name="search_column">0</property>
+                <property name="enable_grid_lines">both</property>
+                <property name="enable_tree_lines">True</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="public_files_path">
+                    <property name="resizable">True</property>
+                    <property name="title">Path</property>
+                    <property name="expand">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext9"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="public_files_public_url">
+                    <property name="resizable">True</property>
+                    <property name="title">URL</property>
+                    <property name="expand">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext12"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area9">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="public_files_close">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_public_files_close_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">public_files_close</action-widget>
+    </action-widgets>
+  </object>
 </interface>

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-23 17:13:19 +0000
+++ debian/changelog	2011-01-07 23:06:32 +0000
@@ -1,3 +1,45 @@
+magicicada (0.3.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release (0.3.0):
+
+    [ Natalia B. Bidart <[e-mail]> ]
+      - Added Public Files listing to the UI (LP: #568197).
+      - The icon list is now set at creation time. This guarantees that proper
+        icon sizes will be used (LP: #669947).
+      - Default logging level is now INFO.
+      - Volumes and metadata buttons are enabled when initial_data_ready
+      callback is fired (LP: #612194).
+
+    [ Facundo Batista <[e-mail]> ]
+      - Backend code to accept a share.
+      - Support the new "CQ changed" signal, with no data in it.
+      - Log all the errors that happen inside a deferred.
+      - Split "on initial data callback" in both online and offline ones.
+      - Handle Public Files info.
+      - Support GetDelta in the MQ  (LP: #665680).
+      - Leave the "don't ask while asking" machinery ok if error while asking.
+      - Support an error when calling the MD (LP: #665674).
+      - Don't ask a lot of times for updates to Syncdaemon on changes bursts
+        (LP: #587020, #643195).
+
+  * debian/control
+    - Sorted Depends, dropped depends-indep
+    - Added version depend restriction for python-ubuntuone-client (>= 1.5.2)
+    - Added missing depend: python-xdg
+    - Bumped Standards-Version to 3.9.1 (no changes needed)
+    - Changed the description to match the new description in the project
+      setup.py file
+
+  * debian/copyright
+    - Added year 2011 to copyright statement
+    - Fixed email ocurrences of nataliabidart to consistently be nataliabidart
+      at gmail dot com
+    - Fixed formatting to be DEP5 compatible
+
+  * Switched to debhelper, thanks Stefano Rivera for the patch.
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Fri, 07 Jan 2011 20:01:05 -0300
+
 magicicada (0.2-0ubuntu1) maverick; urgency=low
 
   [ Facundo Batista ]

=== modified file 'debian/control'
--- debian/control	2010-06-08 10:53:02 +0000
+++ debian/control	2011-01-07 23:06:32 +0000
@@ -1,24 +1,24 @@
 Source: magicicada
 Section: python
 Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 6),
- python,
- python-support (>= 0.6.4)
-Build-Depends-Indep: python-distutils-extra (>= 2.10)
-Maintainer: Elliot Murphy <[e-mail]>
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7),
+ python-all (>= 2.6.5-13~),
+ python-distutils-extra (>= 2.10)
+Maintainer: Natalia Bidart <[e-mail]>
+Standards-Version: 3.9.1
+X-Python-Version: >= 2.5
 
 Package: magicicada
 Architecture: all
 Depends: ${misc:Depends},
- ${misc:Depends},
  ${python:Depends},
+ python-dbus,
  python-gobject,
- python-dbus,
+ python-gtk2,
+ python-ubuntuone-client (>= 1.5.2),
  python-twisted-core,
- python-gtk2,
- python-ubuntuone-client
+ python-xdg
+Breaks: ${python:Breaks}
 Description: A GTK+ frontend for Ubuntu One file sync.
- Displays diagnostic information about what the syncdaemon is doing
- on your computer.
+ This application provides a GTK+ frontend to manage the file
+ synchronisation service of Ubuntu One.

=== modified file 'debian/copyright'
--- debian/copyright	2010-06-08 10:53:02 +0000
+++ debian/copyright	2011-01-07 23:06:32 +0000
@@ -1,11 +1,19 @@
 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 Upstream-Name: magicicada
-Upstream-Maintainer: Natalia Bidart <[e-mail]>
+Upstream-Maintainer: Natalia Bidart <[e-mail]>
 Upstream-Source: https://launchpad.net/magicicada
 
 Files: *
-Copyright: (C) 2010 Facundo Batista <[e-mail]>
-Copyright: (C) 2010 Natalia Bidart <[e-mail]>
-License: GPL-3
- The full text of the GPL is distributed in
- /usr/share/common-licenses/GPL-3 on Debian systems.
+Copyright 2010, 2011 Facundo Batista <[e-mail]> Natalia Bidart <[e-mail]>
+License: GPL-3+
+ 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
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in the /usr/share/common-licenses/GPL-3 file.

=== removed file 'debian/pycompat'
--- debian/pycompat	2010-06-08 10:53:02 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2010-09-23 17:13:19 +0000
+++ debian/rules	2011-01-07 23:06:32 +0000
@@ -1,5 +1,3 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh $@ --with python2

=== modified file 'magicicada/__init__.py'
--- magicicada/__init__.py	2010-08-21 18:54:31 +0000
+++ magicicada/__init__.py	2011-01-07 23:06:32 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Magicicada."""
+"""Magicicada GTK UI."""
 
 import logging
 import os
@@ -31,14 +31,15 @@
 # this shouldn't crash if not found as it is simply used for bug reporting
 try:
     import LaunchpadIntegration
-    launchpad_available = True
+    LAUNCHPAD_AVAILABLE = True
 except ImportError:
-    launchpad_available = False
+    LAUNCHPAD_AVAILABLE = False
 
 from twisted.internet import gtk2reactor  # for gtk-2.0
 gtk2reactor.install()
 
-from magicicada import syncdaemon, dbusiface, logger as logger_helper
+from magicicada import syncdaemon, logger as logger_helper
+from magicicada.dbusiface import NOT_SYNCHED_PATH
 from magicicada.helpers import humanize_bytes, get_data_file, get_builder, \
     log, NO_OP
 
@@ -47,16 +48,11 @@
 UBUNTU_ONE_ROOT = os.path.expanduser('~/Ubuntu One')
 
 # set up the logging for all the project
+# Instance of 'RootLogger' has no 'set_up' member
+# pylint: disable=E1103
 logger_helper.set_up()
 logger = logging.getLogger('magicicada.ui')
 
-DEBUG = os.getenv('DEBUG')
-if DEBUG:
-    console = logging.StreamHandler()
-    console.setLevel(logging.DEBUG)
-    logger.addHandler(console)
-
-
 # Instance of 'A' has no 'y' member
 # pylint: disable=E1101
 
@@ -81,7 +77,7 @@
         self.builder = get_builder('gui.glade')
         self.builder.connect_signals(self)
 
-        if launchpad_available:
+        if LAUNCHPAD_AVAILABLE:
             # for more information about LaunchpadIntegration:
             # wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
             helpmenu = self.builder.get_object('helpMenu')
@@ -105,6 +101,8 @@
             'shares_to_others', 'shares_to_others_dialog',  # shares_to_others
             'shares_to_others_view', 'shares_to_others_store',
             'shares_to_others_close', 'metadata',  # metadata
+            'public_files', 'public_files_dialog',  # public_files
+            'public_files_view', 'public_files_store', 'public_files_close',
             'is_started', 'is_connected', 'is_online',  # status bar images
             'status_label', 'status_icon',  # status label and systray icon
             'metaq_view', 'contentq_view',  # queues tree views
@@ -122,18 +120,18 @@
         self._make_view_sortable('folders')
         self._make_view_sortable('shares_to_me')
         self._make_view_sortable('shares_to_others')
+        self._make_view_sortable('public_files')
 
         self.metadata_dialogs = {}
         self.volumes = (self.folders, self.shares_to_me, self.shares_to_others)
-        self.windows = (self.main_window, self.about_dialog,
-                        self.folders_dialog, self.shares_to_me_dialog,
-                        self.shares_to_others_dialog)
 
-        icon_filename = get_data_file('media', 'logo-016.png')
-        self._icon = gtk.gdk.pixbuf_new_from_file(icon_filename)
-        self.status_icon.set_from_file(icon_filename)
-        for w in self.windows:
-            w.set_icon(self._icon)
+        self._icons = {}
+        for size in (16, 32, 48, 64, 128):
+            icon_filename = get_data_file('media', 'logo-%.3i.png' % size)
+            self._icons[size] = gtk.gdk.pixbuf_new_from_file(icon_filename)
+        self.status_icon.set_from_pixbuf(self._icons[16])
+        self.main_window.set_icon_list(*self._icons.values())
+        gtk.window_set_default_icon_list(*self._icons.values())
 
         about_fname = get_data_file('media', 'logo-128.png')
         self.about_dialog.set_logo(gtk.gdk.pixbuf_new_from_file(about_fname))
@@ -149,6 +147,9 @@
         self.sd.content_queue_changed_callback = self.on_content_queue_changed
         self.sd.meta_queue_changed_callback = self.on_meta_queue_changed
         self.sd.on_metadata_ready_callback = self.on_metadata_ready
+        self.sd.on_initial_data_ready_callback = self.on_initial_data_ready
+        self.sd.on_initial_online_data_ready_callback = \
+            self.on_initial_online_data_ready
 
         self.widget_is_visible = lambda w: w.get_property('visible')
         self.widget_enabled = lambda w: self.widget_is_visible(w) and \
@@ -160,6 +161,8 @@
         store = getattr(self, '%s_store' % view_name)
         view = getattr(self, '%s_view' % view_name)
         self._sorting_order[store] = {}
+        # this enforces that the order that columns will be shown and sorted
+        # matches the order in the underlying model
         for i, col in enumerate(view.get_columns()):
             col.set_clickable(True)
             col.connect('clicked', self.on_store_sort_column_changed, i, store)
@@ -175,7 +178,6 @@
         dialog.set_border_width(10)
         # gtk.WIN_POS_CENTER makes dialogs overlap
         dialog.set_position(gtk.WIN_POS_MOUSE)
-        dialog.set_icon(self._icon)
 
         close_button = dialog.action_area.get_children()[-1]
         close_button.connect('clicked', self.on_metadata_close_clicked, path)
@@ -222,9 +224,10 @@
 
     def on_stop_clicked(self, widget, data=None):
         """Stop syncdaemon."""
-        for v in self.volumes:
-            v.set_sensitive(False)
+        for volume in self.volumes:
+            volume.set_sensitive(False)
         self.metadata.set_sensitive(False)
+        self.public_files.set_sensitive(False)
 
         if self.widget_enabled(self.disconnect):
             self.on_disconnect_clicked(self.disconnect)
@@ -331,6 +334,24 @@
         dialog.spinner.show()
         dialog.show()
 
+    def on_public_files_close_clicked(self, widget, data=None):
+        """Close the public_files dialog."""
+        self.public_files_dialog.response(gtk.RESPONSE_CLOSE)
+
+    def on_public_files_clicked(self, widget, data=None):
+        """Show information about public files."""
+        items = self.sd.public_files
+        if items is None:
+            items = {}
+
+        self.public_files_store.clear()
+        for item in items.itervalues():
+            row = (item.path, item.public_url, item.volume, item.node)
+            self.public_files_store.append(row)
+
+        self.public_files_dialog.run()
+        self.public_files_dialog.hide()
+
     def on_status_icon_activate(self, widget, data=None):
         """Systray icon was clicked."""
         if self.widget_is_visible(self.main_window):
@@ -370,10 +391,6 @@
         self._activate_indicator(self.is_started)
         self.connect.set_sensitive(True)
 
-        for v in self.volumes:
-            v.set_sensitive(True)
-        self.metadata.set_sensitive(True)
-
         self._update_queues_and_status(self.sd.current_state)
 
     @log(logger)
@@ -482,13 +499,25 @@
         dialog = self.metadata_dialogs[path]
         dialog.spinner.hide()
         dialog.view.show()
-        if metadata == dbusiface.NOT_SYNCHED_PATH:
+        if metadata == NOT_SYNCHED_PATH:
             # Metadata path doesn't exsit for syncdaemon
-            text = dbusiface.NOT_SYNCHED_PATH
+            text = NOT_SYNCHED_PATH
         else:
             text = '\n'.join('%s: %s' % i for i in metadata.iteritems())
         dialog.view.get_buffer().set_text(text)
 
+    @log(logger, level=logging.INFO)
+    def on_initial_data_ready(self):
+        """Initial data is now available in syncdaemon."""
+        for volume in self.volumes:
+            volume.set_sensitive(True)
+        self.metadata.set_sensitive(True)
+
+    @log(logger, level=logging.INFO)
+    def on_initial_online_data_ready(self):
+        """Online initial data is now available in syncdaemon."""
+        self.public_files.set_sensitive(True)
+
     # custom
 
     def _start_loading(self, what):

=== modified file 'magicicada/dbusiface.py'
--- magicicada/dbusiface.py	2010-08-23 16:48:07 +0000
+++ magicicada/dbusiface.py	2011-01-07 23:06:32 +0000
@@ -27,7 +27,17 @@
 from dbus.mainloop.glib import DBusGMainLoop
 from twisted.internet import defer
 
-from ubuntuone.syncdaemon.tools import SyncDaemonTool
+try:
+    # yes, they can be imported! pylint: disable=F0401,E0611
+    from ubuntuone.platform.tools import SyncDaemonTool, DBusClient
+    from ubuntuone.platform.dbus_interface import DBUS_IFACE_PUBLIC_FILES_NAME
+except ImportError:
+    # support for old structure (pre-Natty)
+    # yes, they can be imported! pylint: disable=F0401,E0611
+    from ubuntuone.syncdaemon.tools import SyncDaemonTool, DBusClient
+    from ubuntuone.syncdaemon.dbus_interface import (
+        DBUS_IFACE_PUBLIC_FILES_NAME,
+    )
 
 # log!
 logger = logging.getLogger('magicicada.dbusiface')
@@ -40,6 +50,8 @@
 ShareData = collections.namedtuple('ShareData', 'accepted access_level '
                                    'free_bytes name node_id other_username '
                                    'other_visible_name path volume_id')
+PublicFilesData = collections.namedtuple('PublicFilesData',
+                                         'volume node path public_url')
 
 # regular expressions for parsing MetaQueue data
 RE_OP_LISTDIR = re.compile("(ListDir)\(share_id=(.*?), node_id=(.*?), .*")
@@ -61,6 +73,15 @@
 NOT_SYNCHED_PATH = "Not a valid path!"
 
 
+# some exceptions
+class ShareOperationError(Exception):
+    """Error on an operation on a share."""
+    def __init__(self, share_id, error):
+        self.share_id = share_id
+        self.error = error
+        Exception.__init__(self)
+
+
 def _is_retry_exception(err):
     """Check if the exception is a retry one."""
     if isinstance(err, dbus.exceptions.DBusException):
@@ -97,6 +118,7 @@
         # magicicada's syncdaemon
         self.msd = msd
         logger.info("DBus interface starting")
+        self._public_files_deferred = None
 
         # set up dbus and related stuff
         loop = DBusGMainLoop(set_as_default=True)
@@ -116,6 +138,9 @@
             (self._on_share_created, 'Shares', 'ShareCreated'),
             (self._on_share_deleted, 'Shares', 'ShareDeleted'),
             (self._on_share_changed, 'Shares', 'ShareChanged'),
+            (self._on_public_files_list, 'PublicFiles', 'PublicFilesList'),
+            (self._on_public_files_changed, 'PublicFiles',
+                                            'PublicAccessChanged'),
         ]
         self._dbus_matches = []
         for method, dbus_lastname, signal_name in _signals:
@@ -164,7 +189,7 @@
         data = self._process_status(state)
         self.msd.on_sd_status_changed(*data)
 
-    def _on_content_queue_changed(self, _):
+    def _on_content_queue_changed(self, _=None):
         """Call the SD callback."""
         logger.info("Received Content Queue changed")
         self.msd.on_sd_content_queue_changed()
@@ -223,6 +248,57 @@
         logger.info("Received Share changed")
         self.msd.on_sd_shares_changed()
 
+    def _on_public_files_changed(self, data):
+        """Call the SD callback."""
+        logger.debug("Received Public Files changed: %s", data)
+        pf = PublicFilesData(volume=data['share_id'], node=data['node_id'],
+                             path=data['path'], public_url=data['public_url'])
+        is_public = bool(data['is_public'])
+        self.msd.on_sd_public_files_changed(pf, is_public)
+
+    def _on_public_files_list(self, data):
+        """Call the SD callback."""
+        logger.info("Received Public Files list (%d)", len(data))
+        processed = []
+        for d in data:
+            logger.debug("    Public Files data: %s", d)
+            p = PublicFilesData(volume=d['volume_id'], node=d['node_id'],
+                                path=d['path'], public_url=d['public_url'])
+            processed.append(p)
+
+        # trigger the deferred if have one, else call the msd with the data
+        if self._public_files_deferred is None:
+            self.msd.on_sd_public_files_list(processed)
+        else:
+            d = self._public_files_deferred
+            self._public_files_deferred = None
+            d.callback(processed)
+
+    def get_public_files(self):
+        """Ask the Public Files info to syncdaemon."""
+        client = DBusClient(self._bus, '/publicfiles',
+                            DBUS_IFACE_PUBLIC_FILES_NAME)
+
+        # note that these callbacks do not come with the requested info, the
+        # method just will return None, and the real info will come later
+        # in a signal
+
+        def call_done(result):
+            """Call was succesful."""
+            logger.debug("Public files asked ok.")
+
+        def call_error(error):
+            """Call was not succesful."""
+            logger.error("Public files asked with error: %s", error)
+
+        client.call_method('get_public_files',
+                           reply_handler=call_done, error_handler=call_error)
+
+        # return a stored deferred that will be triggered later with the signal
+        d = defer.Deferred()
+        self._public_files_deferred = d
+        return d
+
     @retryable
     def get_content_queue(self):
         """Get the content queue from SDT."""
@@ -293,7 +369,7 @@
         """Use MetaQueue dictionary and prepare command data."""
         if op in ('AccountInquiry', 'FreeSpaceInquiry', 'Query', 'ListShares',
                   'GetPublicFiles', 'ListVolumes', 'ChangePublicAccess',
-                  'AnswerShare'):
+                  'AnswerShare', 'GetDelta'):
             return QueueData(operation=op, path=None, node=None, share=None)
 
         if op in ('ListDir', 'Unlink'):
@@ -473,3 +549,19 @@
         d = self.sync_daemon_tool.get_metadata(path)
         d.addCallbacks(process, fix_failure)
         return d
+
+    @retryable
+    @defer.inlineCallbacks
+    def accept_share(self, share_id):
+        """Accept a share."""
+        logger.debug("Accept share %s started", share_id)
+        try:
+            result = yield self.sync_daemon_tool.accept_share(share_id)
+        except dbus.exceptions.DBusException, e:
+            error = str(e.args[0])
+            logger.debug("Accept share %s crashed: %s", share_id, error)
+            raise ShareOperationError(share_id=share_id, error=error)
+
+        logger.debug("Accept share %s finished: %s", share_id, result)
+        if 'error' in result:
+            raise ShareOperationError(share_id=share_id, error=result['error'])

=== modified file 'magicicada/helpers.py'
--- magicicada/helpers.py	2010-07-24 19:37:32 +0000
+++ magicicada/helpers.py	2011-01-07 23:06:32 +0000
@@ -1,21 +1,32 @@
 # -*- coding: utf-8 -*-
-### BEGIN LICENSE
-# This file is in the public domain
-### END LICENSE
+#
+# Author: Natalia Bidart <[e-mail]>
+#
+# Copyright 2010 Chicharreros
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Helpers for an Ubuntu application."""
 
 from __future__ import division
 
-__all__ = [
-    'make_window',
-    ]
-
-import gtk
+import logging
 import os
 
 from functools import wraps
 
+import gtk
+
 from magicicada.magicicadaconfig import get_data_file
 
 
@@ -39,7 +50,7 @@
     return builder
 
 
-def log(logger):
+def log(logger, level=logging.DEBUG):
     """Log input/ouput info for 'f' using 'logger'."""
 
     def decorator(f):
@@ -50,13 +61,14 @@
             """Wrap 'f', log input args and result using 'logger'."""
             name = f.__name__
             result = None
-            logger.debug("Calling '%s' with args '%s' and kwargs '%s'.",
-                         name, args, kwargs)
+            logger.log(level, "Calling '%s' with args '%s' and kwargs '%s'.",
+                       name, args, kwargs)
             try:
                 result = f(*args, **kwargs)
             except Exception:  # pylint: disable=W0703
                 logger.exception('%s failed with exception:', name)
-            logger.debug("Returning from '%s' with result '%s'.", name, result)
+            logger.log(level, "Returning from '%s' with result '%s'.",
+                       name, result)
             return result
 
         return inner
@@ -91,11 +103,11 @@
     '1.3 GB'
     """
     abbrevs = (
-        (1<<50L, 'PB'),
-        (1<<40L, 'TB'),
-        (1<<30L, 'GB'),
-        (1<<20L, 'MB'),
-        (1<<10L, 'kB'),
+        (1 << 50, 'PB'),
+        (1 << 40, 'TB'),
+        (1 << 30, 'GB'),
+        (1 << 20, 'MB'),
+        (1 << 10, 'kB'),
         (1, 'bytes'))
 
     if numbytes == 1:

=== modified file 'magicicada/logger.py'
--- magicicada/logger.py	2010-08-18 21:17:20 +0000
+++ magicicada/logger.py	2011-01-07 23:06:32 +0000
@@ -26,6 +26,7 @@
 
 from logging.handlers import RotatingFileHandler
 
+import twisted.python.log
 import xdg.BaseDirectory
 
 
@@ -37,21 +38,35 @@
         self.doRollover()
 
 
+def deferror_handler(data):
+    """Deferred error handler.
+
+    We receive all stuff here, filter the errors and use correct info. Note
+    that we don't send to stderr as Twisted already does that.
+    """
+    try:
+        failure = data['failure']
+    except KeyError:
+        msg = data['message']
+    else:
+        msg = failure.getTraceback()
+    logger = logging.getLogger('magicicada')
+    logger.error("Unhandled error in deferred!\n%s", msg)
+
+
 def exception_handler(exc_type, exc_value, tb):
     """Handle an unhandled exception."""
-    # stderr
     exception = traceback.format_exception(exc_type, exc_value, tb)
-    exception = "".join(exception)
-    print >> sys.stderr, exception
+    msg = "".join(exception)
+    print >> sys.stderr, msg
 
     # log
     logger = logging.getLogger('magicicada')
-    logger.error("Unhandled exception!\n%s", exception)
+    logger.error("Unhandled exception!\n%s", msg)
 
 
 def set_up():
     """Set up the logging."""
-
     # choose the folder to store the logs
     cache = xdg.BaseDirectory.xdg_cache_home
     logfolder = os.path.join(cache, 'magicicada')
@@ -62,11 +77,20 @@
     logger = logging.getLogger('magicicada')
     handler = CustomRotatingFH(logfile, maxBytes=1e6, backupCount=10)
     logger.addHandler(handler)
-    formatter = logging.Formatter("%(asctime)s %(name)-23s"
-                                  "%(levelname)-8s %(message)s",
-                                  '%Y-%m-%d %H:%M:%S')
+    formatter = logging.Formatter("%(asctime)s  %(name)-23s"
+                                  "%(levelname)-8s %(message)s")
     handler.setFormatter(formatter)
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(logging.INFO)
+
+    if os.getenv('DEBUG'):
+        console = logging.StreamHandler()
+        console.setLevel(logging.DEBUG)
+        console.setFormatter(formatter)
+        logger.addHandler(console)
+        logger.setLevel(logging.DEBUG)
 
     # hook the exception handler
     sys.excepthook = exception_handler
+
+    # hook the twisted observer
+    twisted.python.log.addObserver(deferror_handler)

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-09-02 18:23:02 +0000
+++ magicicada/syncdaemon.py	2011-01-07 23:06:32 +0000
@@ -23,13 +23,24 @@
 
 from twisted.internet import defer, reactor
 
-from magicicada.dbusiface import DBusInterface
+from magicicada.dbusiface import DBusInterface, ShareOperationError
 from magicicada.helpers import NO_OP
 
-
 # log!
 logger = logging.getLogger('magicicada.syncdaemon')
 
+# states for MQ and CQ handling bursts
+ASKING_IDLE, ASKING_YES, ASKING_LATER = range(3)
+
+
+def mandatory_callback(function_name):
+    """Log that the callback was not overwritten."""
+    def f(*a, **k):
+        """Fake callback."""
+        logger.warning("Callback called but was not assigned! "
+                       "%r called with %s %s", function_name, a, k)
+    return f
+
 
 class State(object):
     """Hold the state of SD."""
@@ -93,6 +104,7 @@
         self.shares_to_others = None
         self.content_queue = None
         self.meta_queue = None
+        self.public_files = None
 
         # callbacks for GUI to hook in
         self.status_changed_callback = NO_OP
@@ -107,8 +119,14 @@
         self.on_folders_changed_callback = NO_OP
         self.on_shares_to_me_changed_callback = NO_OP
         self.on_shares_to_others_changed_callback = NO_OP
-        self.on_metadata_ready_callback = None  # mandatory
+        self.on_metadata_ready_callback = mandatory_callback(
+                                                'on_metadata_ready_callback')
         self.on_initial_data_ready_callback = NO_OP
+        self.on_initial_online_data_ready_callback = NO_OP
+        self.on_share_op_success_callback = mandatory_callback(
+                                                'on_share_op_success_callback')
+        self.on_share_op_error_callback = mandatory_callback(
+                                                'on_share_op_error_callback')
 
         # mq needs to (maybe) be polled to know progress
         self._must_poll_mq = True
@@ -122,6 +140,10 @@
         else:
             self.current_state.set(is_started=False)
 
+        # mq and cq burst handling
+        self._cq_asking = ASKING_IDLE
+        self._mq_asking = ASKING_IDLE
+
     def shutdown(self):
         """Shut down the SyncDaemon."""
         logger.info("SyncDaemon interface going down")
@@ -134,7 +156,7 @@
     @defer.inlineCallbacks
     def _get_initial_data(self):
         """Get the initial SD data."""
-        logger.info("Getting initial data")
+        logger.info("Getting offline initial data")
 
         status_data = yield self.dbus.get_status()
         self._send_status_changed(*status_data)
@@ -150,10 +172,34 @@
         self.shares_to_me = yield self.dbus.get_shares_to_me()
         self.shares_to_others = yield self.dbus.get_shares_to_others()
 
-        # let frontend know that we have all the initial data
-        logger.info("All initial data is ready")
+        # let frontend know that we have all the initial offline data
+        logger.info("All initial offline data is ready")
         self.on_initial_data_ready_callback()
 
+        logger.info("Getting online initial data")
+        pf_list = yield self.dbus.get_public_files()
+        self.on_sd_public_files_list(pf_list)
+
+        # let frontend know that we have all the initial online data
+        logger.info("All initial online data is ready")
+        self.on_initial_online_data_ready_callback()
+
+    def on_sd_public_files_list(self, data):
+        """Set a new Public Files list."""
+        logger.info("Got new Public Files list (%d items)", len(data))
+        self.public_files = dict((d.node, d) for d in data)
+
+    def on_sd_public_files_changed(self, pf, is_public):
+        """Update the Public Files list."""
+        logger.info("Change in Public Files list! is_public=%s (volume=%s "
+                    "node=%s url=%s path=%r)", is_public, pf.volume, pf.node,
+                    pf.public_url, pf.path)
+        if is_public:
+            self.public_files[pf.node] = pf
+        else:
+            # remove it if there
+            self.public_files.pop(pf.node, None)
+
     @defer.inlineCallbacks
     def on_sd_shares_changed(self):
         """Shares changed, ask for new information."""
@@ -234,19 +280,47 @@
     @defer.inlineCallbacks
     def on_sd_content_queue_changed(self):
         """Content Queue changed, ask for new information."""
-        logger.info("SD Content Queue changed")
-        new_cq = yield self.dbus.get_content_queue()
-        if new_cq != self.content_queue:
-            logger.info("Content Queue info is new! %d items", len(new_cq))
-            self.content_queue = new_cq
-            self.content_queue_changed_callback(new_cq)
+        if self._cq_asking != ASKING_IDLE:
+            self._cq_asking = ASKING_LATER
+            logger.info("SD Content Queue changed, but already asking")
+            return
+
+        logger.info("SD Content Queue changed, asking for info")
+        self._cq_asking = ASKING_YES
+        while self._cq_asking != ASKING_IDLE:
+            new_cq = yield self.dbus.get_content_queue()
+            if new_cq != self.content_queue:
+                logger.info("Content Queue info is new! %d items", len(new_cq))
+                self.content_queue = new_cq
+                self.content_queue_changed_callback(new_cq)
+            if self._cq_asking == ASKING_LATER:
+                self._cq_asking = ASKING_YES
+            else:
+                self._cq_asking = ASKING_IDLE
 
     @defer.inlineCallbacks
     def on_sd_meta_queue_changed(self):
         """Meta Queue changed, ask for new information."""
-        logger.info("SD Meta Queue changed")
+        if self._mq_asking != ASKING_IDLE:
+            self._mq_asking = ASKING_LATER
+            logger.info("SD Meta Queue changed, but already asking")
+            return
+
+        logger.info("SD Meta Queue changed, asking for info")
         self._must_poll_mq = False
-        yield self._get_mq_data()
+        self._mq_asking = ASKING_YES
+        while self._mq_asking != ASKING_IDLE:
+            try:
+                yield self._get_mq_data()
+            except Exception:
+                # on any error, leave the state sane
+                self._mq_asking = ASKING_IDLE
+                raise
+
+            if self._mq_asking == ASKING_LATER:
+                self._mq_asking = ASKING_YES
+            else:
+                self._mq_asking = ASKING_IDLE
 
     @defer.inlineCallbacks
     def _get_mq_data(self):
@@ -274,6 +348,8 @@
             self._get_mq_data()
 
             if self._must_poll_mq:
+                # Module 'twisted.internet.reactor' has no 'callLater' member
+                # pylint: disable=E1101
                 self._mqcaller = reactor.callLater(self._mq_poll_time,
                                                    self._check_mq)
 
@@ -300,8 +376,27 @@
 
     def get_metadata(self, path):
         """Get the metadata for given path."""
-        if self.on_metadata_ready_callback is None:
-            raise ValueError("Missing the mandatory cback for get_metadata.")
-
         d = self.dbus.get_metadata(os.path.realpath(path))
         d.addCallback(lambda resp: self.on_metadata_ready_callback(path, resp))
+
+    def accept_share(self, share_id):
+        """Accept a share."""
+        def error(failure):
+            """Operation failed."""
+            if failure.check(ShareOperationError):
+                error = failure.value.error
+                logger.info("Accepting share %s finished with error: %s",
+                            share_id, error)
+                self.on_share_op_error_callback(share_id, error)
+            else:
+                logger.error("Unexpected error when accepting share %s: %s %s",
+                             share_id, failure.type, failure.value)
+
+        def success(_):
+            """Operation finished ok."""
+            logger.info("Accepting share %s finished successfully", share_id)
+            self.on_share_op_success_callback(share_id)
+
+        logger.info("Accepting share %s started", share_id)
+        d = self.dbus.accept_share(share_id)
+        d.addCallbacks(success, error)

=== modified file 'magicicada/tests/helpers.py'
--- magicicada/tests/helpers.py	2010-08-18 21:04:16 +0000
+++ magicicada/tests/helpers.py	2011-01-07 23:06:32 +0000
@@ -28,6 +28,7 @@
         """Create the instance, and add a records attribute."""
         logging.Handler.__init__(self, *args, **kwargs)
         self.records = []
+        self.debug = False
 
     def emit(self, record):
         """Just add the record to self.records."""
@@ -36,18 +37,26 @@
     def check(self, level, *msgs):
         """Check that something is logged."""
         for rec in self.records:
-            if rec.levelname == level and all(m in rec.message for m in msgs):
+            if rec.levelno == level and all(m in rec.message for m in msgs):
                 return True
+        if self.debug:
+            recorded = [(logging.getLevelName(r.levelno), r.message)
+                        for r in self.records]
+            print "Memento messages:", recorded
         return False
 
     def check_error(self, *msgs):
         """Shortcut for ERROR check."""
-        return self.check('ERROR', *msgs)
+        return self.check(logging.ERROR, *msgs)
+
+    def check_warning(self, *msgs):
+        """Shortcut for WARNING check."""
+        return self.check(logging.WARNING, *msgs)
 
     def check_info(self, *msgs):
         """Shortcut for INFO check."""
-        return self.check('INFO', *msgs)
+        return self.check(logging.INFO, *msgs)
 
     def check_debug(self, *msgs):
         """Shortcut for DEBUG check."""
-        return self.check('DEBUG', *msgs)
+        return self.check(logging.DEBUG, *msgs)

=== modified file 'magicicada/tests/test_dbusiface.py'
--- magicicada/tests/test_dbusiface.py	2010-08-23 16:48:07 +0000
+++ magicicada/tests/test_dbusiface.py	2011-01-07 23:06:32 +0000
@@ -27,11 +27,38 @@
 from magicicada import dbusiface
 from magicicada.tests.helpers import MementoHandler
 
+try:
+    # yes, they can be imported! pylint: disable=F0401,E0611
+    from ubuntuone.platform.dbus_interface import DBUS_IFACE_PUBLIC_FILES_NAME
+except ImportError:
+    # support for old structure (pre-Natty)
+    # yes, they can be imported! pylint: disable=F0401,E0611
+    from ubuntuone.syncdaemon.dbus_interface import (
+        DBUS_IFACE_PUBLIC_FILES_NAME,
+    )
+
 
 # It's ok to access private data in the test suite
 # pylint: disable=W0212
 
 
+class FakeDBusClient(object):
+    """Fake DBusClient, but with different behaviour at instantiation time."""
+
+    def __init__(self, *args):
+        self.init_args = None
+        self.method_call_args = None
+
+    def call_method(self, *args, **kwargs):
+        """Record the arguments of the method call."""
+        self.method_call_args = args, kwargs
+
+    def __call__(self, *args):
+        """Simulate instantiation."""
+        self.init_args = args
+        return self
+
+
 class FakeSessionBus(object):
     """Fake Session Bus."""
 
@@ -59,6 +86,9 @@
         else:
             raise self.fake_name_owner
 
+    def send_message_with_reply(self, *a, **k):
+        """Fake."""
+
 
 class CallLoguer(object):
     """Class that logs the methods called."""
@@ -104,6 +134,12 @@
 
     def setUp(self):
         """Set up."""
+        self.handler = MementoHandler()
+        self.handler.setLevel(logging.DEBUG)
+        logger = logging.getLogger('magicicada.dbusiface')
+        logger.addHandler(self.handler)
+        logger.setLevel(logging.DEBUG)
+
         dbusiface.SessionBus = FakeSessionBus
         dbusiface.SyncDaemonTool = FakeSDTool
         self.fsd = FakeSyncDaemon()
@@ -199,6 +235,17 @@
         self.assertEqual(self._get_hooked('Shares', 'ShareChanged'),
                          self.dbus._on_share_changed)
 
+    def test_public_files_list(self):
+        """Test public files list callback."""
+        self.assertEqual(self._get_hooked('PublicFiles', 'PublicFilesList'),
+                         self.dbus._on_public_files_list)
+
+    def test_public_files_changed(self):
+        """Test public files changed callback."""
+        self.assertEqual(self._get_hooked('PublicFiles',
+                         'PublicAccessChanged'),
+                         self.dbus._on_public_files_changed)
+
 
 class TestSimpleCalls(SafeTests):
     """Tests for some simple calls."""
@@ -263,13 +310,13 @@
         self.dbus._on_name_owner_changed("foo", "bar", "baz")
         self.get_msd_called(None)
 
-    def test_name_owner_changed_yes_syncdaemon_TF(self):
+    def test_name_owner_changed_yes_syncdaemon_true_false(self):
         """Test name owner changed callback."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "T", "")
         rcv, = self.get_msd_called("on_sd_name_owner_changed")
         self.assertEqual(rcv, False)
 
-    def test_name_owner_changed_yes_syncdaemon_FT(self):
+    def test_name_owner_changed_yes_syncdaemon_false_true(self):
         """Test name owner changed callback."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "", "T")
         rcv, = self.get_msd_called("on_sd_name_owner_changed")
@@ -279,11 +326,16 @@
 class TestDataProcessingCQ(SafeTests):
     """Process CQ data before sending it to SyncDaemon."""
 
-    def test_content_queue_changed_signal(self):
-        """Test content queue changed signal."""
+    def test_content_queue_changed_signal_withsomething(self):
+        """Test content queue changed signal, old version with data."""
         self.dbus._on_content_queue_changed(None)
         self.get_msd_called("on_sd_content_queue_changed")
 
+    def test_content_queue_changed_signal_nodata(self):
+        """Test content queue changed signal new version (just the signal)."""
+        self.dbus._on_content_queue_changed()
+        self.get_msd_called("on_sd_content_queue_changed")
+
     @defer.inlineCallbacks
     def test_nodata(self):
         """Test with no data in the queue."""
@@ -371,7 +423,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_GetPublicFiles_old(self):
+    def test_getpublicfiles_old(self):
         """Test meta with GetPublicFiles."""
         cmd = 'GetPublicFiles'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -383,7 +435,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AccountInquiry_old(self):
+    def test_accountinquiry_old(self):
         """Test meta with AccountInquiry."""
         cmd = 'AccountInquiry'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -395,7 +447,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_FreeSpaceInquiry_old(self):
+    def test_freespaceinquiry_old(self):
         """Test meta with FreeSpaceInquiry."""
         cmd = 'FreeSpaceInquiry'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -407,7 +459,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListShares_old(self):
+    def test_listshares_old(self):
         """Test meta with ListShares."""
         cmd = 'ListShares'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -419,7 +471,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListVolumes_old(self):
+    def test_listvolumes_old(self):
         """Test meta with ListVolumes."""
         cmd = 'ListVolumes'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -431,7 +483,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Query_old(self):
+    def test_query_old(self):
         """Test meta with Query."""
         cmd = 'Query'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -443,7 +495,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListDir_old(self):
+    def test_listdir_old(self):
         """Test meta with ListDir."""
         cmd = 'ListDir(share_id=a, node_id=b, server_hash=c)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -455,7 +507,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_MakeDir_old(self):
+    def test_makedir_old(self):
         """Test meta with MakeDir."""
         cmd = 'MakeDir(share_id=a, parent_id=b, name=c, marker=d)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -467,7 +519,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_MakeFile_old(self):
+    def test_makefile_old(self):
         """Test meta with MakeFile."""
         cmd = 'MakeFile(share_id=a, parent_id=b, name=c, marker=d)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -479,7 +531,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Unlink_old(self):
+    def test_unlink_old(self):
         """Test meta with Unlink."""
         cmd = 'Unlink(share_id=a, node_id=b, server_hash=c)'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -491,7 +543,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_Move_old(self):
+    def test_move_old(self):
         """Test meta with Move."""
         cmd = 'Move(share_id=a, node_id=b, old_parent_id=c, '\
               'new_parent_id=d, new_name=e)'
@@ -504,7 +556,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_ChangePublicAccess_old(self):
+    def test_changepublicaccess_old(self):
         """Test meta with ChangePublicAccess."""
         cmd = 'ChangePublicAccess'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -516,7 +568,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AnswerShare_old(self):
+    def test_answershare_old(self):
         """Test meta with AnswerShare."""
         cmd = 'AnswerShare'
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -528,7 +580,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_GetPublicFiles_dict(self):
+    def test_getpublicfiles_dict(self):
         """Test meta with GetPublicFiles."""
         cmd = ('GetPublicFiles', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -540,7 +592,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AccountInquiry_dict(self):
+    def test_accountinquiry_dict(self):
         """Test meta with AccountInquiry."""
         cmd = ('AccountInquiry', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -552,7 +604,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_FreeSpaceInquiry_dict(self):
+    def test_freespaceinquiry_dict(self):
         """Test meta with FreeSpaceInquiry."""
         cmd = ('FreeSpaceInquiry', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -564,7 +616,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListShares_dict(self):
+    def test_listshares_dict(self):
         """Test meta with ListShares."""
         cmd = ('ListShares', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -576,7 +628,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListVolumes_dict(self):
+    def test_listvolumes_dict(self):
         """Test meta with ListVolumes."""
         cmd = ('ListVolumes', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -588,7 +640,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Query_dict(self):
+    def test_query_dict(self):
         """Test meta with Query."""
         cmd = ('Query', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -600,7 +652,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_ListDir_dict(self):
+    def test_listdir_dict(self):
         """Test meta with ListDir."""
         cmd = ('ListDir', dict(share_id='a', node_id='b',
                                server_hash='c', path='d'))
@@ -613,7 +665,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_MakeDir_dict(self):
+    def test_makedir_dict(self):
         """Test meta with MakeDir."""
         cmd = ('MakeDir', dict(share_id='a', parent_id='b',
                                name='c', marker='d'))
@@ -626,7 +678,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_MakeFile_dict(self):
+    def test_makefile_dict(self):
         """Test meta with MakeFile."""
         cmd = ('MakeFile', dict(share_id='a', parent_id='b',
                                 name='c', marker='d'))
@@ -639,7 +691,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_Unlink_dict(self):
+    def test_unlink_dict(self):
         """Test meta with Unlink."""
         cmd = ('Unlink', dict(share_id='a', node_id='b',
                               server_hash='c', path='d'))
@@ -652,7 +704,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_Move_dict(self):
+    def test_move_dict(self):
         """Test meta with Move."""
         cmd = ('Move', dict(share_id='a', node_id='b', old_parent_id='c',
                             new_parent_id='d', new_name='e', path='f'))
@@ -665,7 +717,7 @@
         self.assertEqual(data.node, 'b')
 
     @defer.inlineCallbacks
-    def test_ChangePublicAccess_dict(self):
+    def test_changepublicaccess_dict(self):
         """Test meta with ChangePublicAccess."""
         cmd = ('ChangePublicAccess', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -677,7 +729,7 @@
         self.assertEqual(data.node, None)
 
     @defer.inlineCallbacks
-    def test_AnswerShare_dict(self):
+    def test_answershare_dict(self):
         """Test meta with AnswerShare."""
         cmd = ('AnswerShare', {})
         self.fake_sdt_response('waiting_metadata', [cmd])
@@ -688,6 +740,18 @@
         self.assertEqual(data.share, None)
         self.assertEqual(data.node, None)
 
+    @defer.inlineCallbacks
+    def test_getdelta(self):
+        """Test meta with AnswerShare."""
+        cmd = ('GetDelta', {})
+        self.fake_sdt_response('waiting_metadata', [cmd])
+        rcv = yield self.dbus.get_meta_queue()
+        data = rcv[0]
+        self.assertEqual(data.operation, 'GetDelta')
+        self.assertEqual(data.path, None)
+        self.assertEqual(data.share, None)
+        self.assertEqual(data.node, None)
+
 
 class TestDataProcessingFolders(SafeTests):
     """Process Folders data before sending it to SyncDaemon."""
@@ -910,6 +974,138 @@
         self.assertEqual(share.volume_id, 'vol')
 
 
+class TestPublicFiles(SafeTests):
+    """PublicFiles data handling and related services."""
+
+    def test_public_files_changed_yes(self):
+        """Call the changed callback."""
+        d = dict(share_id='share', node_id='node', is_public='True',
+                 public_url='url', path='path')
+        self.dbus._on_public_files_changed(d)
+        pf, is_public = self.get_msd_called("on_sd_public_files_changed")
+        self.assertEqual(pf.volume, 'share')
+        self.assertEqual(pf.node, 'node')
+        self.assertEqual(pf.public_url, 'url')
+        self.assertEqual(pf.path, 'path')
+        self.assertEqual(is_public, True)
+
+    def test_public_files_changed_no(self):
+        """Call the changed callback."""
+        d = dict(share_id='share', node_id='node', is_public='',
+                 public_url='url', path='path')
+        self.dbus._on_public_files_changed(d)
+        pf, is_public = self.get_msd_called("on_sd_public_files_changed")
+        self.assertEqual(pf.volume, 'share')
+        self.assertEqual(pf.node, 'node')
+        self.assertEqual(pf.public_url, 'url')
+        self.assertEqual(pf.path, 'path')
+        self.assertEqual(is_public, False)
+
+    def test_public_files_empty(self):
+        """Call the callback without info."""
+        self.dbus._on_public_files_list([])
+        res, = self.get_msd_called("on_sd_public_files_list")
+        self.assertEqual(res, [])
+
+    def test_public_files_one(self):
+        """Call the callback with a public file."""
+        d = dict(volume_id='volume', node_id='node',
+                 public_url='url', path='path')
+        self.dbus._on_public_files_list([d])
+        res, = self.get_msd_called("on_sd_public_files_list")
+        self.assertEqual(len(res), 1)
+        pf = res[0]
+        self.assertEqual(pf.volume, 'volume')
+        self.assertEqual(pf.node, 'node')
+        self.assertEqual(pf.public_url, 'url')
+        self.assertEqual(pf.path, 'path')
+
+    def test_public_files_more(self):
+        """Call the callback with a mixed content."""
+        d1 = dict(volume_id='volume1', node_id='node1',
+                  public_url='url1', path='path1')
+        d2 = dict(volume_id='volume2', node_id='node2',
+                  public_url='url2', path='path2')
+        d3 = dict(volume_id='volume3', node_id='node3',
+                  public_url='url3', path='path3')
+        self.dbus._on_public_files_list([d1, d2, d3])
+        res, = self.get_msd_called("on_sd_public_files_list")
+        self.assertEqual(len(res), 3)
+        pf = res[0]
+        self.assertEqual(pf.volume, 'volume1')
+        self.assertEqual(pf.node, 'node1')
+        self.assertEqual(pf.public_url, 'url1')
+        self.assertEqual(pf.path, 'path1')
+        pf = res[1]
+        self.assertEqual(pf.volume, 'volume2')
+        self.assertEqual(pf.node, 'node2')
+        self.assertEqual(pf.public_url, 'url2')
+        self.assertEqual(pf.path, 'path2')
+        pf = res[2]
+        self.assertEqual(pf.volume, 'volume3')
+        self.assertEqual(pf.node, 'node3')
+        self.assertEqual(pf.public_url, 'url3')
+        self.assertEqual(pf.path, 'path3')
+
+    def test_getpublicfiles_deferred(self):
+        """The method should return a deferred and store it."""
+        d = self.dbus.get_public_files()
+        self.assertTrue(isinstance(d, defer.Deferred))
+        self.assertIdentical(d, self.dbus._public_files_deferred)
+
+    @defer.inlineCallbacks
+    def test_public_files_when_asked(self):
+        """If we receive the signal and data was asked, change behaviour."""
+        # set up stuff
+        d = defer.Deferred()
+        self.dbus._public_files_deferred = d
+
+        # call the signal
+        self.dbus._on_public_files_list([])
+
+        # check that the deferred was callbacked, and not the normal SD method
+        result = yield d
+        self.assertEqual(result, [])
+        self.assertTrue(self.fsd._called_method[0] is None)
+
+    def test_getpublicfiles_asktoclient_ok(self):
+        """The info was requested to the DBusClient, and was ok."""
+        # inject a different DBusClient
+        fake_dbusclient = FakeDBusClient()
+        self.patch(dbusiface, 'DBusClient', fake_dbusclient)
+
+        # call, and check init and method args
+        self.dbus.get_public_files()
+        self.assertEqual(fake_dbusclient.init_args, (self.dbus._bus,
+                                '/publicfiles', DBUS_IFACE_PUBLIC_FILES_NAME))
+        (method_name,), kwargs = fake_dbusclient.method_call_args
+        done_cback = kwargs['reply_handler']
+        self.assertEqual(method_name, 'get_public_files')
+
+        # trigger done callback and check logging
+        done_cback(None)
+        self.assertTrue(self.handler.check_debug("Public files asked ok."))
+
+    def test_getpublicfiles_asktoclient_error(self):
+        """The info was requested to the DBusClient, and was not ok."""
+        # inject a different DBusClient
+        fake_dbusclient = FakeDBusClient()
+        self.patch(dbusiface, 'DBusClient', fake_dbusclient)
+
+        # call, and check init and method args
+        self.dbus.get_public_files()
+        self.assertEqual(fake_dbusclient.init_args, (self.dbus._bus,
+                                '/publicfiles', DBUS_IFACE_PUBLIC_FILES_NAME))
+        (method_name,), kwargs = fake_dbusclient.method_call_args
+        error_cback = kwargs['error_handler']
+        self.assertEqual(method_name, 'get_public_files')
+
+        # trigger error callback and check logging
+        error_cback('foo')
+        self.assertTrue(self.handler.check_error(
+                        "Public files asked with error: foo"))
+
+
 class TestToolActions(SafeTests):
     """Actions against SD.tools.
 
@@ -944,8 +1140,10 @@
     def setUp(self):
         """Set up."""
         self.handler = MementoHandler()
-        logging.getLogger('magicicada.dbusiface').addHandler(self.handler)
         self.handler.setLevel(logging.DEBUG)
+        logger = logging.getLogger('magicicada.dbusiface')
+        logger.addHandler(self.handler)
+        logger.setLevel(logging.DEBUG)
         SafeTests.setUp(self)
 
     def test_instancing(self):
@@ -1052,13 +1250,13 @@
         self.assertTrue(self.handler.check_info("Received Name Owner changed"))
         self.assertTrue(self.handler.check_debug("Name Owner data: u'' u'T'"))
 
-    def test_name_owner_changed_yes_syncdaemon_TF(self):
+    def test_name_owner_changed_yes_syncdaemon_true_false(self):
         """Test name owner changed callback, SD value bad."""
         self.dbus._on_name_owner_changed("com.ubuntuone.SyncDaemon", "F", "T")
         self.assertTrue(self.handler.check_info("Received Name Owner changed"))
         self.assertTrue(self.handler.check_debug("Name Owner data: u'F' u'T'"))
-        self.assertTrue(self.handler.check("ERROR",
-                        "Name Owner invalid data: Same bool in old and new!"))
+        msg = "Name Owner invalid data: Same bool in old and new!"
+        self.assertTrue(self.handler.check_error(msg))
 
     def test_folder_created_changed(self):
         """Test folder created changed callback."""
@@ -1091,12 +1289,32 @@
         self.dbus._on_share_deleted("foo")
         self.assertTrue(self.handler.check_info("Received Share deleted"))
 
-    def test_share__changed(self):
+    def test_share_changed(self):
         """Test share changed callback."""
         self.dbus._on_share_changed("foo")
         self.assertTrue(self.handler.check_info("Received Share changed"))
 
     @defer.inlineCallbacks
+    def test_public_files_list(self):
+        """Test public files list callback."""
+        d = dict(volume_id='volume', node_id='node',
+                 public_url='url', path='path')
+        yield self.dbus._on_public_files_list([d])
+        self.assertTrue(self.handler.check_info(
+                        "Received Public Files list (1)"))
+        self.assertTrue(self.handler.check_debug(
+                        "    Public Files data: %s" % d))
+
+    @defer.inlineCallbacks
+    def test_public_files_changed(self):
+        """Test public files changed callback."""
+        d = dict(share_id='volume', node_id='node', is_public='',
+                 public_url='url', path='path')
+        yield self.dbus._on_public_files_changed(d)
+        self.assertTrue(self.handler.check_debug(
+                        "Received Public Files changed: %s" % d))
+
+    @defer.inlineCallbacks
     def test_content_queue_processing(self):
         """Test with one item in the queue."""
         c = dict(operation='oper', path='path', share='share', node='node')
@@ -1270,3 +1488,52 @@
         d.addCallbacks(lambda _: deferred.errback(Exception()),
                        lambda _: deferred.callback(True))
         return deferred
+
+
+class TestHandlingShares(SafeTests):
+    """Handle shares."""
+
+    @defer.inlineCallbacks
+    def test_accept_share_ok(self):
+        """Accepting share finishes ok."""
+        d = dict(volume_id='foo', answer='bar')
+        self.fake_sdt_response('accept_share', d)
+        yield self.dbus.accept_share('foo')
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo started", "foo"))
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo finished", str(d)))
+
+    @defer.inlineCallbacks
+    def test_accept_share_bad(self):
+        """Accepting share finishes bad."""
+        d = dict(volume_id='foo', answer='bar', error='baz')
+        self.fake_sdt_response('accept_share', d)
+        try:
+            yield self.dbus.accept_share('foo')
+        except dbusiface.ShareOperationError, e:
+            self.assertEqual(e.share_id, 'foo')
+            self.assertEqual(e.error, 'baz')
+        else:
+            raise Exception("Test should have raised an exception")
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo started", "foo"))
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo finished", str(d)))
+
+    @defer.inlineCallbacks
+    def test_accept_share_ugly_error(self):
+        """Accepting share went really bad."""
+        e = dbus.exceptions.DBusException('ugly!')
+        self.fake_sdt_response('accept_share', e)
+        try:
+            yield self.dbus.accept_share('foo')
+        except dbusiface.ShareOperationError, e:
+            self.assertEqual(e.share_id, 'foo')
+            self.assertEqual(e.error, "ugly!")
+        else:
+            raise Exception("Test should have raised an exception")
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo started", "foo"))
+        self.assertTrue(self.handler.check_debug(
+                        "Accept share foo crashed", "ugly!"))

=== modified file 'magicicada/tests/test_logger.py'
--- magicicada/tests/test_logger.py	2010-08-18 21:17:20 +0000
+++ magicicada/tests/test_logger.py	2011-01-07 23:06:32 +0000
@@ -23,7 +23,9 @@
 import sys
 import unittest
 
-from magicicada.logger import exception_handler
+from twisted.python import log, failure
+
+from magicicada.logger import exception_handler, deferror_handler
 from magicicada.tests.helpers import MementoHandler
 
 
@@ -81,3 +83,35 @@
         shown = fh.getvalue()
         self.assertTrue("Traceback" in shown)
         self.assertTrue("ZeroDivisionError" in shown)
+
+
+class DeferredTests(unittest.TestCase):
+    """Error logging when it happened inside deferreds."""
+
+    def test_observer_added(self):
+        """Test that the observer was added to Twisted logging."""
+        self.assertTrue(deferror_handler in log.theLogPublisher.observers)
+
+    def test_noerror(self):
+        """No error, no action."""
+        handler = MementoHandler()
+        handler.setLevel(logging.DEBUG)
+        deferror_handler(dict(isError=False, message=''))
+        self.assertFalse(handler.check_error("error"))
+
+    def test_message(self):
+        """Just a message."""
+        handler = MementoHandler()
+        handler.setLevel(logging.DEBUG)
+        deferror_handler(dict(isError=True, message="foobar"))
+        self.assertFalse(handler.check_error("Unhandled error in deferred",
+                                             "foobar"))
+
+    def test_failure(self):
+        """Received a full failure."""
+        handler = MementoHandler()
+        handler.setLevel(logging.DEBUG)
+        f = failure.Failure(ValueError('foobar'))
+        deferror_handler(dict(isError=True, failure=f, message=''))
+        self.assertFalse(handler.check_error("Unhandled error in deferred",
+                                             "ValueError", "foobar"))

=== modified file 'magicicada/tests/test_magicicada.py'
--- magicicada/tests/test_magicicada.py	2010-08-21 16:58:46 +0000
+++ magicicada/tests/test_magicicada.py	2011-01-07 23:06:32 +0000
@@ -32,9 +32,9 @@
 from twisted.trial.unittest import TestCase
 
 from magicicada import MagicicadaUI, CONTENT_QUEUE, META_QUEUE, \
-                       UBUNTU_ONE_ROOT, syncdaemon
+    NOT_SYNCHED_PATH, UBUNTU_ONE_ROOT, syncdaemon
 from magicicada.dbusiface import QueueData, FolderData, ShareData, \
-                                 NOT_SYNCHED_PATH
+    PublicFilesData
 from magicicada.helpers import NO_OP, humanize_bytes, get_data_file
 from magicicada.tests.helpers import MementoHandler
 
@@ -52,6 +52,25 @@
 # pylint: disable=E1103
 
 
+SAMPLE_PUBLIC_FILES = {
+    u'4d0ffa01-5375-4e67-bc47-d993b721d8af':
+    PublicFilesData(volume=u'',
+                    node=u'4d0ffa01-5375-4e67-bc47-d993b721d8af',
+                    path=u'/home/user/Ubuntu One/test.png',
+                    public_url=u'http://ubuntuone.com/p/CUG/'),
+    u'1be1ea29-426e-41b3-8853-5cce03b0c511':
+    PublicFilesData(volume=u'',
+                    node=u'1be1ea29-426e-41b3-8853-5cce03b0c511',
+                    path=u'/home/user/Ubuntu One/public/text.txt',
+                    public_url=u'http://ubuntuone.com/p/6TX/'),
+    u'8dba0484-86e9-4505-8fba-db3db7cc551d':
+    PublicFilesData(volume=u'f5cc6b0d-85a0-4046-a72f-bd42c41538cb',
+                    node=u'8dba0484-86e9-4505-8fba-db3db7cc551d',
+                    path=u'/home/user/udf0/yadda.py',
+                    public_url=u'http://ubuntuone.com/p/U4R/'),
+}
+
+
 def process_gtk_pendings():
     """Process all gtk pending events."""
     while gtk.events_pending():
@@ -101,8 +120,13 @@
         self.content_queue_changed_callback = NO_OP
         self.meta_queue_changed_callback = NO_OP
         self.on_metadata_ready_callback = None  # mandatory
+        self.on_initial_data_ready_callback = NO_OP
+        self.on_initial_online_data_ready_callback = NO_OP
         self.shutdown = NO_OP
 
+        # Lambda may not be necessary
+        # pylint: disable=W0108
+
         self.start = lambda: setattr(self.current_state, 'is_started', True)
         self.quit = lambda: setattr(self.current_state, 'is_started', False)
         self.connect = lambda: setattr(self.current_state,
@@ -116,6 +140,7 @@
     """UI test cases for Magicicada UI."""
 
     TEST_FILE = get_data_file('tests', 'metadata-test.txt')
+    data_type = mapping = store = view = None
 
     def setUp(self):
         """Init."""
@@ -155,30 +180,6 @@
         else:
             return TestCase.__getattribute__(self, name)
 
-        if self._failed_test:
-            # no, I'm not raising a bool. pylint: disable=E0702
-            raise self._failed_test
-
-    def __getattribute__(self, name):
-        """Overwrite the assert methods with safer ones.
-
-        This way if a test called by gobject in the future fails, it
-        makes the whole test suite fail.
-        """
-        if name.startswith('assert') and hasattr(TestCase, name):
-
-            def proxy(*args, **kwargs):
-                """Function that will call the real assert."""
-                real_assert = getattr(TestCase, name)
-                try:
-                    real_assert(self, *args, **kwargs)
-                except Exception, e:
-                    self._failed_test = e
-                    raise
-            return proxy
-        else:
-            return TestCase.__getattribute__(self, name)
-
     def do_start(self):
         """Simulate that start fully happened."""
         self.ui.on_start_clicked(self.ui.start)
@@ -190,41 +191,56 @@
         self.ui.on_connect_clicked(self.ui.connect)
         self.ui.on_connected()
 
-    def build_some_data(self, data_type, limit=5):
+    def build_some_data(self, limit=5):
         """Build some data using named_tuple 'data_type'."""
-        attrs = data_type._fields
+        assert self.data_type is not None, 'class muct provide a data_type'
+
+        attrs = self.data_type._fields
         result = []
         for i in xrange(limit):
             kwargs = dict([(attr, '%s %i' % (attr, i)) for attr in attrs])
-            result.append(data_type(**kwargs))
+            # self.data_type is not callable, pylint: disable=E1102
+            result.append(self.data_type(**kwargs))
         return result
 
-    def assert_store_correct(self, store, items, mapping, markup=None):
-        """Test that 'store' has 'items' as content."""
+    def assert_store_correct(self, items, markup=None):
+        """Test that 'self.store' has 'items' as content."""
+        assert self.mapping is not None, 'class must provide a mapping'
+        assert self.store is not None, 'class must provide a store'
+
         msg = 'amount of rows for %s must be %s (got %s).'
-        self.assertEqual(len(store), len(items),
-                         msg % (store, len(items), len(store)))
+        self.assertEqual(len(self.store), len(items),
+                         msg % (self.store, len(items), len(self.store)))
 
         # assert rows content equal to items content
-        tree_iter = store.get_iter_root()
+        tree_iter = self.store.get_iter_root()
         tmp = list(reversed(items))
         do_markup = markup is not None
         msg = "column %i ('%s') must be '%s' (got '%s' instead)"
         while tree_iter is not None:
             head = tmp.pop()
-            for i, field in mapping:
-                actual, = store.get(tree_iter, i)
+            for i, field in self.mapping:
+                actual, = self.store.get(tree_iter, i)
                 expected = getattr(head, field)
-                if store.get_column_type(i).name == 'gboolean':
+                if self.store.get_column_type(i).name == 'gboolean':
                     expected = bool(expected)
                 elif do_markup:
                     expected = markup(expected)
                 self.assertEqual(expected, actual,
                                  msg % (i, field, expected, actual))
 
-            tree_iter = store.iter_next(tree_iter)
+            tree_iter = self.store.iter_next(tree_iter)
             do_markup = False  # only for first row
 
+    def debug_store(self):
+        """Print the whole content of a store."""
+        store_iter = self.store.get_iter_root()
+        columns = self.store.get_n_columns()
+        print '\nShowing contents of store:', self.store
+        while store_iter is not None:
+            print self.store.get(store_iter, *range(columns))
+            store_iter = self.store.iter_next(store_iter)
+
     def assert_indicator_disabled(self, indicator):
         """Test that 'indicator' is not sensitive."""
         self.assertFalse(indicator.is_sensitive(),
@@ -283,7 +299,41 @@
         msg = '%s must not skip taskbar.'
         self.assertFalse(dialog.get_skip_taskbar_hint(), msg % dialog_name)
 
-        self.assertEqual(dialog.get_icon(), self.ui._icon)
+    def assert_sort_order_correct(self, column, idx, expected_order):
+        """Check that sort order is correctly set for 'self.store'."""
+        assert self.store is not None, 'class must provide a store'
+
+        msg0 = 'Store sort id must be %r (got %r instead).'
+        msg1 = 'Store sort order must be %r (got %r instead).'
+        msg3 = 'Column sort order must be %r (got %r instead).'
+
+        actual_id, actual_order = self.store.get_sort_column_id()
+
+        # store sort column id and order
+        self.assertEqual(idx, actual_id, msg0 % (idx, actual_id))
+        self.assertEqual(expected_order, actual_order,
+                         msg1 % (expected_order, actual_order))
+
+        # column sort order
+        actual_order = column.get_sort_order()
+        self.assertEqual(expected_order, actual_order,
+                         msg3 % (expected_order, actual_order))
+
+    def assert_sort_indicator_correct(self, column):
+        """Check that sort indicator is correctly set."""
+        assert self.view is not None, 'class must provide a view'
+
+        msg = 'Column %s must have sort indicator %s.'
+        colname = column.get_name()
+        # column sort indicator
+        self.assertTrue(column.get_sort_indicator(), msg % (colname, 'on'))
+
+        # all the other columns must not have the sort indicator on
+        for other_column in self.view.get_columns():
+            if other_column.get_name() == colname:
+                continue
+            self.assertFalse(other_column.get_sort_indicator(),
+                             msg % (other_column.get_name(), 'off'))
 
 
 class MagicicadaUIBasicTestCase(MagicicadaUITestCase):
@@ -305,10 +355,16 @@
         """UI can be created and main_window is visible."""
         self.assertTrue(self.ui.widget_is_visible(self.ui.main_window))
 
-    def test_windows_have_correct_icon(self):
+    def test_main_window_have_correct_icon_list(self):
         """Every window has the icon set."""
-        for w in self.ui.windows:
-            self.assertEqual(w.get_icon(), self.ui._icon)
+        self.assertEqual(len(self.ui.main_window.get_icon_list()),
+                         len(self.ui._icons.values()))
+
+    def test_every_window_has_correct_list(self):
+        """The default icon list is set."""
+        self.patch(gtk, 'window_set_default_icon_list', self._set_called)
+        MagicicadaUI(syncdaemon_class=FakedSyncdaemon)
+        self.assertEqual(len(self._called[0]), len(self.ui._icons.values()))
 
     def test_start_connect_are_visible(self):
         """Start and Connect buttons are visible."""
@@ -456,6 +512,8 @@
     """Abstratc UI test cases for queue tree views."""
 
     name = None
+    data_type = QueueData
+    mapping = enumerate(['operation', 'path', 'share', 'node'])
 
     def setUp(self):
         """Init."""
@@ -468,15 +526,8 @@
                                   'on_%s_queue_changed' % self.name)
         self.set_sd_queue = lambda q: \
                             setattr(self.ui.sd, '%s_queue' % self.name, q)
-        self.queue_store = getattr(self.ui, '%sq_store' % self.name)
-        self.queue_view = getattr(self.ui, '%sq_view' % self.name)
-
-    def build_some_data(self, limit=5):
-        """Build some data to act as queue data."""
-        kwargs = dict(data_type=QueueData, limit=limit)
-        res = super(_MagicicadaUIQueueTestCase, self).build_some_data(**kwargs)
-        # operation path share node
-        return res
+        self.store = getattr(self.ui, '%sq_store' % self.name)
+        self.view = getattr(self.ui, '%sq_view' % self.name)
 
     def expected_markup(self, value):
         """Return the markup for row at index 'i'."""
@@ -491,10 +542,9 @@
                  if must_highlight and value is not None else value
         return result
 
-    def assert_store_correct(self, store, items):
+    def assert_store_correct(self, items):
         """Test that 'store' has 'items' as content."""
-        mapping = enumerate(['operation', 'path', 'share', 'node'])
-        args = (store, items, mapping, self.expected_markup)
+        args = (items, self.expected_markup)
         super(_MagicicadaUIQueueTestCase, self).assert_store_correct(*args)
 
     def assert_current_processing_row_is_different(self):
@@ -508,8 +558,8 @@
         markup = self.expected_markup
         expected = tuple(markup(getattr(item, attr)) for attr in attrs)
 
-        iter_root = self.queue_store.get_iter_root()
-        actual = self.queue_store.get(iter_root, *xrange(len(attrs)))
+        iter_root = self.store.get_iter_root()
+        actual = self.store.get(iter_root, *xrange(len(attrs)))
 
         msg = 'first row for %s queue must be %s (got %s instead)' % \
               (self.name, expected, actual)
@@ -524,30 +574,30 @@
     @skip_abstract_class
     def test_model_is_binded(self):
         """List store is binded."""
-        actual = self.queue_view.get_model()
+        actual = self.view.get_model()
         msg = 'model for view %s differs from %s'
-        self.assertEqual(self.queue_store, actual,
-                         msg % (self.name, self.queue_store))
+        self.assertEqual(self.store, actual,
+                         msg % (self.name, self.store))
 
     @skip_abstract_class
     def test_on_queue_changed_updates_view(self):
         """On queue changed the view is updated."""
         items = self.build_some_data()
         self.sd_changed(items)
-        self.assert_store_correct(self.queue_store, items)
+        self.assert_store_correct(items)
 
     @skip_abstract_class
     def test_on_queue_changed_handles_none(self):
         """On queue changed handles None as items."""
         self.sd_changed(None)
-        self.assert_store_correct(self.queue_store, [])
+        self.assert_store_correct([])
 
     @skip_abstract_class
     def test_on_queue_changed_handles_an_item_none(self):
         """On queue changed handles None as items."""
         items = [QueueData(operation='Test', path='', share=None, node=None)]
         self.sd_changed(items)
-        self.assert_store_correct(self.queue_store, items)
+        self.assert_store_correct(items)
 
     @skip_abstract_class
     def test_model_is_cleared_before_updating(self):
@@ -557,17 +607,17 @@
 
         items = self.build_some_data()
         self.sd_changed(items)
-        self.assertEqual(len(self.queue_store), len(items))
+        self.assertEqual(len(self.store), len(items))
 
     @skip_abstract_class
     def test_view_is_enabled_if_disabled_on_changed(self):
         """The tree view is enabled on changed if it was disabled."""
-        self.assertFalse(self.queue_view.is_sensitive(),
+        self.assertFalse(self.view.is_sensitive(),
                          'Tree view must be disabled by default.')
         items = self.build_some_data()
         self.sd_changed(items)
 
-        self.assertTrue(self.queue_view.is_sensitive(),
+        self.assertTrue(self.view.is_sensitive(),
                         'Tree view must be enabled on changed.')
 
     @skip_abstract_class
@@ -578,7 +628,7 @@
 
         self.ui.update()
 
-        self.assert_store_correct(self.queue_store, data)
+        self.assert_store_correct(data)
 
     @skip_abstract_class
     def test_on_stopped_updates_queue(self):
@@ -594,7 +644,7 @@
         label = '%sq_label' % self.name
         actual = getattr(self.ui, label).get_text()
         expected = '%s Queue (%i)' % (self.name.capitalize(),
-                                      len(self.queue_store))
+                                      len(self.store))
         msg = '%s should be %s (got %s instead)'
         self.assertEqual(expected, actual, msg % (label, expected, actual))
 
@@ -608,13 +658,13 @@
         items = self.build_some_data()
         self.set_sd_queue(items)
         self.do_start()
-        self.assert_store_correct(self.queue_store, items)
+        self.assert_store_correct(items)
 
         items = items[:len(items) / 2]
         self.set_sd_queue(items)
         self.ui.on_stop_clicked(self.ui.stop)
         self.ui.on_stopped()
-        self.assert_store_correct(self.queue_store, items)
+        self.assert_store_correct(items)
 
     @skip_abstract_class
     def test_current_processing_row_is_different_if_online(self):
@@ -945,74 +995,40 @@
         if self.name is None:
             return
         self.volume = getattr(self.ui, self.name)
-        self.volume_store = getattr(self.ui, '%s_store' % self.name)
-        self.volume_view = getattr(self.ui, '%s_view' % self.name)
+        self.store = getattr(self.ui, '%s_store' % self.name)
+        self.view = getattr(self.ui, '%s_view' % self.name)
         self.volume_dialog_name = '%s_dialog' % self.name
         self.volume_dialog = getattr(self.ui, self.volume_dialog_name)
         self.on_volume_clicked = getattr(self.ui, 'on_%s_clicked' % self.name)
         self.volume_close = getattr(self.ui, '%s_close' % self.name)
 
-    def build_some_data(self, limit=5):
-        """Build some data to act as volume."""
-        kwargs = dict(data_type=self.data_type, limit=limit)
-        r = super(_MagicicadaUIVolumeTestCase, self).build_some_data(**kwargs)
-        return r
-
-    def assert_store_correct(self, store, items):
-        """Test that 'store' has 'items' as content."""
-        args = (store, items, self.mapping)
-        super(_MagicicadaUIVolumeTestCase, self).assert_store_correct(*args)
-
     def assert_widget_availability(self, enabled=True):
         """Check volume availability according to 'enabled'."""
         s = super(_MagicicadaUIVolumeTestCase, self)
         s.assert_widget_availability(self.name, enabled)
 
-    def assert_sort_order_correct(self, column, i, expected_order):
-        """Check that sort order is correctly set."""
-        msg0 = 'Store sort id must be %r (got %r instead).'
-        msg1 = 'Store sort order must be %r (got %r instead).'
-        msg3 = 'Column sort order must be %r (got %r instead).'
-
-        actual_id, actual_order = self.volume_store.get_sort_column_id()
-
-        # store sort column id and order
-        self.assertEqual(i, actual_id, msg0 % (i, actual_id))
-        self.assertEqual(expected_order, actual_order,
-                         msg1 % (expected_order, actual_order))
-
-        # column sort order
-        actual_order = column.get_sort_order()
-        self.assertEqual(expected_order, actual_order,
-                         msg3 % (expected_order, actual_order))
-
-    def assert_sort_indicator_correct(self, column):
-        """Check that sort indicator is correctly set."""
-        msg = 'Column %s must have sort indicator %s.'
-        colname = column.get_name()
-        # column sort indicator
-        self.assertTrue(column.get_sort_indicator(), msg % (colname, 'on'))
-
-        # all the other columns must not have the sort indicator on
-        for other_column in self.volume_view.get_columns():
-            if other_column.get_name() == colname:
-                continue
-            self.assertFalse(other_column.get_sort_indicator(),
-                             msg % (other_column.get_name(), 'off'))
-
-    @skip_abstract_class
-    def test_volume_are_disabled_until_started(self):
-        """Folders and shares are disabled until online."""
+    @skip_abstract_class
+    def test_initial_data_ready_callback_connected(self):
+        """The callback 'on_initial_data_ready' is connected to SD."""
+        self.assertEqual(self.ui.sd.on_initial_data_ready_callback,
+                         self.ui.on_initial_data_ready,
+                         "on_initial_data_ready should be connected.")
+
+    @skip_abstract_class
+    def test_volume_are_disabled_until_initial_data_ready(self):
+        """Folders and shares are disabled until data ready."""
         # disabled at startup
         self.assert_widget_availability(enabled=False)
 
-        # enabled when started
-        self.do_start()
+        # enabled when initial data ready
+        self.ui.on_initial_data_ready()
         self.assert_widget_availability(enabled=True)
 
     @skip_abstract_class
     def test_volume_are_enabled_until_stopped(self):
         """Folders and shares are enabled until offline."""
+        self.ui.on_initial_data_ready()
+
         self.do_connect()
         self.assert_widget_availability(enabled=True)
 
@@ -1057,7 +1073,7 @@
             """Perform the test per se before closing the dialog."""
             self.assertTrue(self.ui.widget_is_visible(self.volume_dialog),
                             '%s should be visible.' % self.volume_dialog_name)
-            self.assert_store_correct(self.volume_store, items)
+            self.assert_store_correct(items)
 
         items = self.build_some_data()
         setattr(self.ui.sd, self.name, items)
@@ -1077,7 +1093,7 @@
             """Perform the test per se before closing the dialog."""
             self.assertTrue(self.ui.widget_is_visible(self.volume_dialog),
                             '%s should be visible.' % self.volume_dialog_name)
-            self.assert_store_correct(self.volume_store, items)
+            self.assert_store_correct(items)
 
         items = self.build_some_data()
         setattr(self.ui.sd, self.name, items)
@@ -1094,7 +1110,7 @@
     def test_on_volume_clicked_handles_none(self):
         """On volume clicked handles None as items."""
         setattr(self.ui.sd, self.name, None)
-        test = lambda: self.assert_store_correct(self.volume_store, [])
+        test = lambda: self.assert_store_correct([])
         gobject.timeout_add(100, close_dialog,
                             (self.volume_dialog, test))
         self.on_volume_clicked(self.volume)
@@ -1110,36 +1126,36 @@
     def test_volume_columns_not_sorted_at_start(self):
         """Test volume columns are not sorted at start."""
         msg = 'Column %s must not have the sort indicator on.'
-        for col in self.volume_view.get_columns():
+        for col in self.view.get_columns():
             self.assertFalse(col.get_sort_indicator(), msg % col.get_name())
 
     @skip_abstract_class
     def test_volume_columns_are_clickable(self):
         """Test volume columns are clickable."""
         msg = 'Column %s must be clickable.'
-        for col in self.volume_view.get_columns():
+        for col in self.view.get_columns():
             self.assertTrue(col.get_clickable(), msg % col.get_name())
 
     @skip_abstract_class
     def test_volume_columns_clicked_signal(self):
         """Test volume columns clicks signal is properly connected."""
         msg = 'Column %s must be connected to on_store_sort_column_changed.'
-        for col in self.volume_view.get_columns():
+        for col in self.view.get_columns():
             self.assertTrue(col.get_clickable(), msg % col.get_name())
 
     @skip_abstract_class
     def test_volume_sorting(self):
         """Test volume panel can be re-sorted."""
-        for i, col in enumerate(self.volume_view.get_columns()):
+        for idx, col in enumerate(self.view.get_columns()):
             col.clicked()  # click on the column
-            self.assert_sort_order_correct(col, i, gtk.SORT_ASCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)
             self.assert_sort_indicator_correct(col)
 
             col.clicked()  # click on the column, sort order must change
-            self.assert_sort_order_correct(col, i, gtk.SORT_DESCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_DESCENDING)
 
             col.clicked()  # click again, sort order must be the first one
-            self.assert_sort_order_correct(col, i, gtk.SORT_ASCENDING)
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)
 
 
 class MagicicadaUIFoldersTestCase(_MagicicadaUIVolumeTestCase):
@@ -1173,7 +1189,7 @@
                 i = int(kwargs['free_bytes'])
                 kwargs['free_bytes'] = humanize_bytes(i, precision=2)
             item = self.data_type(**kwargs)
-            self.assert_store_correct(self.volume_store, [item])
+            self.assert_store_correct([item])
 
         gobject.timeout_add(100, close_dialog,
                             (self.volume_dialog, test))
@@ -1266,17 +1282,19 @@
         msg = 'buffer content must be %s (got %s instead).'
         self.assertEqual(actual, expected, msg % (expected, actual))
 
-    def test_metadata_are_disabled_until_started(self):
-        """Metadata button is disabled until online."""
+    def test_metadata_are_disabled_until_initial_data_ready(self):
+        """Metadata button is disabled until initial data."""
         # disabled at startup
         self.assert_widget_availability(enabled=False)
 
-        # enabled when started
-        self.do_start()
+        # enabled when initial data ready
+        self.ui.on_initial_data_ready()
         self.assert_widget_availability(enabled=True)
 
     def test_metadata_are_enabled_until_stopped(self):
         """Metadata button is enabled until offline."""
+        self.ui.on_initial_data_ready()
+
         self.do_connect()
         self.assert_widget_availability(enabled=True)
 
@@ -1515,11 +1533,12 @@
         self.memento.setLevel(logging.DEBUG)
         logger = logging.getLogger('magicicada.ui')
         logger.addHandler(self.memento)
+        logger.setLevel(logging.DEBUG)
 
-    def assert_function_logs(self, func, *args, **kwargs):
-        """Check 'funcion' logs its inputs as DEBUG."""
+    def assert_function_logs(self, level, func, *args, **kwargs):
+        """Check 'funcion' logs its inputs as 'level'."""
         name = func.__name__
-        msg = '%s must be logged as DEBUG'
+        msg = '%s must be logged with level %r'
         try:
             func(*args, **kwargs)
         except Exception:  # pylint: disable=E0501, W0703
@@ -1528,33 +1547,201 @@
                             'function (%s) must be logged as ERROR' % name)
             self.assertTrue(self.memento.check_error(exc),
                             'sys.exc_info (%s) must be logged as ERROR' % exc)
-        self.assertTrue(self.memento.check_debug(name), msg % name)
+
+        memento_func = getattr(self.memento, 'check_%s' % level.lower())
+        self.assertTrue(memento_func(name), msg % (name, level))
         for arg in args:
-            self.assertTrue(self.memento.check_debug(str(arg)), msg % arg)
+            self.assertTrue(memento_func(str(arg)), msg % (arg, level))
         for key, val in kwargs.iteritems():
             arg = "'%s': %r" % (key, val)
-            self.assertTrue(self.memento.check_debug(arg), msg % arg)
+            self.assertTrue(memento_func(arg), msg % (arg, level))
 
     def test_on_shares_clicked_logs(self):
         """Check _on_shares_clicked logs properly."""
         args = ([0, object(), 'test', {}], object())
         kwargs = dict(dialog=object())
-        self.assert_function_logs(self.ui._on_shares_clicked, *args, **kwargs)
+        self.assert_function_logs(logging.getLevelName(logging.DEBUG),
+                                  self.ui._on_shares_clicked, *args, **kwargs)
 
     def test_on_status_changed_logs(self):
         """Check _on_status_changed logs properly."""
         args = ('test status', 'status description', True, False, True)
         kwargs = dict(queues='bla', connection=None)
-        self.assert_function_logs(self.ui.on_status_changed, *args, **kwargs)
+        self.assert_function_logs(logging.getLevelName(logging.DEBUG),
+                                  self.ui.on_status_changed, *args, **kwargs)
 
     def test_on_queue_changed_logs(self):
         """Check _on_queue_changed logs properly."""
         args = ('meta',)
         kwargs = dict(items=[0, object(), 'test', {}], must_highlight=True)
-        self.assert_function_logs(self.ui._on_queue_changed, *args, **kwargs)
+        self.assert_function_logs(logging.getLevelName(logging.DEBUG),
+                                  self.ui._on_queue_changed, *args, **kwargs)
 
     def test_on_metadata_ready_logs(self):
         """Check on_metadata_ready logs properly."""
         args = ()
         kwargs = dict(path='test', metadata=True)
-        self.assert_function_logs(self.ui.on_metadata_ready, *args, **kwargs)
+        self.assert_function_logs(logging.getLevelName(logging.DEBUG),
+                                  self.ui.on_metadata_ready, *args, **kwargs)
+
+    def test_on_initial_data_ready_logs(self):
+        """Check on_initial_data_ready logs properly."""
+        args = ()
+        kwargs = dict(path='test', metadata=True)
+        self.assert_function_logs(logging.getLevelName(logging.INFO),
+                                  self.ui.on_initial_data_ready,
+                                  *args, **kwargs)
+
+
+class PublicFilesTestCase(MagicicadaUITestCase):
+    """UI test cases for public files."""
+
+    name = 'public_files'
+    data_type = PublicFilesData
+    mapping = enumerate(['path', 'public_url', 'volume', 'node'])
+
+    def setUp(self):
+        """Init."""
+        super(PublicFilesTestCase, self).setUp()
+        self.store = self.ui.public_files_store
+        self.view = self.ui.public_files_view
+
+    def assert_widget_availability(self, enabled=True, msg=None):
+        """Check widget availability according to 'enabled'."""
+        widget = self.ui.public_files
+        self.assertTrue(self.ui.widget_is_visible(widget), 'must be visible')
+
+        sensitive = widget.is_sensitive()
+        if msg is None:
+            msg = 'must %sbe sensitive' % ('' if enabled else 'not ',)
+        self.assertTrue(sensitive if enabled else not sensitive, msg)
+
+    def test_initial_data_ready_callback_connected(self):
+        """The callback 'on_initial_online_data_ready' is connected to SD."""
+        self.assertEqual(self.ui.sd.on_initial_online_data_ready_callback,
+                         self.ui.on_initial_online_data_ready,
+                         "on_initial_online_data_ready should be connected.")
+
+    def test_disabled_until_initial_online_data_ready(self):
+        """Widget is disabled until initial online data ready."""
+        self.assert_widget_availability(enabled=False,
+                                        msg='must be disabled at startup')
+
+        self.ui.on_initial_online_data_ready()
+        msg = 'must be enabled when initial data ready'
+        self.assert_widget_availability(enabled=True, msg=msg)
+
+    def test_enabled_until_stopped(self):
+        """Widget is enabled until stopped."""
+        self.ui.on_initial_online_data_ready()
+
+        self.do_connect()
+        self.assert_widget_availability(enabled=True)
+
+        self.ui.on_online()
+        self.assert_widget_availability(enabled=True)
+
+        self.ui.on_offline()
+        self.assert_widget_availability(enabled=True)
+
+        self.ui.on_stopped()
+        self.assert_widget_availability(enabled=False)
+
+    def test_public_files_close_emits_response_close(self):
+        """Test close button emits RESPONSE_CLOSE when clicked."""
+        self.patch(self.ui.public_files_dialog, 'response', self._set_called)
+        self.ui.public_files_close.clicked()
+        self.assertEqual(self._called, ((gtk.RESPONSE_CLOSE,), {}),
+                         'close button should emit RESPONSE_CLOSE.')
+
+    def test_on_public_files_clicked_runs_the_dialog(self):
+        """Test on_public_files_clicked run the public_files_dialog."""
+        self.patch(self.ui.public_files_dialog, 'run', self._set_called)
+        self.ui.sd.public_files = {}
+
+        visible = self.ui.widget_is_visible(self.ui.public_files_dialog)
+        self.assertFalse(visible, 'dialog should not be visible.')
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_public_files_clicked_hides_the_dialog(self):
+        """Test on_public_files_clicked hides the public_files_dialog."""
+        self.patch(self.ui.public_files_dialog, 'run', lambda: None)  # no run
+        self.patch(self.ui.public_files_dialog, 'hide', self._set_called)
+        self.ui.sd.public_files = {}
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_public_files_clicked_grabs_info_from_backend(self):
+        """Test on_public_files_clicked."""
+        self.patch(self.ui.public_files_dialog, 'run', lambda: None)  # no run
+        self.ui.sd.public_files = SAMPLE_PUBLIC_FILES
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        self.assert_store_correct(SAMPLE_PUBLIC_FILES.values())
+
+    def test_on_public_files_clicked_twice(self):
+        """Test on_public_files_clicked twice."""
+        self.patch(self.ui.public_files_dialog, 'run', lambda: None)  # no run
+        self.ui.sd.public_files = SAMPLE_PUBLIC_FILES
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        self.assert_store_correct(SAMPLE_PUBLIC_FILES.values())
+
+    def test_on_public_files_clicked_handles_none(self):
+        """On public_files clicked handles None as items."""
+        self.patch(self.ui.public_files_dialog, 'run', lambda: None)  # no run
+        self.ui.sd.public_files = None
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        self.assert_store_correct([])
+
+    def test_dialog_properties(self):
+        """The dialog has correct properties."""
+        title = self.name.replace('_', ' ').capitalize()
+        self.assert_dialog_properties(dialog_name='public_files_dialog',
+                                      title=title)
+
+    def test_columns_not_sorted_at_start(self):
+        """Test columns are not sorted at start."""
+        msg = 'Column %s must not have the sort indicator on.'
+        for col in self.ui.public_files_view.get_columns():
+            self.assertFalse(col.get_sort_indicator(), msg % col.get_name())
+
+    def test_columns_are_clickable(self):
+        """Test columns are clickable."""
+        msg = 'Column %s must be clickable.'
+        for col in self.ui.public_files_view.get_columns():
+            self.assertTrue(col.get_clickable(), msg % col.get_name())
+
+    def test_columns_clicked_signal(self):
+        """Test columns clicked signal is properly connected."""
+        msg = 'Column %s must be connected to on_store_sort_column_changed.'
+        for col in self.ui.public_files_view.get_columns():
+            self.assertTrue(col.get_clickable(), msg % col.get_name())
+
+    def test_sorting(self):
+        """Test public files panel can be re-sorted."""
+        self.patch(self.ui.public_files_dialog, 'run', lambda: None)  # no run
+        self.ui.sd.public_files = SAMPLE_PUBLIC_FILES
+
+        self.ui.on_public_files_clicked(self.ui.public_files)
+
+        for idx, col in enumerate(self.ui.public_files_view.get_columns()):
+            col.clicked()  # click on the column
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)
+            self.assert_sort_indicator_correct(col)
+
+            col.clicked()  # click on the column, sort order must change
+            self.assert_sort_order_correct(col, idx, gtk.SORT_DESCENDING)
+
+            col.clicked()  # click again, sort order must be the first one
+            self.assert_sort_order_correct(col, idx, gtk.SORT_ASCENDING)

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-09-02 18:23:02 +0000
+++ magicicada/tests/test_syncdaemon.py	2011-01-07 23:06:32 +0000
@@ -22,7 +22,13 @@
 import os
 import unittest
 
-from magicicada.syncdaemon import SyncDaemon, State
+from magicicada.dbusiface import PublicFilesData, ShareOperationError
+from magicicada.syncdaemon import (
+    ASKING_IDLE,
+    mandatory_callback,
+    State,
+    SyncDaemon,
+)
 from magicicada.tests.helpers import MementoHandler
 
 from twisted.trial.unittest import TestCase as TwistedTestCase
@@ -32,18 +38,23 @@
 # It's ok to access private data in the test suite
 # pylint: disable=W0212
 
+# Lambda may not be necessary
+# pylint: disable=W0108
+
 
 class FakeDBusInterface(object):
     """Fake DBus Interface, for SD to not use dbus at all during tests."""
 
     fake_sd_started = False
+    fake_pf_data = PublicFilesData(volume='v', node='n',
+                                   path='p', public_url='u')
+    fake_share_response = None
 
     def __init__(self, sd):
         pass
 
     def shutdown(self):
         """Fake shutdown."""
-        pass
 
     def get_status(self):
         """Fake status."""
@@ -58,10 +69,18 @@
     start = quit = connect = disconnect = get_folders
     get_shares_to_me = get_shares_to_others = get_folders
 
+    def get_public_files(self):
+        """Fake public files."""
+        return defer.succeed([self.fake_pf_data])
+
     def is_sd_started(self):
         """Fake response."""
         return self.fake_sd_started
 
+    def accept_share(self, share_id):
+        """Fake accept share."""
+        return self.fake_share_response
+
 
 class BaseTest(TwistedTestCase):
     """Base test with a SD."""
@@ -70,6 +89,11 @@
 
     def setUp(self):
         """Set up."""
+        self.hdlr = MementoHandler()
+        self.hdlr.setLevel(logging.DEBUG)
+        logger = logging.getLogger('magicicada.syncdaemon')
+        logger.addHandler(self.hdlr)
+        logger.setLevel(logging.DEBUG)
         self.sd = SyncDaemon(FakeDBusInterface)
 
     def tearDown(self):
@@ -77,9 +101,44 @@
         self.sd.shutdown()
 
 
+class MandatoryCallbackTests(BaseTest):
+    """Tests for the mandatory callback generic function."""
+
+    def test_log_function_name(self):
+        """Log the function name."""
+        some_function = mandatory_callback('bar')
+        some_function()
+        self.assertTrue(self.hdlr.check_warning(
+                        "Callback called but was not assigned", "bar"))
+
+    def test_log_args(self):
+        """Log the arguments."""
+        some_function = mandatory_callback('bar')
+        some_function(1, 2, b=45)
+        self.hdlr.debug = True
+        self.assertTrue(self.hdlr.check_warning(
+                        "Callback called but was not assigned",
+                        "1", "2", "'b': 45"))
+
+
 class InitialDataTests(unittest.TestCase):
     """Tests for initial data gathering."""
 
+    def setUp(self):
+        """Set up the test."""
+        self.sd = SyncDaemon(FakeDBusInterface)
+
+        self.offline_called = False
+        self.sd.on_initial_data_ready_callback = lambda: setattr(self,
+                                                        'offline_called', True)
+        self.online_called = False
+        self.sd.on_initial_online_data_ready_callback = lambda: setattr(self,
+                                                        'online_called', True)
+
+    def tearDown(self):
+        """Tear down the test."""
+        self.sd.shutdown()
+
     def test_called_by_start(self):
         """Check that start calls get initial data."""
         sd = SyncDaemon(FakeDBusInterface)
@@ -135,6 +194,68 @@
         sd._get_initial_data()
         self.assertEqual(len(called), 3)
 
+    def test_public_files_info(self):
+        """Check we get the public files info at start."""
+        sd = SyncDaemon(FakeDBusInterface)
+        fake_data = FakeDBusInterface.fake_pf_data
+        sd._get_initial_data()
+        self.assertEqual(sd.public_files[fake_data.node], fake_data)
+
+    def test_all_ready(self):
+        """All data is ready."""
+        self.sd._get_initial_data()
+        self.assertTrue(self.offline_called)
+        self.assertTrue(self.online_called)
+
+    def test_no_public_files(self):
+        """Initial gathering is stuck in public files."""
+        self.sd.dbus.get_public_files = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertTrue(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_shares_to_others(self):
+        """Initial gathering is stuck in shares to others."""
+        self.sd.dbus.get_shares_to_others = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_shares_to_me(self):
+        """Initial gathering is stuck in shares to me."""
+        self.sd.dbus.get_shares_to_me = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_folders(self):
+        """Initial gathering is stuck in folders."""
+        self.sd.dbus.get_folders = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_meta_queue(self):
+        """Initial gathering is stuck in meta queue."""
+        self.sd.dbus.get_meta_queue = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_content_queue(self):
+        """Initial gathering is stuck in content queue."""
+        self.sd.dbus.get_content_queue = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
+    def test_no_status(self):
+        """Initial gathering is stuck in status."""
+        self.sd.dbus.get_status = lambda: defer.Deferred()
+        self.sd._get_initial_data()
+        self.assertFalse(self.offline_called)
+        self.assertFalse(self.online_called)
+
 
 class StatusChangedTests(BaseTest):
     """Simple signals checking."""
@@ -175,7 +296,7 @@
                                      False, 'queues', 'connection')
         return deferred
 
-    def test_status_changed_affects_cuurent_status(self):
+    def test_status_changed_affects_current_status(self):
         """Make changes to see how status are reflected."""
         # one set of values
         self.sd.on_sd_status_changed('name1', 'description1', False, True,
@@ -322,24 +443,115 @@
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(called, [['foo']])
 
-    def test_CQ_state_nothing(self):
+    def test_cq_state_nothing(self):
         """Check the ContentQueue info, being nothing."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed([])
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(self.sd.content_queue, [])
 
-    def test_CQ_state_one(self):
+    def test_cq_state_one(self):
         """Check the ContentQueue info, being one."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed(['foo'])
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(self.sd.content_queue, ['foo'])
 
-    def test_CQ_state_two(self):
+    def test_cq_state_two(self):
         """Check the ContentQueue info, two."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed(['foo', 'bar'])
         self.sd.on_sd_content_queue_changed()
         self.assertEqual(self.sd.content_queue, ['foo', 'bar'])
 
+    def test_cq_multiple_without_response_having_two(self):
+        """Behave correctly on two-changes burst."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        called = []
+
+        def fake():
+            """Fake."""
+            d = d2 if called else d1
+            called.append(None)
+            return d
+        self.sd.dbus.get_content_queue = fake
+
+        # call twice
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+
+        # dbus function should be called once
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+        d2.callback(['bar'])
+
+        # it should be called once more only
+        self.assertEqual(len(called), 2)
+
+    def test_cq_multiple_without_response_having_three(self):
+        """Behave correctly on three-changes burst."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        called = []
+
+        def fake():
+            """Fake."""
+            d = d2 if called else d1
+            called.append(None)
+            return d
+        self.sd.dbus.get_content_queue = fake
+
+        # call thrice
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+
+        # dbus function should be called once
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+        d2.callback(['bar'])
+
+        # it should be called once more only
+        self.assertEqual(len(called), 2)
+
+    def test_cq_multiple_without_response_having_more_later(self):
+        """Behave correctly on changes burst delayed."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        d3 = defer.Deferred()
+        defs = [d1, d2, d3]
+        called = []
+
+        def fake():
+            """Fake."""
+            d = defs[len(called)]
+            called.append(None)
+            return d
+        self.sd.dbus.get_content_queue = fake
+
+        # call some times, dbus function should be called once
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+
+        # while calling second time, generate more requests
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+        self.sd.on_sd_content_queue_changed()
+
+        # second call returns
+        d2.callback(['foo'])
+        d3.callback(['foo'])
+
+        # it should be called three times total
+        self.assertEqual(len(called), 3)
+
 
 class MetaQueueChangedTests(BaseTest):
     """Check the MetaQueueChanged handling."""
@@ -526,6 +738,8 @@
 
     def test_mq_caller_is_reset_last_time(self):
         """When MQ is polled last time, the caller should be back to None."""
+        # Module 'twisted.internet.reactor' has no 'callLater' member
+        # pylint: disable=E1101
         self.sd._mqcaller = reactor.callLater(100, lambda: None)
         self.sd.current_state.set(name='QUEUE_MANAGER',
                                   queues='WORKING_ON_CONTENT')
@@ -550,6 +764,8 @@
                                              'WORKING_ON_CONTENT', 'connect')
 
                 # allow time to see if a mistaken call happens
+                # Module 'twisted.internet.reactor' has no 'callLater' member
+                # pylint: disable=E1101
                 reactor.callLater(.5, deferred.callback, True)
             elif len(calls) == 4:
                 pass    # last call after state changed
@@ -566,24 +782,132 @@
         deferred = defer.Deferred()
         return deferred
 
-    def test_MQ_state_nothing(self):
+    def test_mq_state_nothing(self):
         """Check the MetaQueue info, being nothing."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed([])
         self.sd._check_mq()
         self.assertEqual(self.sd.meta_queue, [])
 
-    def test_MQ_state_one(self):
+    def test_mq_state_one(self):
         """Check the MetaQueue info, being one."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed(['foo'])
         self.sd._check_mq()
         self.assertEqual(self.sd.meta_queue, ['foo'])
 
-    def test_MQ_state_two(self):
+    def test_mq_state_two(self):
         """Check the MetaQueue info, two."""
         self.sd.dbus.get_meta_queue = lambda: defer.succeed(['foo', 'bar'])
         self.sd._check_mq()
         self.assertEqual(self.sd.meta_queue, ['foo', 'bar'])
 
+    def test_mq_multiple_without_response_having_two(self):
+        """Behave correctly on two-changes burst."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        called = []
+
+        def fake():
+            """Fake."""
+            d = d2 if called else d1
+            called.append(None)
+            return d
+        self.sd.dbus.get_meta_queue = fake
+
+        # call twice
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+
+        # dbus function should be called once
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+        d2.callback(['bar'])
+
+        # it should be called once more only
+        self.assertEqual(len(called), 2)
+
+    def test_mq_multiple_without_response_having_three(self):
+        """Behave correctly on three-changes burst."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        called = []
+
+        def fake():
+            """Fake."""
+            d = d2 if called else d1
+            called.append(None)
+            return d
+        self.sd.dbus.get_meta_queue = fake
+
+        # call thrice
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+
+        # dbus function should be called once
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+        d2.callback(['bar'])
+
+        # it should be called once more only
+        self.assertEqual(len(called), 2)
+
+    def test_mq_multiple_without_response_having_more_later(self):
+        """Behave correctly on changes burst delayed."""
+        d1 = defer.Deferred()
+        d2 = defer.Deferred()
+        d3 = defer.Deferred()
+        defs = [d1, d2, d3]
+        called = []
+
+        def fake():
+            """Fake."""
+            d = defs[len(called)]
+            called.append(None)
+            return d
+        self.sd.dbus.get_meta_queue = fake
+
+        # call some times, dbus function should be called once
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+        self.assertEqual(len(called), 1)
+
+        # first call returns
+        d1.callback(['foo'])
+
+        # while calling second time, generate more requests
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+        self.sd.on_sd_meta_queue_changed()
+
+        # second call returns
+        d2.callback(['foo'])
+        d3.callback(['foo'])
+
+        # it should be called three times total
+        self.assertEqual(len(called), 3)
+
+    @defer.inlineCallbacks
+    def test_mq_multiple_support_error(self):
+        """Leave the state ok even with an error in the underlying call."""
+        def fake():
+            """Fake."""
+            raise ValueError('foo')
+        self.sd.dbus.get_meta_queue = fake
+
+        # call it, and "absorb" the error we just generated
+        try:
+            yield self.sd.on_sd_meta_queue_changed()
+        except ValueError:
+            pass
+
+        # it should be in IDLE
+        self.assertEqual(self.sd._mq_asking, ASKING_IDLE)
+
 
 class StateTests(unittest.TestCase):
     """Test State class."""
@@ -732,13 +1056,6 @@
                                      False, 'queues', 'connection')
         self.assertTrue(self.called)
 
-    @defer.inlineCallbacks
-    def test_on_initial_data_ready(self):
-        """Called when SD gets all the initial data."""
-        self.flag_called(self.sd, 'on_initial_data_ready_callback')
-        yield self.sd._get_initial_data()
-        self.assertTrue(self.called)
-
 
 class TestLogs(unittest.TestCase):
     """Test logging."""
@@ -746,8 +1063,10 @@
     def setUp(self):
         """Set up."""
         self.hdlr = MementoHandler()
-        logging.getLogger('magicicada.syncdaemon').addHandler(self.hdlr)
         self.hdlr.setLevel(logging.DEBUG)
+        logger = logging.getLogger('magicicada.syncdaemon')
+        logger.addHandler(self.hdlr)
+        logger.setLevel(logging.DEBUG)
         self.sd = SyncDaemon(FakeDBusInterface)
 
     def tearDown(self):
@@ -768,8 +1087,12 @@
     def test_initial_value(self):
         """Log the initial filling."""
         yield self.sd._get_initial_data()
-        self.assertTrue(self.hdlr.check_info("Getting initial data"))
-        self.assertTrue(self.hdlr.check_info("All initial data is ready"))
+        self.assertTrue(self.hdlr.check_info("Getting offline initial data"))
+        self.assertTrue(self.hdlr.check_info(
+                        "All initial offline data is ready"))
+        self.assertTrue(self.hdlr.check_info("Getting online initial data"))
+        self.assertTrue(self.hdlr.check_info(
+                        "All initial online data is ready"))
 
     def test_start(self):
         """Log the call to start."""
@@ -823,7 +1146,7 @@
         self.assertTrue(self.hdlr.check_info(
                         "SD Meta Queue info is new! 1 items"))
 
-    def test_content_queue_changed(self):
+    def test_meta_queue_changed(self):
         """Log that process_cq has new data."""
         self.sd.dbus.get_content_queue = lambda: defer.succeed(['foo'])
         self.sd.on_sd_content_queue_changed()
@@ -857,13 +1180,32 @@
         self.sd.on_sd_name_owner_changed(True)
         self.assertTrue(self.hdlr.check_info("SD Name Owner changed: True"))
 
+    def test_on_public_files_list(self):
+        """Log we got a new public files list."""
+        pf1 = PublicFilesData(volume='v', node='n1', path='p', public_url='u')
+        pf2 = PublicFilesData(volume='v', node='n2', path='p', public_url='u')
+        self.sd.on_sd_public_files_list([pf1, pf2])
+        self.assertTrue(self.hdlr.check_info(
+                        "Got new Public Files list (2 items)"))
+
+    def test_on_public_files_changed(self):
+        """Log we got a change in the public files list."""
+        self.sd.public_files = {}
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url')
+        self.sd.on_sd_public_files_changed(pf, True)
+        self.assertTrue(self.hdlr.check_info(
+                        "Change in Public Files list! is_public=True",
+                        "node=node", "path=u'path'"))
+
 
 class MetadataTests(BaseTest):
     """Get Metadata info."""
 
     def test_get_metadata_no_callback_set(self):
         """It's mandatory to set the callback for this response."""
-        self.assertRaises(ValueError, self.sd.get_metadata, 'path')
+        self.sd.on_metadata_ready_callback()
+        self.assertTrue(self.hdlr.check_warning('on_metadata_ready_callback'))
 
     def test_get_metadata_ok(self):
         """Get the metadata for given path."""
@@ -988,3 +1330,139 @@
 
         # test
         self.assertEqual(cal, [2])
+
+
+class PublicFilesTests(BaseTest):
+    """PublicFiles checking."""
+
+    def test_signal_updates_value(self):
+        """Test that when signal arrives it updates the internal attribute."""
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url')
+        self.sd.on_sd_public_files_list([pf])
+        self.assertEqual(len(self.sd.public_files), 1)
+        pf = self.sd.public_files['node']
+        self.assertEqual(pf.volume, 'volume')
+        self.assertEqual(pf.node, 'node')
+        self.assertEqual(pf.public_url, 'url')
+        self.assertEqual(pf.path, 'path')
+
+    def test_public_files_changed_added_noprevious(self):
+        """Test that it adds the new public file."""
+        # reset and add
+        self.sd.public_files = {}
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url')
+        self.sd.on_sd_public_files_changed(pf, True)
+
+        # check is there
+        pf = self.sd.public_files['node']
+        self.assertEqual(pf.volume, 'volume')
+        self.assertEqual(pf.node, 'node')
+        self.assertEqual(pf.public_url, 'url')
+        self.assertEqual(pf.path, 'path')
+
+    def test_public_files_changed_added_previous(self):
+        """Test that it updates the public file."""
+        # add one
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url1')
+        self.sd.on_sd_public_files_changed(pf, True)
+
+        # update it
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url2')
+        self.sd.on_sd_public_files_changed(pf, True)
+
+        # check is updated
+        pf = self.sd.public_files['node']
+        self.assertEqual(pf.public_url, 'url2')
+
+    def test_public_files_changed_removed_previous(self):
+        """Test that it deletes the public file."""
+        # add one
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url')
+        self.sd.on_sd_public_files_changed(pf, True)
+
+        # remove it
+        self.sd.on_sd_public_files_changed(pf, False)
+
+        # check is no longer there
+        self.assertFalse('node' in self.sd.public_files)
+
+    def test_public_files_changed_removed_noprevious(self):
+        """Test that support the deletion of anything."""
+        # reset and remove
+        self.sd.public_files = {}
+        pf = PublicFilesData(volume='volume', node='node',
+                             path='path', public_url='url')
+        self.sd.on_sd_public_files_changed(pf, False)
+
+        # check that still is not there
+        self.assertFalse('node' in self.sd.public_files)
+
+
+class HandlingSharesTests(BaseTest):
+    """Handling shares checking."""
+
+    def test_on_share_op_success_callback_set(self):
+        """It's mandatory to set the callback for this response."""
+        self.sd.on_share_op_success_callback()
+        self.assertTrue(self.hdlr.check_warning(
+                                            'on_share_op_success_callback'))
+
+    def test_on_share_op_error_callback_set(self):
+        """It's mandatory to set the callback for this response."""
+        self.sd.on_share_op_error_callback()
+        self.assertTrue(self.hdlr.check_warning('on_share_op_error_callback'))
+
+    def test_accept_share_ok(self):
+        """Accepting a share finishes ok."""
+        # monkeypatch
+        called = []
+        self.sd.dbus.fake_share_response = defer.succeed(None)
+        self.sd.on_share_op_success_callback = lambda sid: called.append(sid)
+        self.sd.on_share_op_error_callback = lambda *a: None
+
+        # execute and test
+        self.sd.accept_share('share_id')
+        self.assertEqual(called, ['share_id'])
+        self.assertTrue(self.hdlr.check_info("Accepting share", "share_id",
+                                             "started"))
+        self.assertTrue(self.hdlr.check_info("Accepting share", "share_id",
+                                             "finished successfully"))
+
+    def test_accept_share_failure(self):
+        """Accepting a share finishes bad."""
+        # monkeypatch
+        called = []
+        e = ShareOperationError(share_id='foo', error='bar')
+        self.sd.dbus.fake_share_response = defer.fail(e)
+        self.sd.on_share_op_error_callback = \
+                                        lambda sid, e: called.append((sid, e))
+        self.sd.on_share_op_success_callback = lambda *a: None
+
+        # execute and test
+        self.sd.accept_share('share_id')
+        self.assertEqual(called, [('share_id', 'bar')])
+        self.assertTrue(self.hdlr.check_info("Accepting share", "share_id",
+                                             "started"))
+        self.assertTrue(self.hdlr.check_info("Accepting share", "share_id",
+                                             "finished with error", "bar"))
+
+    def test_accept_share_error(self):
+        """Really bad error when accepting a share."""
+        # monkeypatch
+        e = ValueError('unexpected failure')
+        self.sd.dbus.fake_share_response = defer.fail(e)
+        self.sd.on_share_op_error_callback = lambda *a: None
+        self.sd.on_share_op_success_callback = lambda *a: None
+
+        # execute and test
+        self.sd.accept_share('share_id')
+        self.assertTrue(self.hdlr.check_info("Accepting share", "share_id",
+                                             "started"))
+        self.assertTrue(self.hdlr.check_error(
+                        "Unexpected error when accepting share", "share_id",
+                        "ValueError", "unexpected failure"))

=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2010-09-02 19:26:08 +0000
+++ setup.py	2011-01-07 23:06:32 +0000
@@ -1,13 +1,21 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-### BEGIN LICENSE
-# This file is in the public domain
-### END LICENSE
+
+# Copyright 2010 Chicharreros
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Build tar.gz and related for magicicada."""
 
-################# DO NOT TOUCH THIS (HEAD TO THE SECOND PART) #################
-
 import os
 import sys
 
@@ -80,17 +88,14 @@
         update_data_path(self.prefix, previous_value)
 
 
-##############################################################################
-#################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ####################
-##############################################################################
-
 DistUtilsExtra.auto.setup(
     name='magicicada',
-    version='0.2',
+    version='0.3.0',
     license='GPL-3',
     author='Natalia Bidart',
-    author_email='[e-mail]',
-    description='A GTK+ frontend for the "Chicharra" part of Ubuntu One.',
-    #long_description='Here a longer description',
+    author_email='[e-mail]',
+    description='A GTK+ frontend for Ubuntu One.',
+    long_description='This application provides a GTK frontend to manage ' \
+                     'the file synchronisation service of Ubuntu One.',
     url='https://launchpad.net/magicicada',
     cmdclass={'install': InstallAndUpdateDataDirectory})