Merge branch '0.9.x' into fix_image_frame_description

Author: nicfit

eyed3/id3/frames.py

@@ -30,6 +30,7 @@ class FrameException(Error):
 ALBUM_ARTIST_FID   = b"TPE2"                                            # noqa
 ORIG_ARTIST_FID    = b"TOPE"                                            # noqa
 COMPOSER_FID       = b"TCOM"                                            # noqa
+CONDUCTOR_FID      = b"TPE3"                                            # noqa
 ALBUM_FID          = b"TALB"                                            # noqa
 TRACKNUM_FID       = b"TRCK"                                            # noqa
 GENRE_FID          = b"TCON"                                            # noqa

eyed3/id3/tag.py

@@ -282,6 +282,21 @@ def composer(self):
     def composer(self, v):
         self._setComposer(v)
 
+    @requireUnicode(1)
+    def _setConductor(self, val):
+        self.setTextFrame(frames.CONDUCTOR_FID, val)
+
+    def _getConductor(self):
+        return self.getTextFrame(frames.CONDUCTOR_FID)
+
+    @property
+    def conductor(self):
+        return self._getConductor()
+
+    @conductor.setter
+    def conductor(self, v):
+        self._setConductor(v)
+
     @requireUnicode(1)
     def _setAlbum(self, val):
         self.setTextFrame(frames.ALBUM_FID, val)

eyed3/plugins/classic.py

@@ -66,6 +66,8 @@ def PositiveIntArg(i):
 
         g.add_argument("--composer", dest="composer",
                        metavar="STRING", help=ARGS_HELP["--composer"])
+        g.add_argument("--conductor", dest="conductor",
+                       metavar="STRING", help=ARGS_HELP["--conductor"])
         g.add_argument("--orig-artist", dest="orig_artist",
                        metavar="STRING", help=ARGS_HELP["--orig-artist"])
         g.add_argument("-d", "--disc-num", type=PositiveIntArg, dest="disc_num",
@@ -566,6 +568,10 @@ def printTag(self, tag):
                                      tag.album_artist))
             if tag.composer:
                 printMsg("%s: %s" % (boldText("composer"), tag.composer))
+
+            if tag.conductor:
+                printMsg("%s: %s" % (boldText("conductor"), tag.conductor))
+
             if tag.original_artist:
                 printMsg("%s: %s" % (boldText("original artist"), tag.original_artist))
 
@@ -1170,6 +1176,7 @@ def _getTemplateKeys():
         "--track-offset": "Increment/decrement the track number by [-]N. "
                           "This option is applied after --track=N is set.",
         "--composer": "Set the composer's name.",
+        "--conductor": "Set the conductor's name, mostly for orchestral or choir music.",
         "--orig-artist": "Set the orignal artist's name. For example, a cover song can include "
                          "the orignal author of the track.",
 }