From 57f58295a48dfa4d893eb1546c5f2f64133c0e7f Mon Sep 17 00:00:00 2001 From: "Clayton G. Hobbs" Date: Sun, 27 Dec 2015 20:47:05 -0500 Subject: Refactored a couple regular expressions --- languageupdater.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/languageupdater.py b/languageupdater.py index a82e023..662a988 100644 --- a/languageupdater.py +++ b/languageupdater.py @@ -55,13 +55,15 @@ class LanguageUpdater: r = requests.post(url, files=files, data=values) # Parse response to get URLs of the files we need + path_re = r'.*Index of (.*?).*' + number_re = r'.*TAR[0-9]*?\.tgz.*' for line in r.text.split('\n'): # If we found the directory, keep it and don't break - if re.search(r'.*Index of (.*?).*', line): - path = host + re.sub(r'.*Index of (.*?).*', r'\1', line) + if re.search(path_re, line): + path = host + re.sub(path_re, r'\1', line) # If we found the number, keep it and break - elif re.search(r'.*TAR[0-9]*?\.tgz.*', line): - number = re.sub(r'.*TAR([0-9]*?)\.tgz.*', r'\1', line) + elif re.search(number_re, line): + number = re.sub(number_re, r'\1', line) break lm_url = path + '/' + number + '.lm' -- cgit 1.4.1