Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move imports out of S&R builtin funcs

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-19 09:12:55 +05:30
parent 5de64c93a2
commit 705ed00b5f
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/resources.py
View File

@ -323,8 +323,12 @@ class Resources(Command): # {{{
except Exception: except Exception:
continue continue
src = src.replace('def ' + func.func_name, 'def replace') src = src.replace('def ' + func.func_name, 'def replace')
if 'apply_func_to_match_groups' in src: imports = []
src = 'from calibre.ebooks.oeb.polish.utils import apply_func_to_match_groups\n\n' + src for x in func.imports.split():
if x and x.strip():
imports.append('from %s import %s' % tuple(x.split(':')))
if imports:
src = '\n'.join(imports) + '\n\n' + src
function_dict[func.name] = src function_dict[func.name] = src
json.dump(function_dict, open(dest, 'wb'), indent=4) json.dump(function_dict, open(dest, 'wb'), indent=4)

26
src/calibre/gui2/tweak_book/function_replace.py
View File

@ -10,9 +10,12 @@ import re, io
from PyQt5.Qt import pyqtSignal from PyQt5.Qt import pyqtSignal
from calibre.ebooks.oeb.polish.utils import apply_func_to_match_groups
from calibre.gui2.complete2 import EditWithComplete from calibre.gui2.complete2 import EditWithComplete
from calibre.gui2.tweak_book import dictionaries from calibre.gui2.tweak_book import dictionaries
from calibre.utils.config import JSONConfig from calibre.utils.config import JSONConfig
from calibre.utils.icu import capitalize, upper, lower, swapcase
from calibre.utils.titlecase import titlecase
user_functions = JSONConfig('editor-search-replace-functions') user_functions = JSONConfig('editor-search-replace-functions')
@ -118,42 +121,43 @@ class FunctionBox(EditWithComplete):
# Builtin functions ########################################################## # Builtin functions ##########################################################
from calibre.ebooks.oeb.polish.utils import apply_func_to_match_groups def builtin(func, name, imports='', uses_apply=False):
func.name = name
if uses_apply:
imports = 'calibre.ebooks.oeb.polish.utils:apply_func_to_match_groups ' + imports
func.imports = imports.rstrip()
def replace_uppercase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs): def replace_uppercase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs):
'''Make matched text upper case. If the regular expression contains groups, '''Make matched text upper case. If the regular expression contains groups,
only the text in the groups will be changed, otherwise the entire text is only the text in the groups will be changed, otherwise the entire text is
changed.''' changed.'''
return apply_func_to_match_groups(match, icu_upper) return apply_func_to_match_groups(match, upper)
replace_uppercase.name = 'Upper-case text' builtin(replace_uppercase, 'Upper-case text', 'calibre.utils.icu:upper', True)
def replace_lowercase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs): def replace_lowercase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs):
'''Make matched text lower case. If the regular expression contains groups, '''Make matched text lower case. If the regular expression contains groups,
only the text in the groups will be changed, otherwise the entire text is only the text in the groups will be changed, otherwise the entire text is
changed.''' changed.'''
return apply_func_to_match_groups(match, icu_lower) return apply_func_to_match_groups(match, lower)
replace_lowercase.name = 'Lower-case text' builtin(replace_lowercase, 'Lower-case text', 'calibre.utils.icu:lower', True)
def replace_capitalize(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs): def replace_capitalize(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs):
'''Capitalize matched text. If the regular expression contains groups, '''Capitalize matched text. If the regular expression contains groups,
only the text in the groups will be changed, otherwise the entire text is only the text in the groups will be changed, otherwise the entire text is
changed.''' changed.'''
from calibre.utils.icu import capitalize
return apply_func_to_match_groups(match, capitalize) return apply_func_to_match_groups(match, capitalize)
replace_capitalize.name = 'Capitalize text' builtin(replace_capitalize, 'Capitalize text', 'calibre.utils.icu:capitalize', True)
def replace_titlecase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs): def replace_titlecase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs):
'''Title-case matched text. If the regular expression contains groups, '''Title-case matched text. If the regular expression contains groups,
only the text in the groups will be changed, otherwise the entire text is only the text in the groups will be changed, otherwise the entire text is
changed.''' changed.'''
from calibre.utils.titlecase import titlecase
return apply_func_to_match_groups(match, titlecase) return apply_func_to_match_groups(match, titlecase)
replace_titlecase.name = 'Title-case text' builtin(replace_titlecase, 'Title-case text', 'calibre.utils.titlecase:titlecase', True)
def replace_swapcase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs): def replace_swapcase(match, number, file_name, metadata, dictionaries, functions, *args, **kwargs):
'''Swap the case of the matched text. If the regular expression contains groups, '''Swap the case of the matched text. If the regular expression contains groups,
only the text in the groups will be changed, otherwise the entire text is only the text in the groups will be changed, otherwise the entire text is
changed.''' changed.'''
from calibre.utils.icu import swapcase
return apply_func_to_match_groups(match, swapcase) return apply_func_to_match_groups(match, swapcase)
replace_swapcase.name = 'Swap the case of text' builtin(replace_swapcase, 'Swap the case of text', 'calibre.utils.icu:swapcase', True)