# HG changeset patch # User Goffi # Date 1281964099 -28800 # Node ID bd24f2aed80c52bacb135ed1dd7cf93a0887d8b3 # Parent 8f56238309d98f8c52898b62c46ce2aedf7a257a Plugin XEP-0065: dest_file is now propertly closed after copy, and data dict in getProgress is not filled in case of file access error (file closed) diff -r 8f56238309d9 -r bd24f2aed80c plugins/plugin_xep_0065.py --- a/plugins/plugin_xep_0065.py Mon Aug 16 21:06:03 2010 +0800 +++ b/plugins/plugin_xep_0065.py Mon Aug 16 21:08:19 2010 +0800 @@ -354,15 +354,19 @@ def getProgress(self, data): """Fill data with position of current transfert""" - data["size"] = self.filesize try: data["position"] = str(self.dest_file.tell()) + data["size"] = self.filesize except (ValueError, AttributeError): - data["position"] = "" + pass def fileTransfered(self, d): info(_("File transfer completed, closing connection")) self.transport.loseConnection() + try: + self.dest_file.close() + except: + pass def updateTransfered(self, data): self.transfered+=len(data)