From 67c19ce40f30acc72082a7a7861334fdf3228462 Mon Sep 17 00:00:00 2001 From: Kasownik Date: Fri, 12 May 2017 17:58:11 +0200 Subject: [PATCH] web: improve transfer title parsing, fix handling of unparseable titles ~enleth --- web/webapp/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/webapp/models.py b/web/webapp/models.py index 1fc48af..1e8c7b1 100644 --- a/web/webapp/models.py +++ b/web/webapp/models.py @@ -356,7 +356,7 @@ class Transfer(db.Model): return self.uid[:16] def parse_title(self): - m = re.match(ur"^([a-z0-9ąężźćóżłśń\-_\.]+) *\- *(fatty|starving|superfatty|supporting|supporter) *\- *([0-9a-z\-_ąężźćóżłśń \(\),/\.]+$)", self.title.strip().lower()) + m = re.match(ur"^([a-z0-9ąężźćóżłśń\-_\.]+)[ -]+(fatty|starving|superfatty|supporting|supporter)[ -]+([0-9a-z\-_ąężźćóżłśń \(\),/\.]+$)", self.title.strip().lower()) if not m: return (None, None, None) member, _type, title = m.group(1), m.group(2), m.group(3) @@ -368,7 +368,7 @@ class Transfer(db.Model): def get_matchability(self): title = self.parse_title() if not title[0]: - return self.MATCH_UNPARSEABLE, self.title + return self.MATCH_UNPARSEABLE, self.title, 0 member_name = title[0] member = Member.query.filter(or_(Member.username==member_name, Member.alias==member_name)).first() if not member: