imacat/obasync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makes start_oo, find_posix_soffice and is_soffice_lo methods private.

Browse Source
This commit is contained in:
依瑪貓 2017-04-13 13:54:31 +08:00
parent deb72afad3
commit eea163138c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/obasync
View File

@ -499,7 +499,7 @@ class Office:
try: try:
self.bootstrap_context = url_resolver.resolve(url) self.bootstrap_context = url_resolver.resolve(url)
except NoConnectException: except NoConnectException:
self.start_oo() self.__start_oo()
else: else:
break break
# Obtains the service manager # Obtains the service manager
@ -508,7 +508,7 @@ class Office:
self.desktop = self.service_manager.createInstanceWithContext( self.desktop = self.service_manager.createInstanceWithContext(
"com.sun.star.frame.Desktop", self.bootstrap_context) "com.sun.star.frame.Desktop", self.bootstrap_context)
def start_oo(self): def __start_oo(self):
"""Start OpenOffice/LibreOffice in server listening mode.""" """Start OpenOffice/LibreOffice in server listening mode."""
# For MS-Windows, which does not have fork() # For MS-Windows, which does not have fork()
if os.name == "nt": if os.name == "nt":
@ -533,7 +533,7 @@ class Office:
time.sleep(2) time.sleep(2)
return return
os.setsid() os.setsid()
soffice = self.find_posix_soffice() soffice = self.__find_posix_soffice()
if soffice is None: if soffice is None:
print("Failed to find the " print("Failed to find the "
"OpenOffice/LibreOffice installation.", "OpenOffice/LibreOffice installation.",
@ -543,7 +543,7 @@ class Office:
self.port self.port
# LibreOffice on POSIX systems uses --accept instead of # LibreOffice on POSIX systems uses --accept instead of
# -accept now. # -accept now.
if self.is_soffice_lo(soffice): if self.__is_soffice_lo(soffice):
param = "-" + param param = "-" + param
try: try:
os.execl(soffice, soffice, param) os.execl(soffice, soffice, param)
@ -553,7 +553,7 @@ class Office:
file=sys.stderr) file=sys.stderr)
sys.exit(1) sys.exit(1)
def find_posix_soffice(self): def __find_posix_soffice(self):
"""Find soffice on POSIX systems (Linux or MacOSX). """Find soffice on POSIX systems (Linux or MacOSX).
Returns: Returns:
@ -583,7 +583,7 @@ class Office:
# Not found # Not found
return None return None
def is_soffice_lo(self, soffice): def __is_soffice_lo(self, soffice):
"""Check whether the soffice executable is LibreOffice. """Check whether the soffice executable is LibreOffice.
LibreOffice on POSIX systems accepts "--accept" instead of LibreOffice on POSIX systems accepts "--accept" instead of