@@ -46,7 +46,7 @@ parser.add_argument('destination')

 args = parser.parse_args()

 destination = args.destination

-print 'copying music to, %s' % destination

+print('copying music to, %s' % destination)

 import sys

@@ -54,30 +54,40 @@ class PathFinder(object):

     def __init__(self):

         pass

+    def construct_tag_map(self, data):

+        tag_map = {}

+        for (tag, _) in data.tags:

+            tag_map[tag.lower()] = tag

+        return tag_map

+

     def get_path(self, data, orig_name):

+        tag_map = self.construct_tag_map(data)

+        print(tag_map, tag_map['title'], data.get(tag_map['title']))

         orig_name = orig_name.rpartition('.')[0]

-        title=self.clean(data.get('title', ['Unknown Title'])[0].encode('utf-8'))

+        title=self.clean(data.get(tag_map['title'], ['Unknown Title'])[0])

         if title.strip() == '': title = orig_name

-        album=self.clean(data.get('album', ['Unknown Album'])[0].encode('utf-8'))

+        album=self.clean(data.get(tag_map['album'], ['Unknown Album'])[0])

         if album.strip() == '': album = 'Unknown Album'

-        if 'performer' in data: artist = data['performer'][0].encode('utf-8')

-        elif 'conductor' in data: artist = data['conductor'][0].encode('utf-8')

-        else: artist = data.get('artist', ['Unknown Artist'])[0].encode('utf-8')

+        if 'albumartist' in data: artist = data[tag_map['albumartist']][0]

+        elif 'performer' in data: artist = data[tag_map['performer']][0]

+        elif 'conductor' in data: artist = data[tag_map['conductor']][0]

+        else: artist = data.get(tag_map['artist'], ['Unknown Artist'])[0]

         artist = self.clean(artist)

         if artist.strip() == '': artist = 'Unknown Artist'

-        tracknumber=self.clean(data.get('tracknumber', ['--'])[0].encode('utf-8'))

+        tracknumber=self.clean(data.get(tag_map['tracknumber'], ['--'])[0])

         if tracknumber != '--':

            try:

                tracknumber = tracknumber.partition('_')[0]

                tracknumber = '%02d' % int(tracknumber)

            except ValueError:

                pass

-        discnumber=self.clean(data.get('discnumber', ['--'])[0].partition('/')[0].encode('utf-8'))

-        if discnumber != '--': discnumber = '%02d' % int(discnumber)

+        discnumber=self.clean(data.get(tag_map['discnumber'], ['--'])[0].partition('/')[0])

+        print(f'discnumber is: {discnumber}')

+        if discnumber.strip() not in {'', '--'}: discnumber = '%02d' % int(discnumber)

         result =[ os.path.join(artist[0].upper(),artist,album), '%s_%s' % (tracknumber, title) ]

-        if discnumber != '--':

+        if discnumber.strip() not in {'', '--'}:

             result[1] = '%s_%s' % (discnumber, result[1])

         return result

@@ -107,23 +117,23 @@ for line in sys.stdin:

         path = os.path.join(destination, path)

-        checkname = '%s.%s' % ('__'.join(filter(None, [name, suf])), ext)

+        checkname = '%s.%s' % ('__'.join([_f for _f in [name, suf] if _f]), ext)

-        while os.path.exists(os.path.join(path, '%s.%s' % ('__'.join(filter(None, [name, suf])), ext))):

+        while os.path.exists(os.path.join(path, '%s.%s' % ('__'.join([_f for _f in [name, suf] if _f]), ext))):

             x += 1

             suf = '%02d' % x

-        name = '%s.%s' % ('__'.join(filter(None, [name, suf])), ext)

+        name = '%s.%s' % ('__'.join([_f for _f in [name, suf] if _f]), ext)

         try:

             os.makedirs(path)

-        except OSError, e:

+        except OSError as e:

             if e.errno == 17:

                 pass

             else:

                 raise

-        print os.path.join(path, name)

+        print(os.path.join(path, name))

         shutil.copy(line, os.path.join(path, name))

-    except Exception, e:

-        print >> sys.stderr, 'Error Processing: %s' % line,e

-        print 'Error Processing: %s' % line,e

+    except Exception as e:

+        print('Error Processing: %s' % line,e, file=sys.stderr)

+        print('Error Processing: %s' % line,e)