diff -ur kagu-dist/kagu-scanner.py kagu-dist-new/kagu-scanner.py --- kagu-dist/kagu-scanner.py 2007-07-09 21:09:55.000000000 +0300 +++ kagu-dist-new/kagu-scanner.py 2007-07-09 21:33:55.292056160 +0300 @@ -357,6 +357,12 @@ album = row['album'] art_path = self.get_existing_cover(dir) if not art_path: art_path = self.get_net_album_cover(album,dir) + + if art_path: + tmp = art_path.encode('ascii','ignore') + if tmp != art_path: + art_path = False + if not art_path: art_path = "data/UNKNOWN_UNKNOWN.jpg" self.DB.set_album_art_path(album,art_path) @@ -379,7 +385,7 @@ def get_net_album_cover(self, album, dir): cover_dir = os.path.join(self.data_dir,'covers') if not os.path.exists(cover_dir): os.mkdir(cover_dir) - fn=os.path.join(cover_dir,album+'.jpg') + fn=os.path.join(cover_dir,album.encode('ascii','ignore')+'.jpg') if os.path.exists(fn): return fn # file already exists... @@ -406,7 +412,7 @@ print "Yahoo DL: "+filename.encode('ascii','ignore') urladdress="http://images.search.yahoo.com/search/images?" imageSearch = self._fix_net_search_string(search_string) - params = {'p':imageSearch} + params = {'p':imageSearch.encode('ascii', 'ignore')} txdata = urllib.urlencode(params) urladdress=urladdress+txdata+"&ei=UTF-8" @@ -439,7 +445,7 @@ print "MSN DL: "+filename.encode('ascii','ignore') urladdress="http://search.msn.com/images/results.aspx?" imageSearch = self._fix_net_search_string(search_string) - params = {'q':imageSearch} + params = {'q':imageSearch.encode('ascii', 'ignore')} txdata = urllib.urlencode(params) urladdress=urladdress+txdata+"&FORM=QBIR"