--- a/debian/changelog

+++ b/debian/changelog

@@ -1,8 +1,15 @@

+mp3togo (0.5.1) unstable; urgency=low

+

+ * Added --no-tags option which disables tagging of output files.

+ * Added a test for exceptions to the tagging code.

+

+ -- Simeon Veldstra <reallifesim@gmail.com> Sun, 28 May 2006 11:04:37 -0700

+

mp3togo (0.5.0) unstable; urgency=low

* Added cluster mode feature.

- -- Simeon Veldstra <sim@puddle.ca> Fri, 26 May 2006 20:08:39 -0700

+ -- Simeon Veldstra <reallifesim@gmail.com> Fri, 26 May 2006 20:08:39 -0700

mp3togo (0.4.1) unstable; urgency=low

--- a/debian/mp3togo.1

+++ b/debian/mp3togo.1

@@ -134,4 +134,4 @@ License can be found in /usr/share/commo

.PP

mp3togo can be found online at http://puddle.ca/mp3togo

-.\" created by instant / docbook-to-man, Sat 20 May 2006, 02:36

+.\" created by instant / docbook-to-man, Fri 26 May 2006, 20:33

--- a/mp3togo/__init__.py

+++ b/mp3togo/__init__.py

@@ -21,5 +21,5 @@

# __all__ = ('converter', 'main', 'options', 'setup')

-version = '0.5.0'

+version = '0.5.1'

--- a/mp3togo/conf.py

+++ b/mp3togo/conf.py

@@ -84,6 +84,8 @@ class Options(options.Options):

'''The number of directory levels to preserve in the output tree. Use 0 to put all output files directly into the target directory. Use 2 to create a directory for the Artist and then the Album (Assuming your music collection is organized in directories by artist then album).'''),

('treestructure', '', 'format', '', None,

'''A string specifying the format for the output files. The format string can contain the following escapes:<li>%a - Artist<li>%l - Album<li>%t - Title<li>%y - Year<li>%g - Genre<li>%% - Literal '%'<br>Overrides --tree-depth.'''),

+ ('notags', '', 'no-tags', False, None,

+ '''Do not try to write tags to the output files.'''),

('maxunits', 'm', 'max-size', '0', self._units,

'''The disk space available to use in bytes. Append 'M' for megabytes, 'G' for gigabytes or 'K' for kilobytes. Use 0 to use all available space on the filesystem.'''),

('maxsize', '', '', 0L, None, ''),

--- a/mp3togo/tags.py

+++ b/mp3togo/tags.py

@@ -150,13 +150,20 @@ class Tags(UserDict.DictMixin):

vf = ogg.vorbis.VorbisFile(filename)

out = vf.comment()

puttags(out)

- out.write_to(filename)

+ try:

+ out.write_to(filename)

+ except:

+ pass

del out

del vf

elif fmt == 'mp3':

out = ID3.ID3(filename, as_tuple=1)

puttags(out)

- out.write()

+ try:

+ out.write()

+ except:

+ # Tagging failed, but the file should be okay.

+ pass

del out

else:

self._lock.release()

--- a/mp3togo/track.py

+++ b/mp3togo/track.py

@@ -227,13 +227,14 @@ class Track:

# Tag

# tag files from the cache as well, brwarning may have changed

- def tag_output():

- self.tags.write(self._outname)

- return True

- job = task.SimpleTask(self, tag_output, None,

- lambda: True, name="Tagging")

- tasks.append(job)

- del job

+ if not opts['notags']:

+ def tag_output():

+ self.tags.write(self._outname)

+ return True

+ job = task.SimpleTask(self, tag_output, None,

+ lambda: True, name="Tagging")

+ tasks.append(job)

+ del job

# Cache the output if we had to go to the trouble of producing it

if not self._hash and self._cache:

--- a/setup.py

+++ b/setup.py

@@ -22,6 +22,8 @@ import sys, os

from distutils.core import setup

+import mp3togo

+

## Sort out the version number from the containing directory

#release = os.path.basename(os.getcwd()).split('-')[1]

#fp = file("mp3togo/__init__.py", 'r')

@@ -39,6 +41,9 @@ from distutils.core import setup

# patch distutils if it can't cope with the "classifiers" or

# "download_url" keywords

+

+release = mp3togo.version

+

if sys.version < '2.2.3':

from distutils.dist import DistributionMetadata

DistributionMetadata.classifiers = None