From 418d7ea73bc920ed61d68a4f6aa87be3e156d25e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 25 Jun 2009 01:52:37 +0300 Subject: [PATCH] Fixed "unknown" case If we cannot recode the string, use the string as-it-is. Removed some debug info, and added a main, for debugging. --- src/album_art_spec.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/album_art_spec.py b/src/album_art_spec.py index 67b68b1..6896465 100644 --- a/src/album_art_spec.py +++ b/src/album_art_spec.py @@ -8,7 +8,6 @@ THUMBS_LOCATION = os.getenv ("HOME") + "/.thumbnails/cropped/" def getCoverArtFileName (album): """Returns the cover art's filename that is formed from the album name.""" - print "Calculating album art for " + album album = unicode (album) albumString=dropInsideContent(album,"[","]" ) albumString=dropInsideContent(albumString,"{","}" ) @@ -22,26 +21,22 @@ def getCoverArtFileName (album): albumString=string.replace(albumString," "," ") try: - print "Trying NFKD" albumString=unicodedata.normalize('NFKD',albumString).encode() albumString=albumString.encode() - print albumString except: try: - print "Trying latin-1" albumString=albumString.encode('latin-1', 'ignore') albumString=unicodedata.normalize('NFKD',albumString).encode("ascii") albumString=str(albumString) print albumString except Exception, e: - albumString="unknown" - print "unknown" + str(e) + albumString=str(albumString) + print "DEBUG: Using plain string" if len(albumString)==0: albumString=" " albumMD5=md5.new(albumString).hexdigest() emptyMD5=md5.new(" ").hexdigest() albumArt=COVERS_LOCATION + "album-" + emptyMD5 + "-" + albumMD5 + ".jpeg" - print "Album art:" + albumArt return albumArt @@ -60,3 +55,8 @@ def dropInsideContent(s, startMarker, endMarker): if startPos>0 and endPos>0 and endPos>startPos: return s[0:startPos]+s[endPos+1:len(s)] return s + +if __name__ == "__main__": + + print "album art: %s" % (getCoverArtFileName (unicode("Absolution"))) + print "thumbnail: %s" % (getCoverArtThumbFileName (u"Absolution")) -- 1.7.9.5