mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-14 02:26:53 -07:00
Update vendored beets to 1.6.0
Updates colorama to 0.4.6 Adds confuse version 1.7.0 Updates jellyfish to 0.9.0 Adds mediafile 0.10.1 Updates munkres to 1.1.4 Updates musicbrainzngs to 0.7.1 Updates mutagen to 1.46.0 Updates pyyaml to 6.0 Updates unidecode to 1.3.6
This commit is contained in:
parent
5073ec0c6f
commit
56c6773c6b
385 changed files with 25143 additions and 18080 deletions
|
@ -1,4 +1,3 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# This file is part of beets.
|
||||
# Copyright 2016, Adrian Sampson.
|
||||
#
|
||||
|
@ -17,13 +16,12 @@
|
|||
automatically whenever tags are written.
|
||||
"""
|
||||
|
||||
from __future__ import division, absolute_import, print_function
|
||||
|
||||
from beets.plugins import BeetsPlugin
|
||||
from beets import ui
|
||||
from beets import util
|
||||
from beets import config
|
||||
from beets import mediafile
|
||||
import mediafile
|
||||
import mutagen
|
||||
|
||||
_MUTAGEN_FORMATS = {
|
||||
|
@ -48,7 +46,7 @@ _MUTAGEN_FORMATS = {
|
|||
class ScrubPlugin(BeetsPlugin):
|
||||
"""Removes extraneous metadata from files' tags."""
|
||||
def __init__(self):
|
||||
super(ScrubPlugin, self).__init__()
|
||||
super().__init__()
|
||||
self.config.add({
|
||||
'auto': True,
|
||||
})
|
||||
|
@ -60,15 +58,15 @@ class ScrubPlugin(BeetsPlugin):
|
|||
def scrub_func(lib, opts, args):
|
||||
# Walk through matching files and remove tags.
|
||||
for item in lib.items(ui.decargs(args)):
|
||||
self._log.info(u'scrubbing: {0}',
|
||||
self._log.info('scrubbing: {0}',
|
||||
util.displayable_path(item.path))
|
||||
self._scrub_item(item, opts.write)
|
||||
|
||||
scrub_cmd = ui.Subcommand('scrub', help=u'clean audio tags')
|
||||
scrub_cmd = ui.Subcommand('scrub', help='clean audio tags')
|
||||
scrub_cmd.parser.add_option(
|
||||
u'-W', u'--nowrite', dest='write',
|
||||
'-W', '--nowrite', dest='write',
|
||||
action='store_false', default=True,
|
||||
help=u'leave tags empty')
|
||||
help='leave tags empty')
|
||||
scrub_cmd.func = scrub_func
|
||||
|
||||
return [scrub_cmd]
|
||||
|
@ -79,7 +77,7 @@ class ScrubPlugin(BeetsPlugin):
|
|||
"""
|
||||
classes = []
|
||||
for modname, clsname in _MUTAGEN_FORMATS.items():
|
||||
mod = __import__('mutagen.{0}'.format(modname),
|
||||
mod = __import__(f'mutagen.{modname}',
|
||||
fromlist=[clsname])
|
||||
classes.append(getattr(mod, clsname))
|
||||
return classes
|
||||
|
@ -107,8 +105,8 @@ class ScrubPlugin(BeetsPlugin):
|
|||
for tag in f.keys():
|
||||
del f[tag]
|
||||
f.save()
|
||||
except (IOError, mutagen.MutagenError) as exc:
|
||||
self._log.error(u'could not scrub {0}: {1}',
|
||||
except (OSError, mutagen.MutagenError) as exc:
|
||||
self._log.error('could not scrub {0}: {1}',
|
||||
util.displayable_path(path), exc)
|
||||
|
||||
def _scrub_item(self, item, restore=True):
|
||||
|
@ -121,7 +119,7 @@ class ScrubPlugin(BeetsPlugin):
|
|||
mf = mediafile.MediaFile(util.syspath(item.path),
|
||||
config['id3v23'].get(bool))
|
||||
except mediafile.UnreadableFileError as exc:
|
||||
self._log.error(u'could not open file to scrub: {0}',
|
||||
self._log.error('could not open file to scrub: {0}',
|
||||
exc)
|
||||
return
|
||||
images = mf.images
|
||||
|
@ -131,21 +129,21 @@ class ScrubPlugin(BeetsPlugin):
|
|||
|
||||
# Restore tags, if enabled.
|
||||
if restore:
|
||||
self._log.debug(u'writing new tags after scrub')
|
||||
self._log.debug('writing new tags after scrub')
|
||||
item.try_write()
|
||||
if images:
|
||||
self._log.debug(u'restoring art')
|
||||
self._log.debug('restoring art')
|
||||
try:
|
||||
mf = mediafile.MediaFile(util.syspath(item.path),
|
||||
config['id3v23'].get(bool))
|
||||
mf.images = images
|
||||
mf.save()
|
||||
except mediafile.UnreadableFileError as exc:
|
||||
self._log.error(u'could not write tags: {0}', exc)
|
||||
self._log.error('could not write tags: {0}', exc)
|
||||
|
||||
def import_task_files(self, session, task):
|
||||
"""Automatically scrub imported files."""
|
||||
for item in task.imported_items():
|
||||
self._log.debug(u'auto-scrubbing {0}',
|
||||
self._log.debug('auto-scrubbing {0}',
|
||||
util.displayable_path(item.path))
|
||||
self._scrub_item(item)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue