From eb73e3a33bbc35aa1821e444218d61f1ac90ded4 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 10 Jun 2010 10:21:37 +0100 Subject: [PATCH] Put the flag back in usbms.driver to force metadata from paths, if that flag is set in the driver. Continue to ignore the flag set in the add-books dialog --- src/calibre/devices/usbms/driver.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index 1666398fc9..0cd6a8f79c 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -374,8 +374,13 @@ class USBMS(CLI, Device): @classmethod def book_from_path(cls, prefix, lpath): from calibre.ebooks.metadata import MetaInformation - mi = cls.metadata_from_path(cls.normalize_path(os.path.join(prefix, lpath))) + if cls.settings().read_metadata or cls.MUST_READ_METADATA: + mi = cls.metadata_from_path(cls.normalize_path(os.path.join(prefix, lpath))) + else: + from calibre.ebooks.metadata.meta import metadata_from_filename + mi = metadata_from_filename(cls.normalize_path(os.path.basename(lpath)), + cls.build_template_regexp()) if mi is None: mi = MetaInformation(os.path.splitext(os.path.basename(lpath))[0], [_('Unknown')])