core, plugin file: fixed progress id + data is now returned by getProgress, instead of being an argument to fill
This commit is contained in:
parent
4826320188
commit
2c8b91ee6c
3 changed files with 10 additions and 11 deletions
|
|
@ -66,7 +66,7 @@ class SatFile(object):
|
|||
self.host = host
|
||||
self.uid = uid or unicode(uuid.uuid4())
|
||||
self._file = open(path, mode)
|
||||
self.size = None
|
||||
self.size = size
|
||||
self.profile = profile
|
||||
self.eof = defer.Deferred()
|
||||
self.host.registerProgressCb(self.uid, self.getProgress, profile)
|
||||
|
|
@ -96,8 +96,8 @@ class SatFile(object):
|
|||
def tell(self):
|
||||
return self._file.tell()
|
||||
|
||||
def getProgress(self, progress_id, data, profile):
|
||||
return {'position': self._file.tell(), 'size': self.size or 0}
|
||||
def getProgress(self, progress_id, profile):
|
||||
return {'position': self._file.tell(), 'size': self.size or -1}
|
||||
|
||||
|
||||
class FilePlugin(object):
|
||||
|
|
|
|||
Loading…
Reference in a new issue