actually finished the symbols code in utils, probably decoding works
This commit is contained in:
parent
0257d352dd
commit
7db63b9b56
1 changed files with 19 additions and 7 deletions
26
utils.py
26
utils.py
|
@ -407,18 +407,30 @@ json_symbol_trans = {
|
||||||
mana_json_open_delimiter + json_symbol_untap + mana_json_close_delimiter : untap_marker,
|
mana_json_open_delimiter + json_symbol_untap + mana_json_close_delimiter : untap_marker,
|
||||||
mana_json_open_delimiter + json_symbol_untap.lower() + mana_json_close_delimiter : untap_marker,
|
mana_json_open_delimiter + json_symbol_untap.lower() + mana_json_close_delimiter : untap_marker,
|
||||||
}
|
}
|
||||||
|
json_forum_trans = {
|
||||||
|
mana_forum_open_delimiter + json_symbol_tap + mana_forum_close_delimiter : tap_marker,
|
||||||
|
mana_forum_open_delimiter + json_symbol_tap.lower() + mana_forum_close_delimiter : tap_marker,
|
||||||
|
mana_forum_open_delimiter + json_symbol_untap + mana_forum_close_delimiter : untap_marker,
|
||||||
|
mana_forum_open_delimiter + json_symbol_untap.lower() + mana_forum_close_delimiter : untap_marker,
|
||||||
|
}
|
||||||
symbol_trans = {
|
symbol_trans = {
|
||||||
tap_marker : mana_json_open_delimiter + json_symbol_tap + mana_json_close_delimiter,
|
tap_marker : mana_json_open_delimiter + json_symbol_tap + mana_json_close_delimiter,
|
||||||
untap_marker : mana_json_open_delimiter + json_symbol_untap + mana_json_close_delimiter,
|
untap_marker : mana_json_open_delimiter + json_symbol_untap + mana_json_close_delimiter,
|
||||||
}
|
}
|
||||||
|
json_symbol_regex = (re.escape(mana_json_open_delimiter) + '['
|
||||||
json_symbol_regex = r'\{[TtQq]\}'
|
+ json_symbol_tap + json_symbol_tap.lower()
|
||||||
|
+ json_symbol_untap + json_symbol_untap.lower()
|
||||||
|
+ ']' + re.escape(mana_json_close_delimiter))
|
||||||
|
symbol_regex = '[' + tap_marker + untap_marker + ']'
|
||||||
|
|
||||||
def to_symbols(s):
|
def to_symbols(s):
|
||||||
symstrs = re.findall(json_symbol_regex, s)
|
jsymstrs = re.findall(json_symbol_regex, s)
|
||||||
for symstr in sorted(symstrs, lambda x,y: cmp(len(x), len(y)), reverse = True):
|
for jsymstr in sorted(jsymstrs, lambda x,y: cmp(len(x), len(y)), reverse = True):
|
||||||
s = s.replace(symstr, json_symbol_trans[symstr])
|
s = s.replace(jsymstr, json_symbol_trans[jsymstr])
|
||||||
return s
|
return s
|
||||||
|
|
||||||
def from_symbols(s):
|
def from_symbols(s, for_forum = False):
|
||||||
symstrs
|
symstrs = re.findall(symbol_regex, s)
|
||||||
|
for symstr in sorted(symstrs, lambda x,y: cmp(len(x), len(y)), reverse = True):
|
||||||
|
s = s.replace(symstr, symbol_trans[symstr])
|
||||||
|
return s
|
||||||
|
|
Loading…
Reference in a new issue