Merge pull request #738 from gpodder/revert-684-patch-1
Revert "Update tagging.py"
This commit is contained in:
commit
d2da725bcc
|
@ -67,11 +67,10 @@ DefaultConfig = {
|
||||||
|
|
||||||
|
|
||||||
class AudioFile(object):
|
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.filename = filename
|
||||||
self.album = album
|
self.album = album
|
||||||
self.title = title
|
self.title = title
|
||||||
self.subtitle = subtitle
|
|
||||||
self.genre = genre
|
self.genre = genre
|
||||||
self.pubDate = pubDate
|
self.pubDate = pubDate
|
||||||
self.cover = cover
|
self.cover = cover
|
||||||
|
@ -95,12 +94,6 @@ class AudioFile(object):
|
||||||
if self.title is not None:
|
if self.title is not None:
|
||||||
audio.tags['title'] = self.title
|
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:
|
if self.genre is not None:
|
||||||
audio.tags['genre'] = self.genre
|
audio.tags['genre'] = self.genre
|
||||||
|
|
||||||
|
@ -139,8 +132,8 @@ class AudioFile(object):
|
||||||
|
|
||||||
|
|
||||||
class OggFile(AudioFile):
|
class OggFile(AudioFile):
|
||||||
def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
|
def __init__(self, filename, album, title, genre, pubDate, cover):
|
||||||
super(OggFile, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
|
super(OggFile, self).__init__(filename, album, title, genre, pubDate, cover)
|
||||||
|
|
||||||
def insert_coverart(self):
|
def insert_coverart(self):
|
||||||
audio = File(self.filename, easy=True)
|
audio = File(self.filename, easy=True)
|
||||||
|
@ -150,8 +143,8 @@ class OggFile(AudioFile):
|
||||||
|
|
||||||
|
|
||||||
class Mp4File(AudioFile):
|
class Mp4File(AudioFile):
|
||||||
def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
|
def __init__(self, filename, album, title, genre, pubDate, cover):
|
||||||
super(Mp4File, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
|
super(Mp4File, self).__init__(filename, album, title, genre, pubDate, cover)
|
||||||
|
|
||||||
def insert_coverart(self):
|
def insert_coverart(self):
|
||||||
audio = File(self.filename)
|
audio = File(self.filename)
|
||||||
|
@ -167,8 +160,8 @@ class Mp4File(AudioFile):
|
||||||
|
|
||||||
|
|
||||||
class Mp3File(AudioFile):
|
class Mp3File(AudioFile):
|
||||||
def __init__(self, filename, album, title, subtitle, genre, pubDate, cover):
|
def __init__(self, filename, album, title, genre, pubDate, cover):
|
||||||
super(Mp3File, self).__init__(filename, album, title, subtitle, genre, pubDate, cover)
|
super(Mp3File, self).__init__(filename, album, title, genre, pubDate, cover)
|
||||||
|
|
||||||
def insert_coverart(self):
|
def insert_coverart(self):
|
||||||
audio = MP3(self.filename, ID3=ID3)
|
audio = MP3(self.filename, ID3=ID3)
|
||||||
|
@ -221,7 +214,6 @@ class gPodderExtension:
|
||||||
audio = audioClass(info['filename'],
|
audio = audioClass(info['filename'],
|
||||||
info['album'],
|
info['album'],
|
||||||
info['title'],
|
info['title'],
|
||||||
info['subtitle'],
|
|
||||||
info['genre'],
|
info['genre'],
|
||||||
info['pubDate'],
|
info['pubDate'],
|
||||||
cover)
|
cover)
|
||||||
|
@ -232,7 +224,6 @@ class gPodderExtension:
|
||||||
'filename': None,
|
'filename': None,
|
||||||
'album': None,
|
'album': None,
|
||||||
'title': None,
|
'title': None,
|
||||||
'subtitle': None,
|
|
||||||
'genre': None,
|
'genre': None,
|
||||||
'pubDate': None
|
'pubDate': None
|
||||||
}
|
}
|
||||||
|
@ -250,8 +241,6 @@ class gPodderExtension:
|
||||||
else:
|
else:
|
||||||
info['title'] = title
|
info['title'] = title
|
||||||
|
|
||||||
info['subtitle'] = episode.description
|
|
||||||
|
|
||||||
if self.container.config.genre_tag is not None:
|
if self.container.config.genre_tag is not None:
|
||||||
info['genre'] = self.container.config.genre_tag
|
info['genre'] = self.container.config.genre_tag
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue