* morituri/common/encode.py:

* morituri/common/program.py:
	* morituri/image/image.py:
	* morituri/program/cdparanoia.py:
	* morituri/rip/cd.py:
	* morituri/rip/image.py:
	* morituri/rip/offset.py:
	  Move all gst-using imports inside functions and classes
	  to avoid 'import gst' eating our options.
	  Fixes #12.
This commit is contained in:
Thomas Vander Stichele
2010-04-04 19:29:49 +00:00
parent cadc896c93
commit 22a3554381
8 changed files with 71 additions and 15 deletions

View File

@@ -27,7 +27,7 @@ import shutil
import subprocess
import tempfile
from morituri.common import task, log, common, checksum, encode
from morituri.common import task, log, common
from morituri.extern import asyncsub
class FileSizeError(Exception):
@@ -371,6 +371,9 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
os.close(fd)
self._tmpwavpath = tmppath
# here to avoid import gst eating our options
from morituri.common import checksum
self.tasks = []
self.tasks.append(
ReadTrackTask(tmppath, table, start, stop,
@@ -387,6 +390,10 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
tmpoutpath = unicode(tmpoutpath)
os.close(fd)
self._tmppath = tmpoutpath
# here to avoid import gst eating our options
from morituri.common import encode
self.tasks.append(encode.EncodeTask(tmppath, tmpoutpath, profile,
taglist=taglist))
# make sure our encoding is accurate
@@ -415,7 +422,6 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
try:
shutil.move(self._tmppath, self.path)
self.checksum = checksum
except Exception, e:
self._exception = e