From ce920d9d1a8d60886ff2f630579f4b61cf6fad94 Mon Sep 17 00:00:00 2001
From: Eric Le Lay <222469+elelay@users.noreply.github.com>
Date: Wed, 29 Jan 2020 12:32:39 +0100
Subject: [PATCH] Revert "Update tagging.py"

---
 share/gpodder/extensions/tagging.py | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/share/gpodder/extensions/tagging.py b/share/gpodder/extensions/tagging.py
index cc47ac23..cf80ab2c 100644
--- a/share/gpodder/extensions/tagging.py
+++ b/share/gpodder/extensions/tagging.py
@@ -67,11 +67,10 @@ DefaultConfig = {
 
 
 class AudioFile(object):
-    def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
+    def __init__(self, filename, album, title, genre, pubDate, cover):
         self.filename = filename
         self.album = album
         self.title = title
-        self.subtitle = subtitle
         self.genre = genre
         self.pubDate = pubDate
         self.cover = cover
@@ -95,12 +94,6 @@ class AudioFile(object):
             if self.title is not None:
                 audio.tags['title'] = self.title
 
-            if self.subtitle is not None:
-                audio.tags['subtitle'] = self.subtitle
-
-            if self.subtitle is not None:
-                audio.tags['comments'] = self.subtitle
-
             if self.genre is not None:
                 audio.tags['genre'] = self.genre
 
@@ -139,8 +132,8 @@ class AudioFile(object):
 
 
 class OggFile(AudioFile):
-    def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
-        super(OggFile, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
+    def __init__(self, filename, album, title, genre, pubDate, cover):
+        super(OggFile, self).__init__(filename, album, title, genre, pubDate, cover)
 
     def insert_coverart(self):
         audio = File(self.filename, easy=True)
@@ -150,8 +143,8 @@ class OggFile(AudioFile):
 
 
 class Mp4File(AudioFile):
-    def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
-        super(Mp4File, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
+    def __init__(self, filename, album, title, genre, pubDate, cover):
+        super(Mp4File, self).__init__(filename, album, title, genre, pubDate, cover)
 
     def insert_coverart(self):
         audio = File(self.filename)
@@ -167,8 +160,8 @@ class Mp4File(AudioFile):
 
 
 class Mp3File(AudioFile):
-    def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
-        super(Mp3File, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
+    def __init__(self, filename, album, title, genre, pubDate, cover):
+        super(Mp3File, self).__init__(filename, album, title, genre, pubDate, cover)
 
     def insert_coverart(self):
         audio = MP3(self.filename, ID3=ID3)
@@ -221,7 +214,6 @@ class gPodderExtension:
             audio = audioClass(info['filename'],
                 info['album'],
                 info['title'],
-                info['subtitle'],
                 info['genre'],
                 info['pubDate'],
                 cover)
@@ -232,7 +224,6 @@ class gPodderExtension:
             'filename': None,
             'album': None,
             'title': None,
-            'subtitle': None,
             'genre': None,
             'pubDate': None
         }
@@ -250,8 +241,6 @@ class gPodderExtension:
         else:
             info['title'] = title
 
-        info['subtitle'] = episode.description
-
         if self.container.config.genre_tag is not None:
             info['genre'] = self.container.config.genre_tag
 
-- 
2.11.4.GIT