removed automatic loading of emf definitions

This commit is contained in:
Rudi Grinberg 2012-10-09 12:36:52 -04:00
parent cad6a7e7b0
commit a88b7255ff
2 changed files with 97 additions and 86 deletions

View file

@ -3,6 +3,13 @@ import media.monitor.process as md
from os.path import normpath from os.path import normpath
from media.monitor.pure import format_length, file_md5 from media.monitor.pure import format_length, file_md5
defs_loaded = False
def is_defs_loaded():
global defs_loaded
return defs_loaded
def load_definitions():
with md.metadata('MDATA_KEY_DURATION') as t: with md.metadata('MDATA_KEY_DURATION') as t:
t.default(u'0.0') t.default(u'0.0')
t.depends('length') t.depends('length')

View file

@ -11,6 +11,12 @@ from media.monitor.log import Loggable
from media.monitor.pure import format_length, truncate_to_length from media.monitor.pure import format_length, truncate_to_length
import media.monitor.pure as mmp import media.monitor.pure as mmp
# emf related stuff
from media.metadata.process import global_reader
import media.metadata.definitions as defs
from pprint import pformat
defs.load_definitions()
""" """
list of supported easy tags in mutagen version 1.20 list of supported easy tags in mutagen version 1.20
['albumartistsort', 'musicbrainz_albumstatus', 'lyricist', 'releasecountry', ['albumartistsort', 'musicbrainz_albumstatus', 'lyricist', 'releasecountry',
@ -186,11 +192,9 @@ class Metadata(Loggable):
# extremely unclear and needs to be refactored. # extremely unclear and needs to be refactored.
#if full_mutagen is None: raise BadSongFile(fpath) #if full_mutagen is None: raise BadSongFile(fpath)
try: # emf stuff for testing: try: # emf stuff for testing:
import media.metadata.process as md
import pprint.pformat as pf
if full_mutagen: if full_mutagen:
normalized = md.global_reader.read('fpath', full_mutagen) normalized = global_reader.read('fpath', full_mutagen)
self.logger.info(pf(normalized)) self.logger.info(pformat(normalized))
except Exception as e: except Exception as e:
self.logger.unexpected_exception(e) self.logger.unexpected_exception(e)