Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-26 17:47:25 +05:30
parent 067e82083f
commit 5422fb170b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/constants.py
View File

@ -279,6 +279,7 @@ else:
dv = getenv('CALIBRE_DEVELOP_FROM')
is_running_from_develop = bool(getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path)
del dv
in_develop_mode = getenv('CALIBRE_ENABLE_DEVELOP_MODE') == '1'
def get_version():

4
src/calibre/customize/builtins.py
View File

@ -8,7 +8,7 @@ import os, glob, re
from calibre import guess_type
from calibre.customize import (FileTypePlugin, MetadataReaderPlugin,
MetadataWriterPlugin, PreferencesPlugin, InterfaceActionBase, StoreBase)
from calibre.constants import numeric_version
from calibre.constants import numeric_version, in_develop_mode
from calibre.ebooks.metadata.archive import ArchiveExtract, KPFExtract, get_comic_metadata
from calibre.ebooks.html.to_zip import HTML2ZIP
@ -1102,7 +1102,7 @@ plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
ActionPluginUpdater, ActionPickRandom, ActionEditToC, ActionSortBy,
ActionMarkBooks, ActionEmbed, ActionTemplateTester, ActionTagMapper, ActionAuthorMapper,
ActionVirtualLibrary]
if os.environ.get('CALIBRE_ENABLE_DEVELOP_MODE') == '1':
if in_develop_mode:
plugins.append(ActionBrowseAnnotations)
# }}}

10
src/calibre/gui2/viewer/web_view.py
View File

@ -19,8 +19,8 @@ from PyQt5.QtWebEngineWidgets import (
from calibre import as_unicode, prints
from calibre.constants import (
FAKE_HOST, FAKE_PROTOCOL, __version__, config_dir, is_running_from_develop,
isosx, iswindows
FAKE_HOST, FAKE_PROTOCOL, __version__, config_dir, in_develop_mode,
is_running_from_develop, isosx, iswindows
)
from calibre.ebooks.metadata.book.base import field_metadata
from calibre.ebooks.oeb.polish.utils import guess_type
@ -33,7 +33,7 @@ from calibre.srv.code import get_translations_data
from calibre.utils.config import JSONConfig
from calibre.utils.serialize import json_loads
from calibre.utils.shared_file import share_open
from polyglot.builtins import as_bytes, hasenv, iteritems, unicode_type
from polyglot.builtins import as_bytes, iteritems, unicode_type
from polyglot.functools import lru_cache
try:
@ -229,8 +229,8 @@ def create_profile():
js = P('viewer.js', data=True, allow_user_override=False)
translations_json = get_translations_data() or b'null'
js = js.replace(b'__TRANSLATIONS_DATA__', translations_json, 1)
if hasenv('CALIBRE_ENABLE_DEVELOP_MODE'):
js = js.replace(b'__IN_DEVELOP_MODE__', os.environ['CALIBRE_ENABLE_DEVELOP_MODE'].encode('ascii'))
if in_develop_mode:
js = js.replace(b'__IN_DEVELOP_MODE__', b'1')
insert_scripts(ans, create_script('viewer.js', js))
url_handler = UrlSchemeHandler(ans)
ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler)

8
src/calibre/srv/code.py
View File

@ -4,7 +4,6 @@
import hashlib
import os
import random
import shutil
import sys
@ -13,6 +12,7 @@ from json import load as load_json_file, loads as json_loads
from threading import Lock
from calibre import as_unicode
from calibre.constants import in_develop_mode
from calibre.customize.ui import available_input_formats
from calibre.db.view import sanitize_sort_field_name
from calibre.srv.ajax import search_result
@ -31,7 +31,7 @@ from calibre.utils.localization import (
)
from calibre.utils.search_query_parser import ParseException
from calibre.utils.serialize import json_dumps
from polyglot.builtins import iteritems, itervalues, hasenv
from polyglot.builtins import iteritems, itervalues
POSTABLE = frozenset({'GET', 'POST', 'HEAD'})
@ -39,9 +39,9 @@ POSTABLE = frozenset({'GET', 'POST', 'HEAD'})
@endpoint('', auth_required=False)
def index(ctx, rd):
ans_file = lopen(P('content-server/index-generated.html'), 'rb')
if not hasenv('CALIBRE_ENABLE_DEVELOP_MODE'):
if not in_develop_mode:
return ans_file
return ans_file.read().replace(b'__IN_DEVELOP_MODE__', os.environ['CALIBRE_ENABLE_DEVELOP_MODE'].encode('ascii'))
return ans_file.read().replace(b'__IN_DEVELOP_MODE__', b'1')
@endpoint('/robots.txt', auth_required=False)