diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py index b0c43a8182..3f3cc3e142 100644 --- a/src/calibre/ebooks/metadata/meta.py +++ b/src/calibre/ebooks/metadata/meta.py @@ -67,10 +67,6 @@ def _metadata_from_formats(formats, force_read_metadata=False, pattern=None): return mi -def is_recipe(filename): - return filename.startswith('calibre') and \ - filename.rpartition('.')[0].endswith('_recipe_out') - def get_metadata(stream, stream_type='lrf', use_libprs_metadata=False, force_read_metadata=False, pattern=None): pos = 0 @@ -106,7 +102,7 @@ def _get_metadata(stream, stream_type, use_libprs_metadata, mi = MetaInformation(None, None) name = os.path.basename(getattr(stream, 'name', '')) base = metadata_from_filename(name, pat=pattern) - if force_read_metadata or is_recipe(name) or prefs['read_file_metadata']: + if force_read_metadata or prefs['read_file_metadata']: mi = get_file_type_metadata(stream, stream_type) if base.title == os.path.splitext(name)[0] and \ base.is_null('authors') and base.is_null('isbn'): diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index fff2d2189c..3471d93332 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -3024,7 +3024,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): format = os.path.splitext(path)[1][1:].lower() stream = path if hasattr(path, 'read') else lopen(path, 'rb') stream.seek(0) - mi = get_metadata(stream, format, use_libprs_metadata=False) + mi = get_metadata(stream, format, use_libprs_metadata=False, + force_read_metadata=True) stream.seek(0) if mi.series_index is None: mi.series_index = self.get_next_series_num_for(mi.series)