Compare commits

...

3 Commits

5 changed files with 33 additions and 6 deletions

View File

@ -19,6 +19,7 @@ EXPECTED_OUTPUT_TABLE_SCHEMA.remove("Geschlecht")
COL_INSTRUCTIONS = { COL_INSTRUCTIONS = {
("Art",): { ("Art",): {
"command": "FIND_AND_REPLACE", "command": "FIND_AND_REPLACE",
"reqire_full_match": True,
"map": SPICIES "map": SPICIES
}, },
("Ort",): { ("Ort",): {

View File

@ -23,11 +23,13 @@ COL_INSTRUCTIONS = {
("Geschlecht",): [ ("Geschlecht",): [
{ {
"command": "FIND_AND_REPLACE", "command": "FIND_AND_REPLACE",
"map": REPRODUCTION "map": REPRODUCTION,
"reqire_full_match": True
}, },
{ {
"command": "FIND_AND_REPLACE", "command": "FIND_AND_REPLACE",
"map": AGE "map": AGE,
"reqire_full_match": True
}, },
{ {
"command": "REGEX_MOVE_TO_COL", "command": "REGEX_MOVE_TO_COL",

21
run.sh
View File

@ -2,6 +2,25 @@
SCRIPT_DIR="$HOME/.config/fledermaus-formatter" SCRIPT_DIR="$HOME/.config/fledermaus-formatter"
to_absolute_args() {
local result=()
for arg in "$@"; do
if [ -e "$arg" ] || [ -d "$arg" ] || [ -f "$arg" ]; then
result+=("$(realpath "$arg")")
else
result+=("$arg")
fi
done
printf '%s\n' "${result[@]}"
}
ABS_ARGS=()
while IFS= read -r line; do
ABS_ARGS+=("$line")
done < <(to_absolute_args "$@")
cd $SCRIPT_DIR cd $SCRIPT_DIR
source $SCRIPT_DIR/.venv/bin/activate source $SCRIPT_DIR/.venv/bin/activate
$SCRIPT_DIR/.venv/bin/python3 __init__.py $@ $SCRIPT_DIR/.venv/bin/python3 __init__.py "${ABS_ARGS[@]}"

View File

@ -2,13 +2,18 @@ import re
from copy import deepcopy from copy import deepcopy
class FindAndReplace: class FindAndReplace:
def __init__(self, map: dict[str, list[str]]): def __init__(self, map: dict[str, list[str]], reqire_full_match: bool = False):
self.map = map self.map = map
self.require_full_match = reqire_full_match
def execute_on_cell(self, entry) -> str: def execute_on_cell(self, entry) -> str:
res = deepcopy(entry.value) res = deepcopy(entry.value)
for species, alternatives in self.map.items(): for species, alternatives in self.map.items():
for old_version in alternatives: for old_version in alternatives:
res = res.replace(old_version, species) if self.require_full_match and old_version == res:
# Todo remove random leading/trailing spaces before if
res = species
else:
res = res.replace(old_version, species)
return res return res

View File

@ -109,7 +109,7 @@ class TableSerializer:
res_row = {} res_row = {}
match instruct.get("command"): match instruct.get("command"):
case "FIND_AND_REPLACE": case "FIND_AND_REPLACE":
res = FindAndReplace(instruct["map"]).execute_on_cell(row[source_cell]) res = FindAndReplace(instruct["map"], instruct.get("reqire_full_match", False)).execute_on_cell(row[source_cell])
case "REGEX_MOVE_TO_COL": case "REGEX_MOVE_TO_COL":
res_row = RegexMoveToCol(instruct["match"], instruct["to"], instruct.get("with_input_iteration")) \ res_row = RegexMoveToCol(instruct["match"], instruct["to"], instruct.get("with_input_iteration")) \
.execute_on_row(row, source_cell) .execute_on_row(row, source_cell)