Merge with bugfix-0.5.6

file:4766166d9fffbc6760f4c1c29e252e4deabf01a5 -> file:445b78847c814d3ed3ebd6be97e40ae4550a9e7c
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mp3togo (0.5.6) unstable; urgency=low
+
+ * Fixed divide by zero error and missing symbol error.
+ * Fixed missing genre tag in ogg file error.
+ * Thanks to Mark Hewitt for the report and fixes.
+
+ -- Simeon Veldstra <reallifesim@gmail.com> Wed, 28 Jun 2006 23:07:04 -0700
+
mp3togo (0.5.5) unstable; urgency=low
* Added support for python-eyeD3 for more robust handling of unicode tags.
file:7ee7774fab25a83486bbea7b7c253e168041e0db -> file:c15a7730fbfb69ca21437296afda6ba1cf7a0c97
--- 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, Mon 26 Jun 2006, 19:31
+.\" created by instant / docbook-to-man, Wed 28 Jun 2006, 23:10
file:feca2d1f7d37286d4f03ad1d73bc454cd20d41d9 -> file:8438560af378557578d35afc8e6bc4dd24489531
--- a/mp3togo/conf.py
+++ b/mp3togo/conf.py
@@ -20,7 +20,9 @@
# requires python-pyvorbis and python-id3 and lame
# and mpg321
-import sys, os
+import sys
+import os
+import time
import mp3togo
import mp3togo.options as options
@@ -182,6 +184,7 @@ Description:
# Check for Third party modules:
self.mod['ogg.vorbis'] = False
self.mod['ID3'] = False
+ self.mod['eyeD3'] = False
self.mod['xmms'] = False
# Go ahead and read in the data:
@@ -279,7 +282,7 @@ Description:
def try_print(msg):
"""Try to print a message to a nonblocking stdout"""
- for i in range(5):
+ for i in range(1, 6):
try:
sys.stdout.write(msg)
return
file:2ef76dee5e293f844864ea21f9282ef510997302 -> file:ab5ad8d464e10e38873d54a275b8a34e81c632f9
--- a/mp3togo/tags.py
+++ b/mp3togo/tags.py
@@ -90,6 +90,8 @@ class Tags(UserDict.DictMixin):
o = {}
for k in d.keys():
o[k] = list(d[k])
+ if not o.has_key('GENRE'):
+ o['GENRE'] = 'Other'
return o
if self._type == 'mp3' and HAVE_ID3:
@@ -99,7 +101,7 @@ class Tags(UserDict.DictMixin):
self._tags['ARTIST'] = [eye.getArtist() or '']
self._tags['ALBUM'] = [eye.getAlbum() or '']
self._tags['TITLE'] = [eye.getTitle() or '']
- self._tags['GENRE'] = [eye.getGenre().name or '']
+ self._tags['GENRE'] = [eye.getGenre().name or 'Other']
del eye
elif HAVE_ID3:
info = ID3.ID3(self._file, as_tuple=1).as_dict()