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 2024-09-01 07:31:31 +05:30
parent f51807d9e8
commit 891d239d2f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/constants.py
View File

@ -492,3 +492,16 @@ def get_umask():
# with multi-threading. It's absurd there is no way to safely read the current # with multi-threading. It's absurd there is no way to safely read the current
# umask of a process. # umask of a process.
get_umask() get_umask()
@lru_cache(maxsize=2)
def bundled_binaries_dir() -> str:
if ismacos and hasattr(sys, 'frameworks_dir'):
base = os.path.join(os.path.dirname(sys.frameworks_dir), 'utils.app', 'Contents', 'MacOS')
return base
if iswindows and hasattr(sys, 'frozen'):
base = sys.extensions_location if hasattr(sys, 'new_app_layout') else os.path.dirname(sys.executable)
return base
if (islinux or isbsd) and getattr(sys, 'frozen', False):
return os.path.join(sys.executables_location, 'bin')
return ''

15
src/calibre/ebooks/pdf/pdftohtml.py
View File

@ -6,17 +6,16 @@ import os
import re import re
import shutil import shutil
import subprocess import subprocess
import sys
from calibre import CurrentDir, prints, xml_replace_entities from calibre import CurrentDir, prints, xml_replace_entities
from calibre.constants import isbsd, islinux, ismacos, iswindows from calibre.constants import bundled_binaries_dir, isbsd, iswindows
from calibre.ebooks import ConversionError, DRMError from calibre.ebooks import ConversionError, DRMError
from calibre.ebooks.chardet import xml_to_unicode from calibre.ebooks.chardet import xml_to_unicode
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.cleantext import clean_xml_chars from calibre.utils.cleantext import clean_xml_chars
from calibre.utils.ipc import eintr_retry_call from calibre.utils.ipc import eintr_retry_call
PDFTOHTML = 'pdftohtml' PDFTOHTML = 'pdftohtml' + ('.exe' if iswindows else '')
def popen(cmd, **kw): def popen(cmd, **kw):
@ -25,14 +24,8 @@ def popen(cmd, **kw):
return subprocess.Popen(cmd, **kw) return subprocess.Popen(cmd, **kw)
if ismacos and hasattr(sys, 'frameworks_dir'): if bbd := bundled_binaries_dir():
base = os.path.join(os.path.dirname(sys.frameworks_dir), 'utils.app', 'Contents', 'MacOS') PDFTOHTML = os.path.join(bbd, PDFTOHTML)
PDFTOHTML = os.path.join(base, PDFTOHTML)
if iswindows and hasattr(sys, 'frozen'):
base = sys.extensions_location if hasattr(sys, 'new_app_layout') else os.path.dirname(sys.executable)
PDFTOHTML = os.path.join(base, 'pdftohtml.exe')
if (islinux or isbsd) and getattr(sys, 'frozen', False):
PDFTOHTML = os.path.join(sys.executables_location, 'bin', 'pdftohtml')
PDFTOTEXT = os.path.join(os.path.dirname(PDFTOHTML), 'pdftotext' + ('.exe' if iswindows else '')) PDFTOTEXT = os.path.join(os.path.dirname(PDFTOHTML), 'pdftotext' + ('.exe' if iswindows else ''))