A spot of refactoring

This commit is contained in:
Kovid Goyal 2017-05-08 21:07:29 +05:30
parent 50d027890d
commit 0562750ed9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 3 deletions

View File

@ -38,6 +38,8 @@ NAMES = {
} }
name_for = NAMES.get name_for = NAMES.get
all_book_searches = BOOK_SEARCHES.__iter__
all_author_searches = AUTHOR_SEARCHES.__iter__
def qquote(val): def qquote(val):

View File

@ -21,7 +21,7 @@ from calibre.gui2.dnd import (dnd_has_image, dnd_get_image, dnd_get_files,
from calibre.ebooks import BOOK_EXTENSIONS from calibre.ebooks import BOOK_EXTENSIONS
from calibre.ebooks.metadata.book.base import (field_metadata, Metadata) from calibre.ebooks.metadata.book.base import (field_metadata, Metadata)
from calibre.ebooks.metadata.book.render import mi_to_html from calibre.ebooks.metadata.book.render import mi_to_html
from calibre.ebooks.metadata.search_internet import url_for_book_search, NAMES, BOOK_SEARCHES from calibre.ebooks.metadata.search_internet import url_for_book_search, name_for, all_book_searches
from calibre.gui2 import (config, open_url, pixmap_to_data, gprefs, rating_font, NO_URL_FORMATTING, default_author_link) from calibre.gui2 import (config, open_url, pixmap_to_data, gprefs, rating_font, NO_URL_FORMATTING, default_author_link)
from calibre.utils.config import tweaks from calibre.utils.config import tweaks
from calibre.utils.img import image_from_x, blend_image from calibre.utils.img import image_from_x, blend_image
@ -51,8 +51,8 @@ def copy_all(web_view):
def create_search_internet_menu(callback): def create_search_internet_menu(callback):
m = QMenu(_('Search the internet for this book…')) m = QMenu(_('Search the internet for this book…'))
for k in sorted(BOOK_SEARCHES, key=lambda k: NAMES[k].lower()): for k in sorted(all_book_searches(), key=lambda k: name_for(k).lower()):
m.addAction(NAMES[k], partial(callback, k)) m.addAction(name_for(k), partial(callback, k))
return m return m