Skip to content

Commit b285a37

Browse files
author
spirit
committed
Experimental Python 3-only download_lt.py
1 parent 52210e1 commit b285a37

2 files changed

Lines changed: 35 additions & 30 deletions

File tree

‎download_lt.py‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
from distutils.version import LooseVersion
3030
NormalizedVersion = None
3131

32+
import language_tool
33+
3234

3335
BASE_URL = "http://www.languagetool.org/download/"
3436
PACKAGE_PATH = "language_tool"
@@ -53,14 +55,15 @@ class Version(LooseVersion):
5355

5456

5557
def download_lt(update=False):
58+
"""Download and extract LanguageTool distribution into package directory.
59+
"""
5660
assert os.path.isdir(PACKAGE_PATH)
57-
old_path_list = [
58-
path for path in
59-
glob.glob(os.path.join(PACKAGE_PATH, "LanguageTool*"))
60-
if os.path.isdir(path)
61-
]
61+
try:
62+
lt_dir = language_tool.get_language_tool_dir()
63+
except language_tool.Error:
64+
lt_dir = None
6265

63-
if old_path_list and not update:
66+
if lt_dir and not update:
6467
return
6568

6669
contents = ""
@@ -86,28 +89,23 @@ def download_lt(update=False):
8689
]
8790

8891
filename, version = matches[-1]
89-
url = urljoin(BASE_URL, filename)
90-
dirname = os.path.splitext(filename)[0]
91-
extract_path = os.path.join(PACKAGE_PATH, dirname)
9292

93-
if extract_path in old_path_list:
94-
print("No update needed: {!r}".format(dirname))
93+
if lt_dir:
94+
try:
95+
installed_version = Version(language_tool.get_version())
96+
update_needed = installed_version < version
97+
except TypeError:
98+
update_needed = True
99+
else:
100+
update_needed = True
101+
102+
if not update_needed:
103+
print("No update needed: {!s}".format(installed_version))
95104
return
96105

97-
for old_path in old_path_list:
98-
match = re.search("LanguageTool-(\d+.*?)$", old_path)
99-
if match:
100-
current_version = Version(match.group(1))
101-
try:
102-
version_test = current_version > version
103-
except TypeError:
104-
continue
105-
if version_test:
106-
print(
107-
"Local version: {!r}, Remote version: {!r}"
108-
.format(str(current_version), str(version))
109-
)
110-
return
106+
url = urljoin(BASE_URL, filename)
107+
dirname = os.path.splitext(filename)[0]
108+
extract_path = os.path.join(PACKAGE_PATH, dirname)
111109

112110
with closing(TemporaryFile()) as t:
113111
with closing(urlopen(url)) as u:
@@ -130,12 +128,13 @@ def download_lt(update=False):
130128
sys.stdout.flush()
131129
sys.stdout.write("\n")
132130
t.seek(0)
133-
for old_path in old_path_list:
134-
if os.path.isdir(old_path):
135-
shutil.rmtree(old_path)
131+
132+
if lt_dir and os.path.isdir(lt_dir):
133+
shutil.rmtree(lt_dir)
134+
136135
with closing(ZipFile(t)) as z:
137136
z.extractall(extract_path)
138137

139138

140139
if __name__ == "__main__":
141-
sys.exit(download_lt(update=True))
140+
sys.exit(download_lt(update="--no-update" not in sys.argv))

‎setup_language_tool.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import sys
22

3-
from download_lt import download_lt
3+
if sys.version_info[0] < 3:
4+
import subprocess
5+
6+
def download_lt(update=False):
7+
return subprocess.call(["download_lt.py", "--no-update"])
8+
else:
9+
from download_lt import download_lt
410

511

612
def hook(config):

0 commit comments

Comments
 (0)