1
0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-03 07:15:53 +01:00

Cleanup, cleanup

This commit is contained in:
2020-07-17 18:59:45 +02:00
parent 5ac8451668
commit 45b6bb5b2c
10 changed files with 63 additions and 167 deletions

View File

@@ -1,16 +1,4 @@
import errno
import functools
import os
import sys
import threading
from ebook_converter import force_unicode
from ebook_converter.constants_old import filesystem_encoding
from ebook_converter.constants_old import islinux
from ebook_converter.utils.filenames import ascii_filename
VADDRESS = None
def eintr_retry_call(func, *args, **kwargs):
@@ -21,47 +9,3 @@ def eintr_retry_call(func, *args, **kwargs):
if getattr(e, 'errno', None) == errno.EINTR:
continue
raise
@functools.lru_cache()
def socket_address(which):
user = force_unicode(os.environ.get('USER') or os.path.basename(os.path.expanduser('~')), filesystem_encoding)
sock_name = '{}-calibre-{}.socket'.format(ascii_filename(user).replace(' ', '_'), which)
if islinux:
ans = '\0' + sock_name
else:
from tempfile import gettempdir
tmp = force_unicode(gettempdir(), filesystem_encoding)
ans = os.path.join(tmp, sock_name)
return ans
def gui_socket_address():
return socket_address('gui')
def viewer_socket_address():
return socket_address('viewer')
class RC(threading.Thread):
def __init__(self, print_error=True, socket_address=None):
self.print_error = print_error
self.socket_address = socket_address or gui_socket_address()
threading.Thread.__init__(self)
self.conn = None
self.daemon = True
def run(self):
from multiprocessing.connection import Client
self.done = False
try:
self.conn = Client(self.socket_address)
self.done = True
except Exception:
if self.print_error:
print('Failed to connect to address {}', file=sys.stderr).format(repr(self.socket_address))
import traceback
traceback.print_exc()