← Back to branch summary

~nataliabidart/ubuntuone-client/quota-exceeded-and-none-stable

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/volume_manager.py

  • Committer: Tarmac
  • Author(s): guillermo.gonzalez at canonical
  • Date: 2010-09-24 20:22:51 UTC
  • mfrom: (716.3.2 fix-645519-stable-1-4)
  • Revision ID: tarmac-20100924202251-sf2zsqw1389pn7xm
Fix delete_share DBus method to actually delete shares

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/volume_manager.py
717
717
        if marker in self.marker_share_map:
718
718
            del self.marker_share_map[marker]
719
719
 
 
720
    def handle_AQ_DELETE_SHARE_OK(self, share_id):
 
721
        """Handle AQ_DELETE_SHARE_OK event."""
 
722
        share = self.shared.get(share_id)
 
723
        if share is not None:
 
724
            del self.shared[share_id]
 
725
            self.m.event_q.push('VM_SHARE_DELETED', share)
 
726
        else:
 
727
            # delete ok, of something we don't have.
 
728
            self.log.warning("AQ_DELETE_SHARE_OK of a non-existing shared "
 
729
                             "dir: %s", share_id)
 
730
 
 
731
    def handle_AQ_DELETE_SHARE_ERROR(self, share_id, error):
 
732
        """Gandle AQ_DELETE_SHARE_ERROR event."""
 
733
        self.log.error("Error while deleting offered share: %s", error)
 
734
        self.m.event_q.push('VM_SHARE_DELETE_ERROR', share_id, error)
 
735
 
720
736
    def handle_SV_SHARE_ANSWERED(self, share_id, answer):
721
737
        """ handle SV_SHARE_ANSWERED event. """
722
738
        share = self.shared.get(share_id, None)
908
924
        self.m.action_q.create_share(node_id, username, name,
909
925
                                     access_level, marker)
910
926
 
 
927
    def delete_share(self, share_id):
 
928
        """Reuqest the deletion of an offered share."""
 
929
        share = self.shared.get(share_id)
 
930
        if share is None:
 
931
            # if the share isn't there, push the error!
 
932
            self.m.event_q.push('VM_SHARE_DELETE_ERROR', share_id, "DOES_NOT_EXIST")
 
933
        else:
 
934
            self.m.action_q.delete_share(share_id)
 
935
 
911
936
    def add_shared(self, share):
912
937
        """ Add a share with direction == from_me """
913
938
        self.log.info('New shared subtree: id: %s - path: %r',