diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-17 23:34:50 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-17 23:34:50 +0100 |
| commit | 307b1a3a29f51944baf8866292f6150f6aa8ca62 (patch) | |
| tree | f9f1e03395c9893c6ecb808637573ca7a204bd0c /lib/python/Plugins/Extensions/DVDBurn/Process.py | |
| parent | 5aa89f34249397330995cc0ab1e080c1f567e174 (diff) | |
| parent | 9f233a55dbc640a9dd8d1aa46c1291d28fdea3b4 (diff) | |
| download | enigma2-307b1a3a29f51944baf8866292f6150f6aa8ca62.tar.gz enigma2-307b1a3a29f51944baf8866292f6150f6aa8ca62.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDBurn/Process.py')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/Process.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 89ca90fd..750e9d9b 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -165,7 +165,7 @@ class DemuxTask(Task): def cleanup(self, failed): if failed: import os - for file in self.generated_files.itervalues(): + for file in self.generated_files: os.remove(file) class MplexTaskPostcondition(Condition): @@ -220,7 +220,7 @@ class RemoveESFiles(Task): def prepare(self): self.args += ["-f"] - self.args += self.demux_task.generated_files.values() + self.args += self.demux_task.generated_files self.args += [self.demux_task.cutfile] class DVDAuthorTask(Task): @@ -368,6 +368,9 @@ class CheckDiskspaceTask(Task): self.global_preconditions.append(DiskspacePrecondition(diskSpaceNeeded)) self.weighting = 5 + def abort(self): + self.finish(aborted = True) + def run(self, callback): failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False) if len(failed_preconditions): @@ -791,7 +794,7 @@ class DVDJob(Job): demux = DemuxTask(self, link_name) self.mplextask = MplexTask(self, outputfile=title_filename, demux_task=demux) self.mplextask.end = self.estimateddvdsize - #RemoveESFiles(self, demux) + RemoveESFiles(self, demux) WaitForResidentTasks(self) PreviewTask(self, self.workspace + "/dvd/VIDEO_TS/") output = self.project.settings.output.getValue() |