0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

raw regexp strings

Browse source
This commit is contained in:
j 2025-10-22 12:24:14 +01:00
commit 395ea895b8
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/models.py
View file

@ -74,7 +74,7 @@ def get_matches(obj, model, layer_type, qs=None):
name = name.lower() name = name.lower()
name = ox.decode_html(name) name = ox.decode_html(name)
name = unicodedata.normalize('NFKD', name).lower() name = unicodedata.normalize('NFKD', name).lower()
if name in value and (exact or re.compile('((^|\s)%s([\.,;:!?\'"\)\]\-\/\s]|$))' % re.escape(name)).findall(value)): if name in value and (exact or re.compile(r'((^|\s)%s([\.,;:!?\'"\)\]\-\/\s]|$))' % re.escape(name)).findall(value)):
matches.append(a.id) matches.append(a.id)
break break
if not matches: if not matches:
@ -155,7 +155,7 @@ class Annotation(models.Model):
self.sortvalue = sortvalue[:900] self.sortvalue = sortvalue[:900]
else: else:
self.sortvalue = None self.sortvalue = None
self.languages = ','.join(re.compile('lang="(.*?)"').findall(self.value)) self.languages = ','.join(re.compile(r'lang="(.*?)"').findall(self.value))
if not self.languages: if not self.languages:
self.languages = None self.languages = None
else: else:

2
pandora/documentcollection/models.py
View file

@ -188,7 +188,7 @@ class Collection(models.Model):
self.status = value self.status = value
elif key == 'name': elif key == 'name':
data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip()
if not data['name']: if not data['name']:
data['name'] = "Untitled" data['name'] = "Untitled"
name = data['name'] name = data['name']

2
pandora/edit/models.py
View file

@ -196,7 +196,7 @@ class Edit(models.Model):
self.status = value self.status = value
elif key == 'name': elif key == 'name':
data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip()
if not data['name']: if not data['name']:
data['name'] = "Untitled" data['name'] = "Untitled"
name = data['name'] name = data['name']

4
pandora/entity/models.py
View file

@ -131,7 +131,7 @@ class Entity(models.Model):
config_keys = {k['id']: k for k in entity['keys']} config_keys = {k['id']: k for k in entity['keys']}
for key, value in data.items(): for key, value in data.items():
if key == 'name': if key == 'name':
data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip()
if not data['name']: if not data['name']:
data['name'] = "Unnamed" data['name'] = "Unnamed"
name = data['name'] name = data['name']
@ -147,7 +147,7 @@ class Entity(models.Model):
names = [] names = []
for v in data[key]: for v in data[key]:
name = ox.decode_html(v) name = ox.decode_html(v)
name = re.sub(' \[\d+\]$', '', name).strip() name = re.sub(r' \[\d+\]$', '', name).strip()
name_ = name name_ = name
n = 1 n = 1
while name in used_names or \ while name in used_names or \

6
pandora/item/timelines.py
View file

@ -27,7 +27,7 @@ def join_tiles(source_paths, durations, target_path):
def get_file_info(file_name): def get_file_info(file_name):
for mode in modes: for mode in modes:
if re.match('^timeline' + mode + '64p\d+\.jpg', file_name): if re.match(r'^timeline' + mode + r'64p\d+\.jpg', file_name):
return { return {
'file': file_name, 'file': file_name,
'mode': mode, 'mode': mode,
@ -227,8 +227,8 @@ def split_tiles(path, paths, durations):
file_names = list(filter(is_timeline_file, os.listdir(path))) file_names = list(filter(is_timeline_file, os.listdir(path)))
tiles = {} tiles = {}
for file_name in file_names: for file_name in file_names:
mode = re.split('\d+', file_name[8:])[0] mode = re.split(r'\d+', file_name[8:])[0]
split = re.split('[a-z]+', file_name[8 + len(mode):-4]) split = re.split(r'[a-z]+', file_name[8 + len(mode):-4])
height, index = map(lambda x: int(x) if len(x) else -1, split) height, index = map(lambda x: int(x) if len(x) else -1, split)
if mode not in tiles: if mode not in tiles:
tiles[mode] = {} tiles[mode] = {}

2
pandora/itemlist/models.py
View file

@ -181,7 +181,7 @@ class List(models.Model):
self.status = value self.status = value
elif key == 'name': elif key == 'name':
data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip()
if not data['name']: if not data['name']:
data['name'] = "Untitled" data['name'] = "Untitled"
name = data['name'] name = data['name']

4
pandora/oxdjango/fields.py
View file

@ -104,7 +104,7 @@ class TupleField(DictField):
try: try:
from south.modelsinspector import add_introspection_rules from south.modelsinspector import add_introspection_rules
add_introspection_rules([], ["^oxdjango\.fields\.DictField"]) add_introspection_rules([], [r"^oxdjango\.fields\.DictField"])
add_introspection_rules([], ["^oxdjango\.fields\.TupleField"]) add_introspection_rules([], [r"^oxdjango\.fields\.TupleField"])
except: except:
pass pass

4
pandora/text/models.py
View file

@ -131,7 +131,7 @@ class Text(models.Model):
self.status = value self.status = value
elif key == 'name': elif key == 'name':
data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip()
if not data['name']: if not data['name']:
data['name'] = "Untitled" data['name'] = "Untitled"
name = data['name'] name = data['name']
@ -215,7 +215,7 @@ class Text(models.Model):
response['embeds'] = self.embeds response['embeds'] = self.embeds
response['names'] = [] response['names'] = []
else: else:
response['names'] = re.compile('<[^<>]*?data-name="(.+?)"').findall(self.text) response['names'] = re.compile(r'<[^<>]*?data-name="(.+?)"').findall(self.text)
for key in list(response): for key in list(response):
if key not in keys + default_keys: if key not in keys + default_keys: