ivo/frietlijst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NOJIRA more string replacement + vanity

Browse Source
This commit is contained in:
Ivo Spijkerman
2021-10-11 17:15:14 +02:00
parent 2d3c089423
commit 89dc57ac40
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/item_service.py
View File

@@ -1,3 +1,4 @@
import re
from typing import List, Dict from typing import List, Dict
import Levenshtein import Levenshtein
@@ -11,6 +12,10 @@ class ItemService:
def _translate_part(item_names: List[str], old: str, new: str) -> List[str]: def _translate_part(item_names: List[str], old: str, new: str) -> List[str]:
return [i.replace(old, new) for i in item_names] return [i.replace(old, new) for i in item_names]
@staticmethod
def _translate_part_regex(item_names: List[str], regex: str, new: str) -> List[str]:
return [re.sub(regex, new, i) for i in item_names]
@staticmethod @staticmethod
def _translate_whole(item_names: List[str], old: str, new: str) -> List[str]: def _translate_whole(item_names: List[str], old: str, new: str) -> List[str]:
return [new if i == old else i for i in item_names] return [new if i == old else i for i in item_names]
@@ -25,7 +30,7 @@ class ItemService:
distance = Levenshtein.distance(lhs, rhs) distance = Levenshtein.distance(lhs, rhs)
if distance <= 2: if distance <= 2:
print(lhs + ":" + rhs + " = " + str(distance)) print(lhs + ":" + rhs + " = " + str(distance))
ItemService._translate_whole(item_names, lhs, rhs) item_names = ItemService._translate_whole(item_names, lhs, rhs)
return item_names return item_names
@staticmethod @staticmethod
@@ -40,6 +45,11 @@ class ItemService:
@staticmethod @staticmethod
def get_items_from_orders(orders: List[Order]): def get_items_from_orders(orders: List[Order]):
item_names: List[str] = _flatten([o.items for o in orders]) item_names: List[str] = _flatten([o.items for o in orders])
item_names = ItemService._translate_part_regex(item_names, r" ?\+ ?", " + ")
item_names = ItemService._translate_part_regex(item_names, r" met$", " met mayo")
item_names = ItemService._translate_part_regex(item_names, r" (mayo[^ ]*)", " mayo")
item_names = ItemService._translate_part_regex(item_names, r" sat[eé](saus)?", " saté")
item_names = ItemService._translate_part(item_names, "patat", "friet")
item_names = ItemService._translate_part(item_names, "frietje", "friet") item_names = ItemService._translate_part(item_names, "frietje", "friet")
item_names = ItemService._translate_part(item_names, "krul friet", "twister") item_names = ItemService._translate_part(item_names, "krul friet", "twister")
item_names = ItemService._translate_part(item_names, "krulfriet", "twister") item_names = ItemService._translate_part(item_names, "krulfriet", "twister")

7
src/templates/frietlijst.html
View File

@@ -6,20 +6,21 @@
</head> </head>
<body> <body>
<div class="markdown-body"> <div class="markdown-body">
<h1>Reeds besteld</h1> <h1>Frietlijst by Ivo</h1>
<h2>Reeds besteld</h2>
<ol> <ol>
{% for applicant in applicants %} {% for applicant in applicants %}
<li>{{ applicant }}</li> <li>{{ applicant }}</li>
{% endfor %} {% endfor %}
</ol> </ol>
<h1>Streeplijst - {{ item_count }} stuks</h1> <h2>Streeplijst - {{ item_count }} stuks</h2>
<ul> <ul>
{% for item in items %} {% for item in items %}
<li>{{ item.name }}: {{ item.amount }}</li> <li>{{ item.name }}: {{ item.amount }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
<h1>Totaaloverzicht</h1> <h2>Totaaloverzicht</h2>
<ul> <ul>
{% for order in orders %} {% for order in orders %}
<li> <li>