diff --git a/ChangeLog b/ChangeLog index 13f2bd1..78fee6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2011-08-05 Thomas Vander Stichele + + * morituri/extern/task (added): + * morituri/extern/task/taskgtk.py (added): + * morituri/extern/task/gstreamer.py (added): + * morituri/extern/task/task.py (added): + * morituri/common/taskgtk.py (deleted): + * morituri/common/gstreamer.py (deleted): + * morituri/common/task.py (deleted): + Move task-related modules into an extern directory so other + projects can use them. + * morituri/common/checksum.py: + * morituri/common/encode.py: + * morituri/image/image.py: + * morituri/program/cdparanoia.py: + * morituri/program/cdrdao.py: + * morituri/rip/cd.py: + * morituri/rip/debug.py: + * morituri/rip/image.py: + * morituri/rip/main.py: + * morituri/rip/offset.py: + * morituri/test/test_common_checksum.py: + * morituri/test/test_common_encode.py: + * morituri/test/test_image_image.py: + Adapt. Tests work. + 2011-07-20 Thomas Vander Stichele * morituri/program/cdrdao.py: diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py index 550e224..7a769d5 100644 --- a/morituri/common/checksum.py +++ b/morituri/common/checksum.py @@ -26,7 +26,9 @@ import zlib import gst -from morituri.common import common, task, gstreamer +from morituri.common import common + +from morituri.extern.task import task, gstreamer # checksums are not CRC's. a CRC is a specific type of checksum. diff --git a/morituri/common/encode.py b/morituri/common/encode.py index f32ccff..c2aa2a0 100644 --- a/morituri/common/encode.py +++ b/morituri/common/encode.py @@ -25,7 +25,9 @@ import os import shutil import tempfile -from morituri.common import common, task, log, gstreamer +from morituri.common import common, log + +from morituri.extern.task import task, gstreamer class Profile(object): name = None diff --git a/morituri/common/gstreamer.py b/morituri/extern/task/gstreamer.py similarity index 99% rename from morituri/common/gstreamer.py rename to morituri/extern/task/gstreamer.py index 0a2f41e..2ba8631 100644 --- a/morituri/common/gstreamer.py +++ b/morituri/extern/task/gstreamer.py @@ -20,7 +20,9 @@ # You should have received a copy of the GNU General Public License # along with morituri. If not, see . -from morituri.common import common, task, log +from morituri.common import log + +import task class GstException(Exception): def __init__(self, gerror, debug): diff --git a/morituri/common/task.py b/morituri/extern/task/task.py similarity index 100% rename from morituri/common/task.py rename to morituri/extern/task/task.py diff --git a/morituri/common/taskgtk.py b/morituri/extern/task/taskgtk.py similarity index 98% rename from morituri/common/taskgtk.py rename to morituri/extern/task/taskgtk.py index ced7c6b..3d235df 100644 --- a/morituri/common/taskgtk.py +++ b/morituri/extern/task/taskgtk.py @@ -23,7 +23,7 @@ import gobject import gtk -from morituri.common import task +import task class GtkProgressRunner(gtk.VBox, task.TaskRunner): """ diff --git a/morituri/image/image.py b/morituri/image/image.py index ce0ebda..6a8d01b 100644 --- a/morituri/image/image.py +++ b/morituri/image/image.py @@ -26,9 +26,11 @@ Wrap on-disk CD images based on the .cue file. import os -from morituri.common import task, log, common, gstreamer +from morituri.common import log, common from morituri.image import cue, table +from morituri.extern.task import task, gstreamer + class Image(object, log.Loggable): """ @ivar table: The Table of Contents for this image. diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py index 1bf560c..9fe90cb 100644 --- a/morituri/program/cdparanoia.py +++ b/morituri/program/cdparanoia.py @@ -27,8 +27,10 @@ import shutil import subprocess import tempfile -from morituri.common import task, log, common +from morituri.common import log, common + from morituri.extern import asyncsub +from morituri.extern.task import task class FileSizeError(Exception): diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py index 6f6d8f1..c422629 100644 --- a/morituri/program/cdrdao.py +++ b/morituri/program/cdrdao.py @@ -27,9 +27,11 @@ import signal import subprocess import tempfile -from morituri.common import task, log, common +from morituri.common import log, common from morituri.image import toc, table + from morituri.extern import asyncsub +from morituri.extern.task import task class ProgramError(Exception): """ diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py index 2c9be7f..76ea34a 100644 --- a/morituri/rip/cd.py +++ b/morituri/rip/cd.py @@ -26,12 +26,13 @@ import math import gobject gobject.threads_init() -from morituri.common import logcommand, task, common, accurip, log +from morituri.common import logcommand, common, accurip, log from morituri.common import drive, program from morituri.result import result from morituri.program import cdrdao from morituri.extern.command import command +from morituri.extern.task import task DEFAULT_TRACK_TEMPLATE = u'%A - %d/%t. %a - %n' DEFAULT_DISC_TEMPLATE = u'%A - %d/%A - %d' diff --git a/morituri/rip/debug.py b/morituri/rip/debug.py index 35b591e..812e2fb 100644 --- a/morituri/rip/debug.py +++ b/morituri/rip/debug.py @@ -20,7 +20,9 @@ # You should have received a copy of the GNU General Public License # along with morituri. If not, see . -from morituri.common import task, logcommand +from morituri.common import logcommand + +from morituri.extern.task import task, gstreamer class Encode(logcommand.LogCommand): diff --git a/morituri/rip/image.py b/morituri/rip/image.py index 346438e..dff5fba 100644 --- a/morituri/rip/image.py +++ b/morituri/rip/image.py @@ -22,10 +22,12 @@ import os -from morituri.common import logcommand, task, accurip, program, encode +from morituri.common import logcommand, accurip, program, encode from morituri.image import image from morituri.result import result +from morituri.extern.task import task + class Encode(logcommand.LogCommand): summary = "encode image" diff --git a/morituri/rip/main.py b/morituri/rip/main.py index 7a4e5d9..a6a6dca 100644 --- a/morituri/rip/main.py +++ b/morituri/rip/main.py @@ -3,10 +3,12 @@ import sys -from morituri.common import log, logcommand, common, task +from morituri.common import log, logcommand, common + from morituri.rip import cd, offset, drive, image, accurip, debug from morituri.extern.command import command +from morituri.extern.task import task def main(argv): c = Rip() diff --git a/morituri/rip/offset.py b/morituri/rip/offset.py index 71f21f8..57d86f5 100644 --- a/morituri/rip/offset.py +++ b/morituri/rip/offset.py @@ -26,9 +26,11 @@ import tempfile import gobject gobject.threads_init() -from morituri.common import logcommand, task, accurip, drive, program +from morituri.common import logcommand, accurip, drive, program from morituri.program import cdrdao, cdparanoia +from morituri.extern.task import task + # see http://www.accuraterip.com/driveoffsets.htm # and misc/offsets.py OFFSETS = "+6, +48, +102, +667, +12, +30, +618, +594, +738, -472, " + \ diff --git a/morituri/test/test_common_checksum.py b/morituri/test/test_common_checksum.py index 24b40f6..23fc6cc 100644 --- a/morituri/test/test_common_checksum.py +++ b/morituri/test/test_common_checksum.py @@ -7,7 +7,9 @@ import tempfile import gobject gobject.threads_init() -from morituri.common import task, checksum, log, gstreamer +from morituri.common import checksum, log + +from morituri.extern.task import task, gstreamer from morituri.test import common as tcommon diff --git a/morituri/test/test_common_encode.py b/morituri/test/test_common_encode.py index 8e0a512..bad9f2e 100644 --- a/morituri/test/test_common_encode.py +++ b/morituri/test/test_common_encode.py @@ -9,9 +9,12 @@ gobject.threads_init() import gst +from morituri.common import encode, log, common + +from morituri.extern.task import task + from morituri.test import common as tcommon -from morituri.common import task, encode, log, common class PathTestCase(tcommon.TestCase): def _testSuffix(self, suffix): diff --git a/morituri/test/test_image_image.py b/morituri/test/test_image_image.py index c3b2f3a..aa7b08d 100644 --- a/morituri/test/test_image_image.py +++ b/morituri/test/test_image_image.py @@ -10,7 +10,10 @@ gobject.threads_init() import gst from morituri.image import image -from morituri.common import task, common, log, gstreamer +from morituri.common import common, log + +from morituri.extern.task import task, gstreamer + from morituri.test import common as tcommon log.init()