diff --git a/ChangeLog b/ChangeLog index cd40d10..c12f24f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-15 Thomas Vander Stichele + + * examples/gtkchecksum.py: + * morituri/common/checksum.py: + Final crc->checksum fixes. + 2009-04-15 Thomas Vander Stichele * examples/ARcue.py: diff --git a/examples/gtkchecksum.py b/examples/gtkchecksum.py index c2c535e..8e32873 100644 --- a/examples/gtkchecksum.py +++ b/examples/gtkchecksum.py @@ -27,7 +27,7 @@ gobject.threads_init() import gtk -from morituri.common import task, crc +from morituri.common import task, checksum def main(path, start, end): progress = task.GtkProgressRunner() @@ -37,12 +37,12 @@ def main(path, start, end): window.add(progress) window.show_all() - crctask = crc.CRC32Task(path, start, end) - progress.run(crctask) + checksumtask = checksum.CRC32Task(path, start, end) + progress.run(checksumtask) gtk.main() - print "CRC: %08X" % crctask.crc + print "CRC: %08X" % checksumtask.checksum path = 'test.flac' diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py index fe457c4..55fe322 100644 --- a/morituri/common/checksum.py +++ b/morituri/common/checksum.py @@ -197,6 +197,9 @@ class CRC32Task(ChecksumTask): """ I do a simple CRC32 check. """ + + description = 'Calculating CRC...' + def do_checksum_buffer(self, buffer, checksum): return zlib.crc32(buffer, checksum) @@ -206,6 +209,9 @@ class AccurateRipChecksumTask(ChecksumTask): See http://www.accuraterip.com/ """ + + description = 'Calculating AccurateRip checksum...' + def __init__(self, path, trackNumber, trackCount, frameStart=0, frameLength=-1): ChecksumTask.__init__(self, path, frameStart, frameLength) self._trackNumber = trackNumber