Simpler progress update

This commit is contained in:
Ruud
2014-06-11 21:10:20 +02:00
parent f68c356944
commit 5d3b0deb4d
2 changed files with 8 additions and 6 deletions
+5 -5
View File
@@ -210,14 +210,14 @@ class Manage(Plugin):
'to_go': total_found,
})
self.updateProgress(folder, to_go)
if group['media'] and group['identifier']:
added_identifiers.append(group['identifier'])
# Add it to release and update the info
fireEvent('release.add', group = group, update_info = False)
fireEvent('movie.update_info', identifier = group['identifier'], on_complete = self.createAfterUpdate(folder, group['identifier']))
else:
self.updateProgress(folder)
return addToLibrary
@@ -228,7 +228,6 @@ class Manage(Plugin):
if not self.in_progress or self.shuttingDown():
return
self.updateProgress(folder)
total = self.in_progress[folder]['total']
movie_dict = fireEvent('media.get', identifier, single = True)
@@ -236,10 +235,11 @@ class Manage(Plugin):
return afterUpdate
def updateProgress(self, folder):
def updateProgress(self, folder, to_go):
pr = self.in_progress[folder]
pr['to_go'] -= 1
if to_go < pr['to_go']:
pr['to_go'] = to_go
avg = (time.time() - pr['started']) / (pr['total'] - pr['to_go'])
pr['eta'] = tryInt(avg * pr['to_go'])