informatic
/
kasownik
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web: improve transfer title parsing, fix handling of unparseable titles ~enleth

master
Kasownik 2017-05-12 17:58:11 +02:00
parent c785151666
commit 67c19ce40f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/webapp/models.py
View File

@ -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: