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

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/local_rescan.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:
131
131
                self.fsm.remove_from_trash(share_id, node_id)
132
132
                continue
133
133
            log_info("generating Unlink from trash: " + datalog)
134
 
            self.aq.unlink(share_id, parent_id, node_id)
 
134
            self.aq.unlink(share_id, parent_id, node_id, "")
135
135
 
136
136
        log_info("processing move limbo")
137
137
        move_log = ("share_id=%r  node_id=%r  old_parent_id=%r  "
147
147
                continue
148
148
            log_info("generating Move from limbo: " + to_log)
149
149
            self.aq.move(share_id, node_id, old_parent_id,
150
 
                         new_parent_id, new_name)
 
150
                    new_parent_id, new_name, "", "")
151
151
 
152
152
    def _process_ro_shares(self):
153
153
        """Process ro shares and reschedule interrupted downloads."""
348
348
        fh_factory = lambda: self.fsm.get_partial_for_writing(mdobj.node_id,
349
349
                                                              mdobj.share_id)
350
350
        self.aq.download(mdobj.share_id, mdobj.node_id,
351
 
                         mdobj.server_hash, fh_factory)
 
351
                         mdobj.server_hash, fullname, fh_factory)
352
352
 
353
353
    def _resume_upload(self, fullname):
354
354
        """Resume an interrupted upload."""
355
355
        mdobj = self.fsm.get_by_path(fullname)
356
356
        fh_factory = lambda: self.fsm.open_file(mdobj.mdid)
357
357
        self.aq.upload(mdobj.share_id, mdobj.node_id, mdobj.server_hash,
358
 
                       mdobj.local_hash, mdobj.crc32, mdobj.size, fh_factory)
 
358
                       mdobj.local_hash, mdobj.crc32, mdobj.size,
 
359
                       fullname, fh_factory)
359
360
 
360
361
    def check_stat(self, fullname, oldstat):
361
362
        """Check stat info and return if different.