From dfd3da4da5477ad64c16eb5564c3754af4df0f79 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Thu, 30 Jan 2014 18:31:58 +0100 Subject: package_list: Start to document default regex --- cnucnu/package_list.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py index 6f643cd..10f0845 100755 --- a/cnucnu/package_list.py +++ b/cnucnu/package_list.py @@ -188,15 +188,16 @@ class Package(object): # strip "ghc-" prefix only if name was not overridden if not name_override and name.startswith("ghc-"): name = name[len("ghc-"):] - regex = \ - r"\b%s[-_]" % re.escape(name) + \ - r"(?i)" + \ - r"(?:(?:src|source)[-_])?" + \ - r"([^-/_\s]*?" + \ - r"\d" + \ - r"[^-/_\s]*?)" + \ - r"(?:[-_.](?:src|source|orig))?" + \ - r"\.(?:[jt]ar|t[bglx]z|tbz2|zip)\b" + regex = ( + r"(?i)" # ignore case + r"\b%(name)s[-_]" # word-boundary, name and dash/underscore + r"(?:(?:src|source)[-_])?" # optional src or source string + r"([^-/_\s]*?" # + r"\d" + r"[^-/_\s]*?)" + r"(?:[-_.](?:src|source|orig))?" + r"\.(?:[jt]ar|t[bglx]z|tbz2|zip)\b" % {'name': re.escape(name)} + ) elif regex == "FM-DEFAULT": regex = '([^<]*)' elif regex == "DIR-LISTING-DEFAULT": -- cgit