← Back to branch summary

~didrocks/ubuntuone-client/dont-suffer-zg-crash

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/volume_manager.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-01-25 16:42:52 UTC
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: james.westby@ubuntu.com-20110125164252-rl1pybasx1nsqgoy
Tags: upstream-1.5.3
Import upstream version 1.5.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/volume_manager.py
195
195
                    path=path, name=share_volume.share_name,
196
196
                    other_username=share_volume.other_username,
197
197
                    other_visible_name=share_volume.other_visible_name,
198
 
                    accepted=share_volume.accepted,
 
198
                    # if it's form a share volume, it was accepted
 
199
                    accepted=True,
199
200
                    access_level=share_volume.access_level,
200
201
                    generation=share_volume.generation,
201
202
                    free_bytes=share_volume.free_bytes)
568
569
                continue
569
570
 
570
571
            new_generation = new_volume.generation
571
 
            self.log.debug('New generation %s of %s', volume, new_generation)
 
572
            self.log.debug('Volume rescan (%s): gen=%s free_bytes=%s',
 
573
                           volume, new_generation, new_volume.free_bytes)
572
574
            if current_generation is None or \
573
575
               current_generation < new_generation:
574
576
                # add the event
940
942
            node_id = marker
941
943
        else:
942
944
            node_id = mdobj.node_id
943
 
        share = Shared(path=self.m.fs.get_abspath(mdobj.share_id, mdobj.path),
944
 
                      volume_id=marker,
 
945
        abspath = self.m.fs.get_abspath(mdobj.share_id, mdobj.path)
 
946
        share = Shared(path=abspath, volume_id=marker,
945
947
                      name=name, access_level=access_level,
946
948
                      other_username=username, other_visible_name=None,
947
949
                      node_id=node_id)
948
950
        self.marker_share_map[marker] = share
949
951
        self.m.action_q.create_share(node_id, username, name,
950
 
                                     access_level, marker)
 
952
                                     access_level, marker, abspath)
951
953
 
952
954
    def delete_share(self, share_id):
953
955
        """Reuqest the deletion of an offered share."""
1114
1116
        """
1115
1117
        self.log.info('delete_volume: %r', volume_id)
1116
1118
        volume = self.get_volume(volume_id)
1117
 
        self.m.action_q.delete_volume(volume.id)
 
1119
        self.m.action_q.delete_volume(volume.id, volume.path)
1118
1120
 
1119
1121
    def subscribe_udf(self, udf_id):
1120
1122
        """Mark the UDF with id as subscribed.
1409
1411
    def __init__(self, *args, **kwargs):
1410
1412
        """Create the instance."""
1411
1413
        super(VMTritcaskShelf, self).__init__(*args, **kwargs)
1412
 
        self.key = 'root_node_id'
 
1414
        self._root_key = 'root_node_id'
1413
1415
 
1414
1416
    def _get_key(self, key):
1415
1417
        """Return the 'real' key to use.
1416
1418
 
1417
 
        In the case of request.ROOT return self.key.
 
1419
        In the case of request.ROOT return self._root_key.
1418
1420
        """
1419
1421
        if key == request.ROOT:
1420
 
            return self.key
 
1422
            return self._root_key
1421
1423
        else:
1422
1424
            return key
1423
1425
 
1440
1442
    def keys(self):
1441
1443
        """Override default keys, to handle key == request.ROOT."""
1442
1444
        for key in super(VMTritcaskShelf, self).keys():
1443
 
            if key == self.key:
 
1445
            if key == self._root_key:
1444
1446
                yield request.ROOT
1445
1447
            else:
1446
1448
                yield key